Merge WebKit at r71558: Initial merge by git.

Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c

1 files changed, 81 insertions, 52 deletions

diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index f121c5f..4dcc61a 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -328,6 +328,7 @@
                 'src/EditorClientImpl.h',
                 'src/EventListenerWrapper.cpp',
                 'src/EventListenerWrapper.h',
+                'src/Extensions3DChromium.cpp',
                 'src/ExternalPopupMenu.cpp',
                 'src/ExternalPopupMenu.h',
                 'src/FrameLoaderClientImpl.cpp',
@@ -741,7 +742,6 @@
                 'action': ['python', '<@(_script_name)', '<@(_input_page)', '<@(_search_path)', '<@(_outputs)'],
             }],
         },
-
         {
             'target_name': 'webkit_unit_tests',
             'type': 'executable',
@@ -801,6 +801,17 @@
                         }],
                     ],
                 }],
+                ['inside_chromium_build==1 and OS=="win" and component!="shared_library"', {
+                    'configurations': {
+                        'Debug_Base': {
+                            'msvs_settings': {
+                                'VCLinkerTool': {
+                                    'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                                },
+                            },
+                        },
+                    },
+                }],
             ],
         },
         {
@@ -826,6 +837,7 @@
             'dependencies': [
                 'ImageDiff',
                 'inspector_resources',
+                'TestNetscapePlugIn',
                 'webkit',
                 '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
                 '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
@@ -872,6 +884,17 @@
                                 '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
                             ],
                         }],
+                        ['inside_chromium_build==1', {
+                            'configurations': {
+                                'Debug_Base': {
+                                    'msvs_settings': {
+                                        'VCLinkerTool': {
+                                            'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                                        },
+                                    },
+                                },
+                            },
+                        }],
                     ],
                     'copies': [{
                         'destination': '<(PRODUCT_DIR)',
@@ -881,9 +904,6 @@
                     'sources/': [
                         ['exclude', 'Win\\.cpp$'],
                     ],
-                    'dependencies': [
-                        'TestNetscapePlugIn',
-                    ],
                     'actions': [
                         {
                             'action_name': 'repack_locale',
@@ -972,6 +992,63 @@
                 }],
             ],
         },
+        {
+            'target_name': 'TestNetscapePlugIn',
+            'type': 'loadable_module',
+            'sources': [ '<@(test_plugin_files)' ],
+            'dependencies': [
+                '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+            ],
+            'include_dirs': [
+                '<(chromium_src_dir)',
+                '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn',
+                '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
+            ],
+            'conditions': [
+                ['OS=="mac"', {
+                    'mac_bundle': 1,
+                    # It would be nice to name this
+                    # TestNetscapePlugIn, but that name is already
+                    # used by the fork of this plugin in Chromium.
+                    'product_name': 'WebKitTestNetscapePlugIn',
+                    'product_extension': 'plugin',
+                    'link_settings': {
+                        'libraries': [
+                            '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+                            '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+                            '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+                        ]
+                    },
+                    'xcode_settings': {
+                        'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
+                        # This is a temporary fork of
+                        # DRT/TestNetscapePlugIn/mac/Info.plist.  Once
+                        # we get rid of our forked plugin in the
+                        # chromium repo, we can share the same
+                        # Info.plist.
+                        'INFOPLIST_FILE': '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist',
+                    },
+                }],
+                ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+                    'cflags': [
+                        '-fvisibility=default',
+                    ],
+                }],
+                ['OS=="win"', {
+                    'defines': [
+                        # This seems like a hack, but this is what Safari Win does.
+                        'snprintf=_snprintf',
+                    ],
+                    'sources': [
+                        '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.def',
+                        '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc',
+                    ],
+                    # The .rc file requires that the name of the dll is npTestNetscapePlugin.dll.
+                    # This adds the 'np' to the dll name.
+                    'product_prefix': 'np',
+                }],
+            ],
+        },
     ], # targets
     'conditions': [
         ['OS=="win"', {
@@ -980,54 +1057,6 @@
                 'type': 'executable',
                 'sources': ['../../WebKitTools/DumpRenderTree/chromium/LayoutTestHelperWin.cpp'],
             }],
-        }, {  # OS!="win"
-            'targets': [
-                {
-                    'target_name': 'TestNetscapePlugIn',
-                    'type': 'loadable_module',
-                    'sources': [ '<@(test_plugin_files)' ],
-                    'dependencies': [
-                        '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
-                    ],
-                    'include_dirs': [
-                        '<(chromium_src_dir)',
-                        '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn',
-                        '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
-                    ],
-
-                    'conditions': [
-                        ['OS=="mac"', {
-                            'mac_bundle': 1,
-                            # It would be nice to name this
-                            # TestNetscapePlugIn, but that name is already
-                            # used by the fork of this plugin in Chromium.
-                            'product_name': 'WebKitTestNetscapePlugIn',
-                            'product_extension': 'plugin',
-                            'link_settings': {
-                                'libraries': [
-                                    '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
-                                    '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
-                                    '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
-                                ]
-                            },
-                            'xcode_settings': {
-                                'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
-                                # This is a temporary fork of
-                                # DRT/TestNetscapePlugIn/mac/Info.plist.  Once
-                                # we get rid of our forked plugin in the
-                                # chromium repo, we can share the same
-                                # Info.plist.
-                                'INFOPLIST_FILE': '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist',
-                            },
-                        }],
-                        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-                            'cflags': [
-                                '-fvisibility=default',
-                            ],
-                        }],
-                    ],
-                },
-            ],
         }],
         ['OS=="mac"', {
             'targets': [