Fixing gyp description for windows with webkit/test_shell.

This does not throw the switch to turn it on for the world yet.

Review URL: http://codereview.chromium.org/66008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13474 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 132 insertions, 15 deletions

diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index a9197e8..95a35e9 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -5,6 +5,21 @@
 {
   'variables': {
     'chromium_code': 1,
+    'test_shell_windows_resource_files': [
+      'resources/test_shell.rc',
+      'resources/pan_east.cur',
+      'resources/pan_middle.cur',
+      'resources/pan_north.cur',
+      'resources/pan_north_east.cur',
+      'resources/pan_north_west.cur',
+      'resources/pan_south.cur',
+      'resources/pan_south_east.cur',
+      'resources/pan_south_west.cur',
+      'resources/pan_west.cur',
+      'resources/small.ico',
+      'resources/test_shell.ico',
+      'resource.h',
+    ],
   },
   'includes': [
     '../../../build/common.gypi',
@@ -24,6 +39,13 @@
         '../../webkit.gyp:webkit',
       ],
       'sources': [
+        # TODO: Clean this up.
+        # An alternate implementation for chrome on windows lives in:
+        #   chrome/renderer/renderer_glue.cc
+        # As a consequence this can't be baked directly into glue.
+        # This version is needed for test_shell and test_shell_tests so
+        # it gets baked into test_shell_common for now.
+        '../../glue/simple_clipboard_impl.cc',
         'mac/DumpRenderTreePasteboard.h',
         'mac/DumpRenderTreePasteboard.m',
         'mac/test_shell_webview.h',
@@ -110,17 +132,21 @@
               '-lcomctl32.lib',
             ],
           },
+          'include_dirs': [
+            '.',
+          ],
           'dependencies': [
-            '../../../breakpad/breakpad.gyp:breakpad_handler',
+            '../../../build/temp_gyp/breakpad.gyp:breakpad_handler',
             '../../default_plugin/default_plugin.gyp:default_plugin',
           ],
         }, {  # else: OS!=win
           'sources/': [
-            ['exclude', '_win\\.cc$']
+            ['exclude', '_win\\.cc$'],
           ],
           'sources!': [
             'drag_delegate.cc',
             'drop_delegate.cc',
+            '../../glue/simple_clipboard_impl.cc',
           ],
         }],
       ],
@@ -129,6 +155,7 @@
       'target_name': 'test_shell',
       'type': 'executable',
       'mac_bundle': 1,
+      'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9',
       'dependencies': [
         'test_shell_common',
       ],
