Merge platform/media into data_resource_helper

These are helpers to retrieve resources from the bundle. We better
place them together.

Bug: none
Change-Id: I7613c84f7b36872b2fc8ed01e7a57e66e309f4b6
Reviewed-on: https://chromium-review.googlesource.com/c/1278958
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599698}

third_party/blink/renderer/core/script/layered_api.cc

@@ -6,7 +6,7 @@
 
 #include "base/stl_util.h"
 #include "third_party/blink/public/resources/grit/blink_resources.h"
-#include "third_party/blink/renderer/platform/media/resource_bundle_helper.h"
+#include "third_party/blink/renderer/platform/data_resource_helper.h"
 #include "third_party/blink/renderer/platform/wtf/text/string_builder.h"
 
 namespace blink {
@@ -115,7 +115,7 @@ String GetSourceText(const KURL& url) {
   if (resource_id < 0)
     return String();
 
-  return ResourceBundleHelper::GetResourceAsString(resource_id);
+  return GetResourceAsString(resource_id);
 }
 
 }  // namespace layered_api

third_party/blink/renderer/modules/media_controls/media_controls_resource_loader.cc

@@ -7,7 +7,7 @@
 #include "build/build_config.h"
 #include "third_party/blink/renderer/core/style/computed_style.h"
 #include "third_party/blink/renderer/modules/media_controls/resources/grit/media_controls_resources.h"
