Changeset 60987 in webkit

Timestamp:

Jun 10, 2010 9:05:56 PM (14 years ago)

Author:

tkent@chromium.org

Message:

[DRT/Chromium] Support plugin tests
​https://bugs.webkit.org/show_bug.cgi?id=40413

Reviewed by Dimitri Glazkov.

• DEPS: Bump the Chromium revision to r49376 to have a npapi_layout_test_plugin change and Linux <progress> resources. Add third_party/mesa because app/ depends on them since r49332.
• WebKit.gyp: Copy a plugin binary for DRT to recognize it.

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• DEPS (modified) (2 diffs)
• WebKit.gyp (modified) (4 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-10  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [DRT/Chromium] Support plugin tests
+        https://bugs.webkit.org/show_bug.cgi?id=40413
+
+        * DEPS:
+         Bump the Chromium revision to r49376 to have a npapi_layout_test_plugin
+         change and Linux <progress> resources.
+         Add third_party/mesa because app/ depends on them
+         since r49332.
+        * WebKit.gyp:
+          Copy a plugin binary for DRT to recognize it.
+
 2010-06-10  James Hawkins  <jhawkins@chromium.org>
 

trunk/WebKit/chromium/DEPS

@@ -33 +33 @@
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '49224',
+  'chromium_rev': '49376',
 }
 
@@ -100 +100 @@
   'third_party/libvpx/lib':
     From('chromium_deps', 'src/third_party/libvpx/lib'),
+  'third_party/mesa':
+    Var('chromium_svn')+'/third_party/mesa@'+Var('chromium_rev'),
   'third_party/yasm': # needed by ffmpeg
     Var('chromium_svn')+'/third_party/yasm@'+Var('chromium_rev'),

trunk/WebKit/chromium/WebKit.gyp

@@ -576 +576 @@
                 '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
                 '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:npapi_layout_test_plugin',
                 '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
             ],
@@ -606 +607 @@
                         'destination': '<(PRODUCT_DIR)',
                         'files': ['<(ahem_path)'],
+                    }, {
+                        # This should really be done in the 'npapi_layout_test_plugin'
+                        # target, but the current VS generator handles 'copies'
+                        # settings as AdditionalDependencies, which means that
+                        # when it's over there, it tries to do the copy *before*
+                        # the file is built, instead of after.  We work around this
+                        # by attaching the copy here, since it depends on that
+                        # target.
+                        'destination': '<(PRODUCT_DIR)/plugins',
+                        'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
                     }],
                 },{ # OS!="win"
@@ -650 +661 @@
                         '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
                     ],
+                    'copies': [{
+                        'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Contents/PlugIns/',
+                        'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'],
+                    }],
                 },{ # OS!="mac"
                     'sources/': [
@@ -664 +679 @@
                             '<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
                         ]
+                    }, {
+                        'destination': '<(PRODUCT_DIR)/plugins',
+                        'files': ['<(PRODUCT_DIR)/libnpapi_layout_test_plugin.so'],
                     }],
                 },{ # OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris"