Skip to content
Permalink
Browse files
[chromium] build a DumpRenderTree.pak even on windows
https://bugs.webkit.org/show_bug.cgi?id=111504

Reviewed by Tony Chang.

The Chromium Aura build uses the default theme to draw
controls, and that theme requires the ui ResourceBundle
to be initialized. On every other platform, we build
a DumpRenderTree.pak that works for this, but on Windows we
still compile the resources directly into DRT. As a first step,
let's build the pak file. I will then need to land a patch
in Chromium to actually load it. Then I can go back and move
the resources over to just use the .pak file and no longer need
the .rc's.

* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:

Canonical link: https://commits.webkit.org/129884@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144863 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
dpranke committed Mar 6, 2013
1 parent d7da99c commit 796ed5a728788df9d073f902820c8f68be02b15d
Showing 2 changed files with 46 additions and 35 deletions.
@@ -1,3 +1,22 @@
2013-03-05 Dirk Pranke <dpranke@chromium.org>

[chromium] build a DumpRenderTree.pak even on windows
https://bugs.webkit.org/show_bug.cgi?id=111504

Reviewed by Tony Chang.

The Chromium Aura build uses the default theme to draw
controls, and that theme requires the ui ResourceBundle
to be initialized. On every other platform, we build
a DumpRenderTree.pak that works for this, but on Windows we
still compile the resources directly into DRT. As a first step,
let's build the pak file. I will then need to land a patch
in Chromium to actually load it. Then I can go back and move
the resources over to just use the .pak file and no longer need
the .rc's.

* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:

2013-03-05 Julie Parent <jparent@chromium.org>
Dashboard cleanup: move string utilities into their own namespace.

@@ -232,6 +232,7 @@
'mac_bundle': 1,
'dependencies': [
'TestRunner',
'DumpRenderTree_resources',
'<(source_dir)/WebKit/chromium/WebKit.gyp:inspector_resources',
'<(source_dir)/WebKit/chromium/WebKit.gyp:webkit',
'<(source_dir)/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
@@ -272,6 +273,7 @@
],
'resource_include_dirs': ['<(SHARED_INTERMEDIATE_DIR)/webkit'],
'sources': [
# FIXME: We should just use the resources in the .pak file.
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
@@ -294,29 +296,6 @@
'sources/': [
['exclude', 'Win\\.cpp$'],
],
'actions': [
{
'action_name': 'repack_locale',
'variables': {
'repack_path': '<(chromium_src_dir)/tools/grit/grit/format/repack.py',
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
]},
'inputs': [
'<(repack_path)',
'<@(pak_inputs)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
],
'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
'process_outputs_as_mac_bundle_resources': 1,
},
], # actions
}],
['OS=="mac"', {
'dependencies': [
@@ -337,12 +316,6 @@
'dependencies': [
'<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
],
'copies': [{
'destination': '<(PRODUCT_DIR)',
'files': [
'<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
]
}],
'variables': {
# FIXME: Enable warnings on other platforms.
'chromium_code': 1,
@@ -378,12 +351,6 @@
'<(chromium_src_dir)/tools/android/forwarder/forwarder.gyp:forwarder',
'<(chromium_src_dir)/tools/android/md5sum/md5sum.gyp:md5sum',
],
'copies': [{
'destination': '<(PRODUCT_DIR)',
'files': [
'<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
]
}],
}, { # OS!="android"
'sources/': [
['exclude', 'Android\\.cpp$'],
@@ -401,6 +368,31 @@
}],
],
},
{
'target_name': 'DumpRenderTree_resources',
'type': 'none',
'actions': [{
'action_name': 'repack_local',
'variables': {
'repack_path': '<(chromium_src_dir)/tools/grit/grit/format/repack.py',
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
]},
'inputs': [
'<(repack_path)',
'<@(pak_inputs)',
],
'outputs': [
'<(PRODUCT_DIR)/DumpRenderTree.pak',
],
'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
'process_outputs_as_mac_bundle_resources': 1,
}],
},
{
'target_name': 'TestNetscapePlugIn',
'type': 'loadable_module',

0 comments on commit 796ed5a

Please sign in to comment.