[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tony at chromium.org
tony at chromium.org
Wed Dec 22 16:12:54 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f0a5be5f680a7257ac84d0f5876b5774448d5bc0
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 19 18:29:35 2010 +0000
2010-11-19 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
[chromium] Enable webkit's TestNetscapePlugIn for DRT on win and linux
https://bugs.webkit.org/show_bug.cgi?id=49706
* platform/chromium/drt_expectations.txt:
2010-11-19 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
[chromium] Enable webkit's TestNetscapePlugIn for DRT on win and linux
https://bugs.webkit.org/show_bug.cgi?id=49706
It is enabled simply by copying the plugin into
{Debug,Release}/plugins. This change also rolls in a version of
Chromium that disables the old plugin.
* WebKit.gyp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72417 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f82201a..24e6428 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-19 Tony Chang <tony at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ [chromium] Enable webkit's TestNetscapePlugIn for DRT on win and linux
+ https://bugs.webkit.org/show_bug.cgi?id=49706
+
+ * platform/chromium/drt_expectations.txt:
+
2010-11-19 James Simonsen <simonjam at chromium.org>
Reviewed by Darin Fisher.
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index 5627913..f0a19e6 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -76,21 +76,23 @@ BUGWK49406 MAC : svg/animations/animVal-basics.html = TIMEOUT
// Tests differences from switching to webkit.org's test netscape plugin rather
// than chromium's old forked copy.
-BUG_DRT MAC : plugins/document-open.html = PASS
+BUG_DRT : plugins/document-open.html = PASS
+BUG_DRT LINUX : plugins/reentrant-update-widget-positions.html = PASS
BUG_DRT MAC : plugins/geturlnotify-during-document-teardown.html = TEXT
-BUG_DRT MAC : plugins/npruntime/get-int-identifier-special-values.html = TEXT
-BUG_DRT MAC : plugins/npruntime/round-trip-npobject.html = PASS
+BUGWK48655 : plugins/js-from-destroy.html = CRASH
+BUGWK49036 : plugins/npruntime/get-int-identifier-special-values.html = TEXT
+BUG_DRT : plugins/npruntime/round-trip-npobject.html = PASS
BUG_DRT MAC : plugins/open-and-close-window-with-plugin.html = TEXT
-BUG_DRT MAC : plugins/override-node-method.html = PASS
-BUG_DRT MAC : plugins/reloadplugins-no-pages.html = PASS
-BUG_DRT MAC : plugins/reloadplugins-and-pages.html = PASS
-BUG_DRT MAC : plugins/update-widgets-crash.html = PASS
+BUG_DRT : plugins/override-node-method.html = PASS
+BUG_DRT : plugins/reloadplugins-no-pages.html = PASS
+BUG_DRT : plugins/reloadplugins-and-pages.html = PASS
+BUG_DRT : plugins/update-widgets-crash.html = PASS
// This test is failing because the plugin is currently named
// WebKitTestNetscapePlugin because the fork in the Chromium repo is named
// TestNetscapePlugin. Once the internal plugin is removed, this will be
// fixed.
-BUG_DRT MAC : plugins/plugin-javascript-access.html = TEXT
+BUG_DRT : plugins/plugin-javascript-access.html = TEXT
// Not investigated.
BUG_DRT WIN MAC LINUX : fast/dynamic/window-resize-scrollbars-test.html = IMAGE+TEXT
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0c35b8e..9b7c4f1 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-19 Tony Chang <tony at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ [chromium] Enable webkit's TestNetscapePlugIn for DRT on win and linux
+ https://bugs.webkit.org/show_bug.cgi?id=49706
+
+ It is enabled simply by copying the plugin into
+ {Debug,Release}/plugins. This change also rolls in a version of
+ Chromium that disables the old plugin.
+
+ * WebKit.gyp:
+
2010-11-19 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r72399.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 5c9e01a..f78c945 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '66764'
+ 'chromium_rev': '66780'
}
deps = {
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index ad4ab5d..d5d937a 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -869,6 +869,7 @@
'ImageDiff',
'inspector_resources',
'TestNetscapePlugIn',
+ 'copy_TestNetscapePlugIn',
'webkit',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
'<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
@@ -976,20 +977,11 @@
'../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
'<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
],
- # Workaround for http://code.google.com/p/gyp/issues/detail?id=160
- 'copies': [{
- 'destination': '<(PRODUCT_DIR)/plugins/',
- 'files': ['<(PRODUCT_DIR)/WebKitTestNetscapePlugIn.plugin/'],
- }],
},{ # OS!="mac"
'sources/': [
# .mm is already excluded by common.gypi
['exclude', 'Mac\\.cpp$'],
],
- 'dependencies': [
- # FIXME: Switch to webkit.org's plugin.
- '<(chromium_src_dir)/webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugin',
- ],
}],
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'dependencies': [
@@ -1080,6 +1072,33 @@
}],
],
},
+ {
+ 'target_name': 'copy_TestNetscapePlugIn',
+ 'type': 'none',
+ 'dependencies': [
+ 'TestNetscapePlugIn',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'copies': [{
+ 'destination': '<(PRODUCT_DIR)/plugins',
+ 'files': ['<(PRODUCT_DIR)/npTestNetscapePlugIn.dll'],
+ }],
+ }],
+ ['OS=="mac"', {
+ 'copies': [{
+ 'destination': '<(PRODUCT_DIR)/plugins/',
+ 'files': ['<(PRODUCT_DIR)/WebKitTestNetscapePlugIn.plugin/'],
+ }],
+ }],
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+ 'copies': [{
+ 'destination': '<(PRODUCT_DIR)/plugins',
+ 'files': ['<(PRODUCT_DIR)/libTestNetscapePlugIn.so'],
+ }],
+ }],
+ ],
+ },
], # targets
'conditions': [
['OS=="win"', {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list