Commit 462469eb authored by kbr@chromium.org's avatar kbr@chromium.org

Revert 285701 "Revert of Migrate all usages of xxd.py to blink_r..."

The original revert can not be done in isolation. There are dependent
changes in Blink. This revert broke all of the tests on the GPU bots
and likely tests on other bots. Undoing the revert.

> Revert of Migrate all usages of xxd.py to blink_resources.grd and remove xxd.py - Part 2 (https://codereview.chromium.org/403273003/)
> 
> Reason for revert:
> It broke the component builds.
> 
> Original issue's description:
> > Migrate all usages of xxd.py to blink_resources.grd and remove xxd.py - Part 2
> > 
> > Blink should make use of blink_resources.grd for the inline resources of inspector.
> > This removes the dependency upon using xxd.py which embeds these resources as strings.
> > 
> > Part 1: https://crrev.com/401233003
> > Part 3: https://crrev.com/402033002
> > 
> > BUG=312586
> > 
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285436
> 
> TBR=jochen@chromium.org,abarth@chromium.org,vivekg@chromium.org,vivek.vg@samsung.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=312586
> 
> Review URL: https://codereview.chromium.org/421623004

TBR=aurimas@chromium.org

Review URL: https://codereview.chromium.org/420923002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285713 0039d316-1c4b-4281-b951-d872f2087c98
parent 33e9e431
......@@ -756,6 +756,15 @@ const DataResource kDataResources[] = {
IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P },
{ "XMLViewer.js", IDR_XML_VIEWER_JS, ui::SCALE_FACTOR_NONE },
{ "XMLViewer.css", IDR_XML_VIEWER_CSS, ui::SCALE_FACTOR_NONE },
{ "InspectorOverlayPage.html", IDR_INSPECTOR_OVERLAY_PAGE_HTML,
ui::SCALE_FACTOR_NONE },
{ "InjectedScriptCanvasModuleSource.js",
IDR_INSPECTOR_INJECTED_SCRIPT_CANVAS_MODULE_SOURCE_JS,
ui::SCALE_FACTOR_NONE },
{ "InjectedScriptSource.js", IDR_INSPECTOR_INJECTED_SCRIPT_SOURCE_JS,
ui::SCALE_FACTOR_NONE },
{ "DebuggerScriptSource.js", IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS,
ui::SCALE_FACTOR_NONE },
#ifdef IDR_PICKER_COMMON_JS
{ "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE },
{ "pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment