diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 01:02:29 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 01:02:29 +0000 |
| commit | 30c8f5429e4ffe4f1e4fc5ba5fe234929a808454 (patch) | |
| tree | aa19065525865d5979dcd0f612dc9776df523849 /webkit | |
| parent | d2b5818f4a700dc5160a1ab81dd8afe03520c279 (diff) | |
| download | chromium_src-30c8f5429e4ffe4f1e4fc5ba5fe234929a808454.zip chromium_src-30c8f5429e4ffe4f1e4fc5ba5fe234929a808454.tar.gz chromium_src-30c8f5429e4ffe4f1e4fc5ba5fe234929a808454.tar.bz2 | |
renamed webkit_resources.pak file to webkit_resources_100_percent.pak.
BUG=140021
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=154277
Reverted
Review URL: https://chromiumcodereview.appspot.com/10870084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/resources/webkit_resources.grd | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/webkit/glue/resources/webkit_resources.grd b/webkit/glue/resources/webkit_resources.grd index 9d26655..3edee8f 100644 --- a/webkit/glue/resources/webkit_resources.grd +++ b/webkit/glue/resources/webkit_resources.grd @@ -4,7 +4,9 @@ <output filename="grit/webkit_resources.h" type="rc_header" context="default_100_percent"> <emit emit_type='prepend'></emit> </output> + <!-- TODO, update third_party/webkit DumpRenderTree to use *_100_percent.pak, then delete old pak file. --> <output filename="webkit_resources.pak" type="data_package" context="default_100_percent" /> + <output filename="webkit_resources_100_percent.pak" type="data_package" context="default_100_percent" /> <output filename="webkit_resources_200_percent.pak" type="data_package" context="default_200_percent" /> <output filename="webkit_resources.rc" type="rc_all" context="default_100_percent" /> </outputs> diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index b1c17d7..37847e9 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -177,7 +177,7 @@ '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', ], }, @@ -298,7 +298,7 @@ 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', ], }, 'inputs': [ |