Rename LoadResource to GetDataResource to unconfuse

Platform::LoadResource is confusing as it sounds like it's for
resource loading, while it is actually for getting bundled resource data.
This CL renames LoadResource to GetDataResource to unconfuse these.

BUG=n/a

Change-Id: I1c479c147f5aba7e9dbd919bb11f95d4c069c7f6
Reviewed-on: https://chromium-review.googlesource.com/517589
Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#476250}

content/child/blink_platform_impl.cc

@@ -610,7 +610,7 @@ const DataResource kDataResources[] = {
 
 }  // namespace
 
-WebData BlinkPlatformImpl::LoadResource(const char* name) {
+WebData BlinkPlatformImpl::GetDataResource(const char* name) {
   // Some clients will call into this method with an empty |name| when they have
   // optional resources.  For example, the PopupMenuChromium code can have icons
   // for some Autofill items but not for others.

content/child/blink_platform_impl.h

@@ -84,7 +84,7 @@ class CONTENT_EXPORT BlinkPlatformImpl
   blink::WebThread* CurrentThread() override;
   void RecordAction(const blink::UserMetricsAction&) override;
 
-  blink::WebData LoadResource(const char* name) override;
+  blink::WebData GetDataResource(const char* name) override;
   blink::WebString QueryLocalizedString(
       blink::WebLocalizedString::Name name) override;
   virtual blink::WebString queryLocalizedString(

content/ppapi_plugin/ppapi_blink_platform_impl.cc

@@ -218,7 +218,7 @@ void PpapiBlinkPlatformImpl::GetPluginList(
   NOTREACHED();
 }
 
-blink::WebData PpapiBlinkPlatformImpl::LoadResource(const char* name) {
+blink::WebData PpapiBlinkPlatformImpl::GetDataResource(const char* name) {
   NOTREACHED();
   return blink::WebData();
 }

content/ppapi_plugin/ppapi_blink_platform_impl.h

@@ -47,7 +47,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImpl {
   void GetPluginList(bool refresh,
                      const blink::WebSecurityOrigin& mainFrameOrigin,
                      blink::WebPluginListBuilder*) override;
-  blink::WebData LoadResource(const char* name) override;
+  blink::WebData GetDataResource(const char* name) override;
   std::unique_ptr<blink::WebStorageNamespace> CreateLocalStorageNamespace()
       override;
   virtual void dispatchStorageEvent(const blink::WebString& key,

content/renderer/renderer_blink_platform_impl.cc

@@ -715,12 +715,12 @@ std::unique_ptr<WebAudioDevice> RendererBlinkPlatformImpl::CreateAudioDevice(
       static_cast<url::Origin>(security_origin));
 }
 
-bool RendererBlinkPlatformImpl::LoadAudioResource(
+bool RendererBlinkPlatformImpl::DecodeAudioFileData(
     blink::WebAudioBus* destination_bus,
     const char* audio_file_data,
     size_t data_size) {
-  return DecodeAudioFileData(
-      destination_bus, audio_file_data, data_size);
+  return content::DecodeAudioFileData(destination_bus, audio_file_data,
+                                      data_size);
 }
 
 //------------------------------------------------------------------------------

content/renderer/renderer_blink_platform_impl.h

@@ -151,9 +151,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
       const blink::WebString& input_device_id,
       const blink::WebSecurityOrigin& security_origin) override;
 
-  bool LoadAudioResource(blink::WebAudioBus* destination_bus,
-                         const char* audio_file_data,
-                         size_t data_size) override;
+  bool DecodeAudioFileData(blink::WebAudioBus* destination_bus,
+                           const char* audio_file_data,
+                           size_t data_size) override;
 
   std::unique_ptr<blink::WebMIDIAccessor> CreateMIDIAccessor(
       blink::WebMIDIAccessorClient* client) override;

third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp

@@ -38,7 +38,7 @@
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLHtmlElement.h"
 #include "core/layout/LayoutTheme.h"
-#include "platform/PlatformResourceLoader.h"
+#include "platform/DataResourceHelper.h"
 #include "platform/wtf/LeakAnnotations.h"
 
 namespace blink {
@@ -79,14 +79,14 @@ CSSDefaultStyleSheets::CSSDefaultStyleSheets() {
   default_quirks_style_ = RuleSet::Create();
 
   // Strict-mode rules.
-  String default_rules = LoadResourceAsASCIIString("html.css") +
+  String default_rules = GetDataResourceAsASCIIString("html.css") +
                          LayoutTheme::GetTheme().ExtraDefaultStyleSheet();
   default_style_sheet_ = ParseUASheet(default_rules);
   default_style_->AddRulesFromSheet(DefaultStyleSheet(), ScreenEval());
   default_print_style_->AddRulesFromSheet(DefaultStyleSheet(), PrintEval());
 
   // Quirks-mode rules.
-  String quirks_rules = LoadResourceAsASCIIString("quirks.css") +
+  String quirks_rules = GetDataResourceAsASCIIString("quirks.css") +
                         LayoutTheme::GetTheme().ExtraQuirksStyleSheet();
   quirks_style_sheet_ = ParseUASheet(quirks_rules);
   default_quirks_style_->AddRulesFromSheet(QuirksStyleSheet(), ScreenEval());
@@ -106,32 +106,35 @@ RuleSet* CSSDefaultStyleSheets::DefaultViewSourceStyle() {
     default_view_source_style_ = RuleSet::Create();
     // Loaded stylesheet is leaked on purpose.
     StyleSheetContents* stylesheet =
-        ParseUASheet(LoadResourceAsASCIIString("view-source.css"));
+        ParseUASheet(GetDataResourceAsASCIIString("view-source.css"));
     default_view_source_style_->AddRulesFromSheet(stylesheet, ScreenEval());
   }
   return default_view_source_style_;
 }
 
 StyleSheetContents*
 CSSDefaultStyleSheets::EnsureXHTMLMobileProfileStyleSheet() {
-  if (!xhtml_mobile_profile_style_sheet_)
+  if (!xhtml_mobile_profile_style_sheet_) {
     xhtml_mobile_profile_style_sheet_ =
-        ParseUASheet(LoadResourceAsASCIIString("xhtmlmp.css"));
+        ParseUASheet(GetDataResourceAsASCIIString("xhtmlmp.css"));
+  }
   return xhtml_mobile_profile_style_sheet_;
 }
 
 StyleSheetContents* CSSDefaultStyleSheets::EnsureMobileViewportStyleSheet() {
-  if (!mobile_viewport_style_sheet_)
+  if (!mobile_viewport_style_sheet_) {
     mobile_viewport_style_sheet_ =
-        ParseUASheet(LoadResourceAsASCIIString("viewportAndroid.css"));
+        ParseUASheet(GetDataResourceAsASCIIString("viewportAndroid.css"));
+  }
   return mobile_viewport_style_sheet_;
 }
 
 StyleSheetContents*
 CSSDefaultStyleSheets::EnsureTelevisionViewportStyleSheet() {
-  if (!television_viewport_style_sheet_)
+  if (!television_viewport_style_sheet_) {
     television_viewport_style_sheet_ =
-        ParseUASheet(LoadResourceAsASCIIString("viewportTelevision.css"));
+        ParseUASheet(GetDataResourceAsASCIIString("viewportTelevision.css"));
+  }
   return television_viewport_style_sheet_;
 }
 
@@ -140,7 +143,7 @@ bool CSSDefaultStyleSheets::EnsureDefaultStyleSheetsForElement(
   bool changed_default_style = false;
   // FIXME: We should assert that the sheet only styles SVG elements.
   if (element.IsSVGElement() && !svg_style_sheet_) {
-    svg_style_sheet_ = ParseUASheet(LoadResourceAsASCIIString("svg.css"));
+    svg_style_sheet_ = ParseUASheet(GetDataResourceAsASCIIString("svg.css"));
     default_style_->AddRulesFromSheet(SvgStyleSheet(), ScreenEval());
     default_print_style_->AddRulesFromSheet(SvgStyleSheet(), PrintEval());
     changed_default_style = true;
@@ -149,7 +152,8 @@ bool CSSDefaultStyleSheets::EnsureDefaultStyleSheetsForElement(
   // FIXME: We should assert that the sheet only styles MathML elements.
   if (element.namespaceURI() == MathMLNames::mathmlNamespaceURI &&
       !mathml_style_sheet_) {
-    mathml_style_sheet_ = ParseUASheet(LoadResourceAsASCIIString("mathml.css"));
+    mathml_style_sheet_ =
+        ParseUASheet(GetDataResourceAsASCIIString("mathml.css"));
     default_style_->AddRulesFromSheet(MathmlStyleSheet(), ScreenEval());
     default_print_style_->AddRulesFromSheet(MathmlStyleSheet(), PrintEval());
     changed_default_style = true;
@@ -159,7 +163,7 @@ bool CSSDefaultStyleSheets::EnsureDefaultStyleSheetsForElement(
   // <audio>.
   if (!media_controls_style_sheet_ &&
       (isHTMLVideoElement(element) || isHTMLAudioElement(element))) {
-    String media_rules = LoadResourceAsASCIIString("mediaControls.css") +
+    String media_rules = GetDataResourceAsASCIIString("mediaControls.css") +
                          LayoutTheme::GetTheme().ExtraMediaControlsStyleSheet();
     media_controls_style_sheet_ = ParseUASheet(media_rules);
     default_style_->AddRulesFromSheet(MediaControlsStyleSheet(), ScreenEval());
@@ -177,7 +181,7 @@ void CSSDefaultStyleSheets::EnsureDefaultStyleSheetForFullscreen() {
   if (fullscreen_style_sheet_)
     return;
 
-  String fullscreen_rules = LoadResourceAsASCIIString("fullscreen.css") +
+  String fullscreen_rules = GetDataResourceAsASCIIString("fullscreen.css") +
                             LayoutTheme::GetTheme().ExtraFullscreenStyleSheet();
   fullscreen_style_sheet_ = ParseUASheet(fullscreen_rules);
   default_style_->AddRulesFromSheet(FullscreenStyleSheet(), ScreenEval());

third_party/WebKit/Source/core/html/forms/DateTimeChooserImpl.cpp

@@ -125,10 +125,10 @@ void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
   }
 
   AddString("<!DOCTYPE html><head><meta charset='UTF-8'><style>\n", data);
-  data->Append(Platform::Current()->LoadResource("pickerCommon.css"));
-  data->Append(Platform::Current()->LoadResource("pickerButton.css"));
-  data->Append(Platform::Current()->LoadResource("suggestionPicker.css"));
-  data->Append(Platform::Current()->LoadResource("calendarPicker.css"));
+  data->Append(Platform::Current()->GetDataResource("pickerCommon.css"));
+  data->Append(Platform::Current()->GetDataResource("pickerButton.css"));
+  data->Append(Platform::Current()->GetDataResource("suggestionPicker.css"));
+  data->Append(Platform::Current()->GetDataResource("calendarPicker.css"));
   AddString(
       "</style></head><body><div id=main>Loading...</div><script>\n"
       "window.dialogArguments = {\n",
@@ -208,9 +208,9 @@ void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
   }
   AddString("}\n", data);
 
-  data->Append(Platform::Current()->LoadResource("pickerCommon.js"));
-  data->Append(Platform::Current()->LoadResource("suggestionPicker.js"));
-  data->Append(Platform::Current()->LoadResource("calendarPicker.js"));
+  data->Append(Platform::Current()->GetDataResource("pickerCommon.js"));
+  data->Append(Platform::Current()->GetDataResource("suggestionPicker.js"));
+  data->Append(Platform::Current()->GetDataResource("calendarPicker.js"));
   AddString("</script></body>\n", data);
 }
 

third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp

@@ -59,7 +59,6 @@
 #include "core/loader/resource/ScriptResource.h"
 #include "core/page/Page.h"
 #include "core/probe/CoreProbes.h"
-#include "platform/PlatformResourceLoader.h"
 #include "platform/bindings/DOMWrapperWorld.h"
 #include "platform/loader/fetch/MemoryCache.h"
 #include "platform/loader/fetch/Resource.h"

third_party/WebKit/Source/core/layout/LayoutThemeDefault.cpp

@@ -28,9 +28,9 @@
 #include "core/layout/LayoutThemeFontProvider.h"
 #include "core/paint/MediaControlsPainter.h"
 #include "core/style/ComputedStyle.h"
+#include "platform/DataResourceHelper.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/PlatformChromeClient.h"
-#include "platform/PlatformResourceLoader.h"
 #include "platform/graphics/Color.h"
 #include "platform/wtf/text/StringBuilder.h"
 #include "public/platform/Platform.h"
@@ -93,9 +93,9 @@ String LayoutThemeDefault::ExtraDefaultStyleSheet() {
   String extra_style_sheet = LayoutTheme::ExtraDefaultStyleSheet();
   String multiple_fields_style_sheet =
       RuntimeEnabledFeatures::inputMultipleFieldsUIEnabled()
-          ? LoadResourceAsASCIIString("themeInputMultipleFields.css")
+          ? GetDataResourceAsASCIIString("themeInputMultipleFields.css")
           : String();
-  String windows_style_sheet = LoadResourceAsASCIIString("themeWin.css");
+  String windows_style_sheet = GetDataResourceAsASCIIString("themeWin.css");
   StringBuilder builder;
   builder.ReserveCapacity(extra_style_sheet.length() +
                           multiple_fields_style_sheet.length() +
@@ -107,7 +107,7 @@ String LayoutThemeDefault::ExtraDefaultStyleSheet() {
 }
 
 String LayoutThemeDefault::ExtraQuirksStyleSheet() {
-  return LoadResourceAsASCIIString("themeWinQuirks.css");
+  return GetDataResourceAsASCIIString("themeWinQuirks.css");
 }
 
 Color LayoutThemeDefault::ActiveListBoxSelectionBackgroundColor() const {

third_party/WebKit/Source/core/layout/LayoutThemeLinux.cpp

@@ -4,7 +4,7 @@
 
 #include "core/layout/LayoutThemeLinux.h"
 
-#include "platform/PlatformResourceLoader.h"
+#include "platform/DataResourceHelper.h"
 
 namespace blink {
 
@@ -19,7 +19,7 @@ LayoutTheme& LayoutTheme::NativeTheme() {
 
 String LayoutThemeLinux::ExtraDefaultStyleSheet() {
   return LayoutThemeDefault::ExtraDefaultStyleSheet() +
-         LoadResourceAsASCIIString("themeChromiumLinux.css");
+         GetDataResourceAsASCIIString("themeChromiumLinux.css");
 }
 
 }  // namespace blink

third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

@@ -31,8 +31,8 @@
 #import "core/layout/LayoutView.h"
 #import "core/paint/MediaControlsPainter.h"
 #import "core/style/ShadowList.h"
+#import "platform/DataResourceHelper.h"
 #import "platform/LayoutTestSupport.h"
-#import "platform/PlatformResourceLoader.h"
 #import "platform/RuntimeEnabledFeatures.h"
 #import "platform/Theme.h"
 #import "platform/graphics/BitmapImage.h"
@@ -1083,8 +1083,8 @@ static RGBA32 MenuBackgroundColor() {
 
 String LayoutThemeMac::ExtraDefaultStyleSheet() {
   return LayoutTheme::ExtraDefaultStyleSheet() +
-         LoadResourceAsASCIIString("themeInputMultipleFields.css") +
-         LoadResourceAsASCIIString("themeMac.css");
+         GetDataResourceAsASCIIString("themeInputMultipleFields.css") +
+         GetDataResourceAsASCIIString("themeMac.css");
 }
 
 bool LayoutThemeMac::ThemeDrawsFocusRing(const ComputedStyle& style) const {

third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp

@@ -26,8 +26,8 @@
 #include "core/layout/LayoutThemeMobile.h"
 
 #include "core/style/ComputedStyle.h"
+#include "platform/DataResourceHelper.h"
 #include "platform/LayoutTestSupport.h"
-#include "platform/PlatformResourceLoader.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThemeEngine.h"
 
@@ -41,16 +41,16 @@ LayoutThemeMobile::~LayoutThemeMobile() {}
 
 String LayoutThemeMobile::ExtraDefaultStyleSheet() {
   return LayoutThemeDefault::ExtraDefaultStyleSheet() +
-         LoadResourceAsASCIIString("themeChromiumLinux.css") +
-         LoadResourceAsASCIIString("themeChromiumAndroid.css");
+         GetDataResourceAsASCIIString("themeChromiumLinux.css") +
+         GetDataResourceAsASCIIString("themeChromiumAndroid.css");
 }
 
 String LayoutThemeMobile::ExtraMediaControlsStyleSheet() {
-  return LoadResourceAsASCIIString("mediaControlsAndroid.css");
+  return GetDataResourceAsASCIIString("mediaControlsAndroid.css");
 }
 
 String LayoutThemeMobile::ExtraFullscreenStyleSheet() {
-  return LoadResourceAsASCIIString("fullscreenAndroid.css");
+  return GetDataResourceAsASCIIString("fullscreenAndroid.css");
 }
 
 void LayoutThemeMobile::AdjustInnerSpinButtonStyle(ComputedStyle& style) const {

third_party/WebKit/Source/core/xml/DocumentXMLTreeViewer.cpp

@@ -9,15 +9,16 @@
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/frame/LocalFrame.h"
-#include "platform/PlatformResourceLoader.h"
+#include "platform/DataResourceHelper.h"
 #include "platform/bindings/DOMWrapperWorld.h"
 #include "platform/bindings/V8PerIsolateData.h"
 
 namespace blink {
 
 void TransformDocumentToXMLTreeView(Document& document) {
-  String script_string = LoadResourceAsASCIIString("DocumentXMLTreeViewer.js");
-  String css_string = LoadResourceAsASCIIString("DocumentXMLTreeViewer.css");
+  String script_string =
+      GetDataResourceAsASCIIString("DocumentXMLTreeViewer.js");
+  String css_string = GetDataResourceAsASCIIString("DocumentXMLTreeViewer.css");
 
   HeapVector<ScriptSourceCode> sources;
   sources.push_back(ScriptSourceCode(script_string));

third_party/WebKit/Source/platform/BUILD.gn

@@ -146,8 +146,8 @@ action("instrumentation_probes") {
 
   outputs = [
     "$blink_platform_output_dir/PlatformProbeSink.h",
-    "$blink_platform_output_dir/PlatformProbesInl.h",
     "$blink_platform_output_dir/PlatformProbesImpl.cpp",
+    "$blink_platform_output_dir/PlatformProbesInl.h",
   ]
 
   args = [
@@ -244,6 +244,8 @@ component("platform") {
     "CryptoResult.h",
     "Cursor.cpp",
     "Cursor.h",
+    "DataResourceHelper.cpp",
+    "DataResourceHelper.h",
     "DateComponents.cpp",
     "DateComponents.h",
     "Decimal.cpp",
@@ -297,8 +299,6 @@ component("platform") {
     "PlatformChromeClient.h",
     "PlatformExport.h",
     "PlatformFrameView.h",
-    "PlatformResourceLoader.cpp",
-    "PlatformResourceLoader.h",
     "PluginScriptForbiddenScope.cpp",
     "PluginScriptForbiddenScope.h",
     "PopupMenu.h",

third_party/WebKit/Source/platform/PlatformResourceLoader.cpp → third_party/WebKit/Source/platform/DataResourceHelper.cpp

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "platform/PlatformResourceLoader.h"
+#include "platform/DataResourceHelper.h"
 
 #include "public/platform/Platform.h"
 #include "public/platform/WebData.h"
 
 namespace blink {
 
-String LoadResourceAsASCIIString(const char* resource) {
-  const WebData& resource_data = Platform::Current()->LoadResource(resource);
+String GetDataResourceAsASCIIString(const char* resource) {
+  const WebData& resource_data = Platform::Current()->GetDataResource(resource);
   String data_string(resource_data.Data(), resource_data.size());
   DCHECK(!data_string.IsEmpty());
   DCHECK(data_string.ContainsOnlyASCII());

third_party/WebKit/Source/platform/PlatformResourceLoader.h → third_party/WebKit/Source/platform/DataResourceHelper.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PlatformResourceLoader_h
-#define PlatformResourceLoader_h
+#ifndef DataResourceHelper_h
+#define DataResourceHelper_h
 
 #include "platform/PlatformExport.h"
 #include "platform/wtf/text/WTFString.h"
 
 namespace blink {
 
-PLATFORM_EXPORT String LoadResourceAsASCIIString(const char* resource);
+PLATFORM_EXPORT String GetDataResourceAsASCIIString(const char* resource);
 
 }  // namespace blink
 
-#endif  // PlatformResourceLoader_h
+#endif  // DataResourceHelper_h