-#include "third_party/blink/renderer/platform/media/resource_bundle_helper.h"
+#include "third_party/blink/renderer/platform/data_resource_helper.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 
@@ -31,7 +31,7 @@ MediaControlsResourceLoader::MediaControlsResourceLoader()
 MediaControlsResourceLoader::~MediaControlsResourceLoader() = default;
 
 String MediaControlsResourceLoader::GetMediaControlsCSS() const {
-  return ResourceBundleHelper::UncompressResourceAsString(
+  return UncompressResourceAsString(
       RuntimeEnabledFeatures::ModernMediaControlsEnabled()
           ? IDR_UASTYLE_MODERN_MEDIA_CONTROLS_CSS
           : IDR_UASTYLE_LEGACY_MEDIA_CONTROLS_CSS);
@@ -40,56 +40,52 @@ String MediaControlsResourceLoader::GetMediaControlsCSS() const {
 String MediaControlsResourceLoader::GetMediaControlsAndroidCSS() const {
   if (RuntimeEnabledFeatures::ModernMediaControlsEnabled())
     return String();
-  return ResourceBundleHelper::UncompressResourceAsString(
+  return UncompressResourceAsString(
       IDR_UASTYLE_LEGACY_MEDIA_CONTROLS_ANDROID_CSS);
 };
 
 // static
 String MediaControlsResourceLoader::GetShadowTimelineStyleSheet() {
-  return ResourceBundleHelper::UncompressResourceAsString(
+  return UncompressResourceAsString(
       IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_TIMELINE_CSS);
 };
 
 // static
 String MediaControlsResourceLoader::GetShadowLoadingStyleSheet() {
-  return ResourceBundleHelper::UncompressResourceAsString(
+  return UncompressResourceAsString(
       IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_LOADING_CSS);
 };
 
 // static
 String MediaControlsResourceLoader::GetJumpSVGImage() {
-  return ResourceBundleHelper::UncompressResourceAsString(
-      IDR_MODERN_MEDIA_CONTROLS_JUMP_SVG);
+  return UncompressResourceAsString(IDR_MODERN_MEDIA_CONTROLS_JUMP_SVG);
 };
 
 // static
 String MediaControlsResourceLoader::GetArrowRightSVGImage() {
-  return ResourceBundleHelper::UncompressResourceAsString(
-      IDR_MODERN_MEDIA_CONTROLS_ARROW_RIGHT_SVG);
+  return UncompressResourceAsString(IDR_MODERN_MEDIA_CONTROLS_ARROW_RIGHT_SVG);
 };
 
 // static
 String MediaControlsResourceLoader::GetArrowLeftSVGImage() {
-  return ResourceBundleHelper::UncompressResourceAsString(
-      IDR_MODERN_MEDIA_CONTROLS_ARROW_LEFT_SVG);
+  return UncompressResourceAsString(IDR_MODERN_MEDIA_CONTROLS_ARROW_LEFT_SVG);
 };
 
 // static
 String MediaControlsResourceLoader::GetScrubbingMessageStyleSheet() {
-  return ResourceBundleHelper::UncompressResourceAsString(
+  return UncompressResourceAsString(
       IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_SCRUBBING_MESSAGE_CSS);
 };
 
 // static
 String MediaControlsResourceLoader::GetAnimatedArrowStyleSheet() {
-  return ResourceBundleHelper::UncompressResourceAsString(
+  return UncompressResourceAsString(
       IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_ANIMATED_ARROW_CSS);
 };
 
 // static
 String MediaControlsResourceLoader::GetMediaInterstitialsStyleSheet() {
-  return ResourceBundleHelper::UncompressResourceAsString(
-      IDR_UASTYLE_MEDIA_INTERSTITIALS_CSS);
+  return UncompressResourceAsString(IDR_UASTYLE_MEDIA_INTERSTITIALS_CSS);
 };
 
 String MediaControlsResourceLoader::GetUAStyleSheet() {

third_party/blink/renderer/platform/BUILD.gn

@@ -1440,7 +1440,6 @@ jumbo_component("platform") {
     "//third_party/blink/renderer/platform/heap",
     "//third_party/blink/renderer/platform/instrumentation",
     "//third_party/blink/renderer/platform/loader",
-    "//third_party/blink/renderer/platform/media",
     "//third_party/blink/renderer/platform/network",
     "//third_party/blink/renderer/platform/scheduler",
   ]
@@ -1463,6 +1462,8 @@ jumbo_component("platform") {
     "//third_party/blink/public/common",
     "//third_party/ced",
     "//third_party/icu",
+    "//third_party/zlib/google:compression_utils",
+    "//ui/base:base",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]

third_party/blink/renderer/platform/DEPS

@@ -80,4 +80,8 @@ specific_include_rules = {
     "ukm_time_aggregator_test.cc" : [
         "+components/ukm/test_ukm_recorder.h"
     ],
+    "data_resource_helper.cc" : [
+        "+third_party/zlib/google/compression_utils.h",
+        "+ui/base/resource",
+    ],
 }

third_party/blink/renderer/platform/data_resource_helper.cc

@@ -7,9 +7,22 @@
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/web_data.h"
 #include "third_party/blink/renderer/platform/wtf/text/string_builder.h"
+#include "third_party/zlib/google/compression_utils.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace blink {
 
+namespace {
+
+std::string GetResourceById(int resource_id) {
+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+  return bundle
+      .GetRawDataResourceForScale(resource_id, bundle.GetMaxScaleFactor())
+      .as_string();
+}
+
+}  // namespace
+
 String GetDataResourceAsASCIIString(const char* resource) {
   StringBuilder builder;
   const WebData& resource_data = Platform::Current()->GetDataResource(resource);
@@ -27,4 +40,15 @@ String GetDataResourceAsASCIIString(const char* resource) {
   return data_string;
 }
 
+String GetResourceAsString(int resource_id) {
+  return String::FromUTF8(GetResourceById(resource_id).c_str());
+};
+
+String UncompressResourceAsString(int resource_id) {
+  std::string uncompressed;
+  CHECK(
+      compression::GzipUncompress(GetResourceById(resource_id), &uncompressed));
+  return String::FromUTF8(uncompressed.c_str());
+}
+
 }  // namespace blink

third_party/blink/renderer/platform/data_resource_helper.h

@@ -10,8 +10,20 @@
 
 namespace blink {
 
+// Helper functions providing access to ui::ResourceBundle in Blink.
+
+// Returns the contents of a resource as a string specified by the
+// resource name.
 PLATFORM_EXPORT String GetDataResourceAsASCIIString(const char* resource);
 
+// Returns the contents of a resource as a string specified by the
+// resource id from Grit.
+PLATFORM_EXPORT String GetResourceAsString(int resource_id);
+
+// Uncompresses a gzipped resource and returns it as a string. The resource
+// is specified by the resource id from Grit.
+PLATFORM_EXPORT String UncompressResourceAsString(int resource_id);
+
 }  // namespace blink
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_DATA_RESOURCE_HELPER_H_

third_party/blink/renderer/platform/media/BUILD.gn

-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//third_party/blink/renderer/platform/platform.gni")
-
-blink_platform_sources("media") {
-  sources = [
-    "resource_bundle_helper.cc",
-    "resource_bundle_helper.h",
-  ]
-
-  deps = [
-    "//third_party/zlib/google:compression_utils",
-    "//ui/base:base",
-  ]
-}

third_party/blink/renderer/platform/media/DEPS

-include_rules = [
-    # Don't depend on platform/.
-    "-third_party/blink/renderer/platform",
-
-    # Module.
-    "+third_party/blink/renderer/platform/media",
-
-    # Dependencies.
-    "+third_party/blink/renderer/platform/platform_export.h",
-    "+third_party/blink/renderer/platform/wtf",
-    "+third_party/zlib/google/compression_utils.h",
-    "+ui/base/resource",
-]

third_party/blink/renderer/platform/media/resource_bundle_helper.cc

-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "third_party/blink/renderer/platform/media/resource_bundle_helper.h"
-
-#include "third_party/zlib/google/compression_utils.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/resource/resource_handle.h"
-
-namespace {
-
-std::string GetResource(int resource_id) {
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  return bundle
-      .GetRawDataResourceForScale(resource_id, bundle.GetMaxScaleFactor())
-      .as_string();
-}
-
-}  // namespace.
-
-namespace blink {
-
-String ResourceBundleHelper::GetResourceAsString(int resource_id) {
-  return String::FromUTF8(GetResource(resource_id).c_str());
-};
-
-String ResourceBundleHelper::UncompressResourceAsString(int resource_id) {
-  std::string uncompressed;
-  CHECK(compression::GzipUncompress(GetResource(resource_id), &uncompressed));
-  return String::FromUTF8(uncompressed.c_str());
-}
-
-}  // namespace blink

third_party/blink/renderer/platform/media/resource_bundle_helper.h

-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_MEDIA_RESOURCE_BUNDLE_HELPER_H_
-#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MEDIA_RESOURCE_BUNDLE_HELPER_H_
-
-#include "third_party/blink/renderer/platform/platform_export.h"
-#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
-
-namespace blink {
-
-// Provides access to ui::ResourceBundle in Blink. This
-// allows Blink to directly load resources from the bundle.
-class ResourceBundleHelper {
-  STATIC_ONLY(ResourceBundleHelper);
-
- public:
-  // Returns the contents of a resource as a string specified by the
-  // resource id from Grit.
-  static PLATFORM_EXPORT String GetResourceAsString(int resource_id);
-
-  // Uncompresses a gzipped resource and returns it as a string. The resource
-  // is specified by the resource id from Grit.
-  static PLATFORM_EXPORT String UncompressResourceAsString(int resource_id);
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_MEDIA_RESOURCE_BUNDLE_HELPER_H_