Merge WebKit at r62496: Initial merge by git

Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2

1 files changed, 79 insertions, 43 deletions

diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index a53dd28..e2da1b4 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -52,7 +52,6 @@
     'targets': [
         {
             'target_name': 'webkit',
-            'type': '<(webkit_target_type)',
             'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
             'dependencies': [
                 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
@@ -93,7 +92,6 @@
                 'public/WebColorName.h',
                 'public/WebCommon.h',
                 'public/WebCommonWorkerClient.h',
-                'public/WebCompositionCommand.h',
                 'public/WebCompositionUnderline.h',
                 'public/WebConsoleMessage.h',
                 'public/WebContextMenuData.h',
@@ -231,8 +229,6 @@
                 'src/ApplicationCacheHost.cpp',
                 'src/ApplicationCacheHostInternal.h',
                 'src/AssertMatchingEnums.cpp',
-                'src/AutocompletePopupMenuClient.cpp',
-                'src/AutocompletePopupMenuClient.h',
                 'src/AutoFillPopupMenuClient.cpp',
                 'src/AutoFillPopupMenuClient.h',
                 'src/BackForwardListClientImpl.cpp',
@@ -312,8 +308,6 @@
                 'src/StorageEventDispatcherImpl.h',
                 'src/StorageNamespaceProxy.cpp',
                 'src/StorageNamespaceProxy.h',
-                'src/SuggestionsPopupMenuClient.cpp',
-                'src/SuggestionsPopupMenuClient.h',
                 'src/TemporaryGlue.h',
                 'src/ToolsAgent.h',
                 'src/WebAccessibilityCache.cpp',
@@ -447,6 +441,34 @@
                 'src/win/WebScreenInfoFactory.cpp',
             ],
             'conditions': [
+                ['inside_chromium_build==1 and OS=="win"', {
+                    'type': '<(component)',
+
+                    'conditions': [
+                        ['component=="shared_library"', {
+                            'defines': [
+                                'WEBKIT_DLL',
+                                'USING_V8_SHARED',
+                            ],
+                            'dependencies': [
+                                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings',
+                                '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
+                                '<(chromium_src_dir)/third_party/icu/icu.gyp:*',
+                                '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
+                                '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
+                                '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
+                                '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
+                                '<(chromium_src_dir)/third_party/modp_b64/modp_b64.gyp:modp_b64',
+                                '<(chromium_src_dir)/third_party/nss/nss.gyp:*',
+                                '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
+                                '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
+                                '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+                            ],
+                        }],
+                    ],
+                }, {
+                    'type': '<(webkit_target_type)'
+                }],
                 ['OS=="linux" or OS=="freebsd"', {
                     'dependencies': [
                         '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
@@ -504,13 +526,6 @@
                         'GLEW_NO_GLU=1',
                     ],
                     'conditions': [
-                        ['OS=="win"', {
-                            'link_settings': {
-                                'libraries': [
-                                    '-lopengl32.lib',
-                                ],
-                            },
-                        }],
                         ['OS=="mac"', {
                             'link_settings': {
                                 'libraries': [
@@ -524,39 +539,46 @@
         },
         {
             'target_name': 'webkit_unit_tests',
-            'type': 'executable',
-            'msvs_guid': '7CEFE800-8403-418A-AD6A-2D52C6FC3EAD',
-            'dependencies': [
-                'webkit',
-                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
-                '<(chromium_src_dir)/testing/gtest.gyp:gtest',
-                '<(chromium_src_dir)/base/base.gyp:base',
-                '<(chromium_src_dir)/base/base.gyp:base_i18n',
-                '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
-            ],
-            'include_dirs': [
-                'public',
-                'src',
-            ],
-            'sources': [
-                'tests/DragImageTest.cpp',
-                'tests/KeyboardTest.cpp',
-                'tests/KURLTest.cpp',
-                'tests/RunAllTests.cpp',
-            ],
             'conditions': [
-                ['OS=="win"', {
-                    'sources': [
-                        # FIXME: Port PopupMenuTest to Linux and Mac.
-                        'tests/PopupMenuTest.cpp',
-                        'tests/TransparencyWinTest.cpp',
-                        'tests/UniscribeHelperTest.cpp',
+                # FIXME: make webkit unit tests working for multi dll build.
+                ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
+                    'type': 'none',
+                }, {
+                    'type': 'executable',
+                    'msvs_guid': '7CEFE800-8403-418A-AD6A-2D52C6FC3EAD',
+                    'dependencies': [
+                        'webkit',
+                        '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
+                        '<(chromium_src_dir)/testing/gtest.gyp:gtest',
+                        '<(chromium_src_dir)/base/base.gyp:base',
+                        '<(chromium_src_dir)/base/base.gyp:base_i18n',
+                        '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
                     ],
-                }],
-                ['OS=="mac"', {
-                    'sources!': [
-                        # FIXME: Port DragImageTest to Mac.
+                    'include_dirs': [
+                        'public',
+                        'src',
+                    ],
+                    'sources': [
                         'tests/DragImageTest.cpp',
+                        'tests/KeyboardTest.cpp',
+                        'tests/KURLTest.cpp',
+                        'tests/RunAllTests.cpp',
+                    ],
+                    'conditions': [
+                        ['OS=="win"', {
+                            'sources': [
+                                # FIXME: Port PopupMenuTest to Linux and Mac.
+                                'tests/PopupMenuTest.cpp',
+                                'tests/TransparencyWinTest.cpp',
+                                'tests/UniscribeHelperTest.cpp',
+                            ],
+                        }],
+                        ['OS=="mac"', {
+                            'sources!': [
+                                # FIXME: Port DragImageTest to Mac.
+                                'tests/DragImageTest.cpp',
+                            ],
+                        }],
                     ],
                 }],
             ],
@@ -614,6 +636,20 @@
                         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
                         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
                     ],
+                    'conditions': [
+                        ['inside_chromium_build==1 and component=="shared_library"', {
+                            'sources': [
+                                'src/ChromiumCurrentTime.cpp',
+                                'src/ChromiumThreading.cpp',
+                            ],
+                            'include_dirs': [
+                                'public',
+                            ],
+                            'dependencies': [
+                                '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+                            ],
+                        }],
+                    ],
                     'copies': [{
                         'destination': '<(PRODUCT_DIR)',
                         'files': ['<(ahem_path)'],