@@ -153,6 +180,9 @@
         'INFOPLIST_FILE': 'mac/Info.plist',
       },
       'conditions': [
+        ['OS=="win"', {
+          'sources': [ '<@(test_shell_windows_resource_files)' ],
+        }],
         ['OS=="linux"', {
           'dependencies': [
             '../../../build/linux/system.gyp:gtk',
@@ -214,6 +244,7 @@
     {
       'target_name': 'test_shell_tests',
       'type': 'executable',
+      'msvs_guid': 'E6766F81-1FCD-4CD7-BC16-E36964A14867',
       'dependencies': [
         'test_shell_common',
         '../../../skia/skia.gyp:skia',
@@ -221,6 +252,7 @@
       ],
       'sources': [
         '../../../skia/ext/convolver_unittest.cc',
+        '../../../skia/ext/image_operations_unittest.cc',
         '../../../skia/ext/platform_canvas_unittest.cc',
         '../../../skia/ext/vector_canvas_unittest.cc',
         '../../glue/bookmarklet_unittest.cc',
@@ -246,6 +278,7 @@
         '../webcore_unit_tests/ICOImageDecoder_unittest.cpp',
         '../webcore_unit_tests/UniscribeHelper_unittest.cpp',
         '../webcore_unit_tests/XBMImageDecoder_unittest.cpp',
+        '../webcore_unit_tests/TransparencyWin_unittest.cpp',
         'image_decoder_unittest.cc',
         'image_decoder_unittest.h',
         'keyboard_unittest.cc',
@@ -258,6 +291,9 @@
         'text_input_controller_unittest.cc',
       ],
       'conditions': [
+        ['OS=="win"', {
+          'sources': [ '<@(test_shell_windows_resource_files)' ],
+        }],
         ['OS=="linux"', {
           'dependencies': [
             # Linux tests use the built test_shell beside the test
@@ -279,8 +315,10 @@
           'msvs_disabled_warnings': [ 4800 ],
         }, {  # else: OS!=win
           'sources!': [
+            '../../../skia/ext/image_operations_unittest.cc',
             '../../../skia/ext/vector_canvas_unittest.cc',
             '../webcore_unit_tests/UniscribeHelper_unittest.cpp',
+            '../webcore_unit_tests/TransparencyWin_unittest.cpp',
             'plugin_tests.cc'
           ],
         }],
@@ -322,14 +360,13 @@
         },
       ],
     }],
-    # TODO:  change this condition to 'OS!="mac"'
-    # when Windows is ready for the plugins, too.
-    ['OS=="linux"', {
+    ['OS!="mac"', {
       'targets': [
         {
           'target_name': 'npapi_test_plugin',
           'type': 'loadable_module',
           'product_dir': '<(PRODUCT_DIR)/plugins',
+          'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
           'dependencies': [
             '../../../base/base.gyp:base',
             '../../../third_party/icu38/icu38.gyp:icuuc',
@@ -337,19 +374,37 @@
           ],
           'sources': [
             '../../glue/plugins/test/npapi_constants.cc',
+            '../../glue/plugins/test/npapi_constants.h',
             '../../glue/plugins/test/npapi_test.cc',
+            '../../glue/plugins/test/npapi_test.def',
+            '../../glue/plugins/test/npapi_test.rc',
             '../../glue/plugins/test/plugin_arguments_test.cc',
+            '../../glue/plugins/test/plugin_arguments_test.h',
             '../../glue/plugins/test/plugin_client.cc',
+            '../../glue/plugins/test/plugin_client.h',
             '../../glue/plugins/test/plugin_delete_plugin_in_stream_test.cc',
-            '../../glue/plugins/test/plugin_execute_script_delete_test.cc',
+            '../../glue/plugins/test/plugin_delete_plugin_in_stream_test.h',
             '../../glue/plugins/test/plugin_get_javascript_url_test.cc',
+            '../../glue/plugins/test/plugin_get_javascript_url_test.h',
             '../../glue/plugins/test/plugin_geturl_test.cc',
+            '../../glue/plugins/test/plugin_geturl_test.h',
             '../../glue/plugins/test/plugin_javascript_open_popup.cc',
+            '../../glue/plugins/test/plugin_javascript_open_popup.h',
             '../../glue/plugins/test/plugin_new_fails_test.cc',
+            '../../glue/plugins/test/plugin_new_fails_test.h',
             '../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
+            '../../glue/plugins/test/plugin_npobject_lifetime_test.h',
             '../../glue/plugins/test/plugin_npobject_proxy_test.cc',
+            '../../glue/plugins/test/plugin_npobject_proxy_test.h',
+            '../../glue/plugins/test/plugin_private_test.cc',
+            '../../glue/plugins/test/plugin_private_test.h',
             '../../glue/plugins/test/plugin_test.cc',
+            '../../glue/plugins/test/plugin_test.h',
             '../../glue/plugins/test/plugin_window_size_test.cc',
+            '../../glue/plugins/test/plugin_window_size_test.h',
+            '../../glue/plugins/test/plugin_windowless_test.cc',
+            '../../glue/plugins/test/plugin_windowless_test.h',
+            '../../glue/plugins/test/resource.h',
           ],
           'include_dirs': [
             '../../..',
@@ -362,11 +417,18 @@
                 # plugin_npobject_lifetime_test.cc has win32-isms
                 #   (HWND, CALLBACK).
                 # plugin_window_size_test.cc has w32-isms including HWND.
-                '../../glue/plugins/test/plugin_execute_script_delete_test.cc',
-                '../../glue/plugins/test/plugin_javascript_open_popup.cc',
                 '../../glue/plugins/test/plugin_client.cc',
+                '../../glue/plugins/test/plugin_javascript_open_popup.cc',
                 '../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
+                '../../glue/plugins/test/plugin_private_test.cc',
                 '../../glue/plugins/test/plugin_window_size_test.cc',
+                '../../glue/plugins/test/plugin_windowless_test.cc',
+              ],
+            }],
+            ['OS!="win"', {
+              'sources!': [
+                '../../glue/plugins/test/npapi_test.def',
+                '../../glue/plugins/test/npapi_test.rc',
               ],
             }],
           ],
@@ -375,10 +437,13 @@
           'target_name': 'npapi_layout_test_plugin',
           'type': 'loadable_module',
           'product_dir': '<(PRODUCT_DIR)/plugins',
+          'msvs_guid': 'BE6D5659-A8D5-4890-A42C-090DD10EF62C',
           'sources': [
-            '../npapi_layout_test_plugin/main.cpp',
             '../npapi_layout_test_plugin/PluginObject.cpp',
             '../npapi_layout_test_plugin/TestObject.cpp',
+            '../npapi_layout_test_plugin/main.cpp',
+            '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
+            '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
           ],
           'include_dirs': [
             '../../..',
@@ -387,6 +452,15 @@
             '../../../third_party/npapi/npapi.gyp:npapi',
             '../../webkit.gyp:wtf',
           ],
+          'msvs_disabled_warnings': [ 4996 ],
+          'conditions': [
+            ['OS!="win"', {
+              'sources!': [
+                '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
+                '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
+              ],
+            }],
+          ],
         },
       ],
     }],
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 2f6f12b..b31ea88 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -131,10 +131,26 @@
   ],
   'targets': [
     {
+      # Currently, builders assume webkit.sln builds test_shell on windows.
+      # We should change this, but for now allows trybot runs.
+      # for now.
+      'target_name': 'pull_in_test_shell',
+      'type': 'none',
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': [
+            'tools/test_shell/test_shell.gyp:*',
+            'activex_shim_dll/activex_shim_dll.gyp:*',
+          ],
+        }],
+      ],
+    },
+    {
       # This target creates config.h suitable for a WebKit-V8 build and
       # copies a few other files around as needed.
       'target_name': 'config',
       'type': 'none',
+      'msvs_guid': '2E2D3301-2EC4-4C0F-B889-87073B30F673',
       'actions': [
         {
           'action_name': 'config.h',
@@ -201,6 +217,7 @@
     {
       'target_name': 'wtf',
       'type': '<(library)',
+      'msvs_guid': 'AA8A5A85-592B-4357-BC60-E0E91E026AF6',
       'dependencies': [
         'config',
         '../third_party/icu38/icu38.gyp:icui18n',
@@ -367,6 +384,7 @@
         'config',
         'wtf',
       ],
+      'msvs_guid': '49909552-0B0C-4C14-8CF6-DB8A2ADE0934',
       'actions': [
         {
           'action_name': 'dftables',
@@ -405,6 +423,7 @@
     {
       'target_name': 'webcore',
       'type': '<(library)',
+      'msvs_guid': '1C16337B-ACF3-4D03-AA90-851C5B5EADA6',
       'dependencies': [
         'config',
         'pcre',
@@ -2195,6 +2214,7 @@
         '../third_party/WebKit/WebCore/platform/graphics/mac/WebLayer.mm',
         '../third_party/WebKit/WebCore/platform/graphics/mac/WebTiledLayer.h',
         '../third_party/WebKit/WebCore/platform/graphics/mac/WebTiledLayer.mm',
+        '../third_party/WebKit/WebCore/platform/graphics/MediaPlayer.cpp',
         '../third_party/WebKit/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp',
         '../third_party/WebKit/WebCore/platform/graphics/opentype/OpenTypeUtilities.h',
         '../third_party/WebKit/WebCore/platform/graphics/qt/ColorQt.cpp',
@@ -4082,15 +4102,21 @@
         }],
         ['OS!="linux"', {'sources/': [['exclude', '(Gtk|Linux)\\.cpp$']]}],
         ['OS!="mac"', {'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]}],
-        ['OS!="win"', {'sources/': [
-          ['exclude', 'Win\\.cpp$'],
-          ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$']
-        ]}],
+        ['OS!="win"', {
+          'sources/': [
+            ['exclude', 'Win\\.cpp$'],
+            ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$']
+          ],
+          'sources!': [
+            '../third_party/WebKit/WebCore/platform/graphics/MediaPlayer.cpp',
+          ],
+        }],
       ],
     },
     {
       'target_name': 'webkit',
       'type': '<(library)',
+      'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
       'dependencies': [
         'webcore',
       ],
@@ -4185,6 +4211,7 @@
     {
       'target_name': 'webkit_resources',
       'type': 'none',
+      'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9',
       'dependencies': [
         'webcore',
         'webkit',
@@ -4217,6 +4244,7 @@
     {
       'target_name': 'glue',
       'type': '<(library)',
+      'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09',
       'dependencies': [
         'webcore',
         'webkit',
@@ -4332,7 +4360,8 @@
         'glue/feed_preview.cc',
         'glue/feed_preview.h',
         'glue/form_data.h',
-        'glue/glue_accessibility.cc',
+        'glue/glue_accessibility_object.cc',
+        'glue/glue_accessibility_object.h',
         'glue/glue_serialize.cc',
         'glue/glue_serialize.h',
         'glue/glue_util.cc',
@@ -4368,6 +4397,10 @@
         'glue/simple_webmimeregistry_impl.h',
         'glue/stacking_order_iterator.cc',
         'glue/stacking_order_iterator.h',
+        'glue/webaccessibility.h',
+        'glue/webaccessibilitymanager.h',
+        'glue/webaccessibilitymanager_impl.cc',
+        'glue/webaccessibilitymanager_impl.h',
         'glue/webappcachecontext.cc',
         'glue/webappcachecontext.h',
         'glue/webclipboard_impl.cc',
@@ -4422,6 +4455,7 @@
         'glue/webtextinput.h',
         'glue/webtextinput_impl.cc',
         'glue/webtextinput_impl.h',
+        'glue/webthemeengine_impl_win.cc',
         'glue/weburlrequest.h',
         'glue/weburlrequest_impl.cc',
         'glue/weburlrequest_impl.h',
@@ -4477,9 +4511,16 @@
 
             # These files are Windows-only now but may be ported to other
             # platforms.
+            'glue/glue_accessibility_object.cc',
+            'glue/glue_accessibility_object.h',
             'glue/plugins/mozilla_extensions.cc',
             'glue/plugins/webplugin_delegate_impl.cc',
-            'glue/glue_accessibility.cc',
+            'glue/webaccessibility.h',
+            'glue/webaccessibilitymanager.h',
+            'glue/webaccessibilitymanager_impl.cc',
+            'glue/webaccessibilitymanager_impl.cc',
+            'glue/webaccessibilitymanager_impl.h',
+            'glue/webthemeengine_impl_win.cc',
             'pending/AccessibleBase.cpp',
             'pending/AccessibleDocument.cpp',
           ],
@@ -4491,6 +4532,8 @@
           ],
           'sources!': [
             'glue/plugins/plugin_stubs.cc',
+            # Used directly in test_shell* so it can be replaced in chromium.
+            'glue/simple_clipboard_impl.cc',
           ],
         }],
       ],