[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 14:46:10 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f4519f6a57aae9aba85b1449670ec950d08c64a0
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 19 20:54:25 2010 +0000
2010-10-19 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
[chromium] Use webkit's TestNetscapePlugIn in DRT mac
https://bugs.webkit.org/show_bug.cgi?id=47850
* platform/chromium/drt_expectations.txt: Update passing/failing test
list. More new passing tests than new failing tests.
2010-10-19 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
[chromium] Use webkit's TestNetscapePlugIn in DRT mac
https://bugs.webkit.org/show_bug.cgi?id=47850
* WebKit.gyp: Copy WebKitTestPlugIn into plugins and add
GCC_SYMBOLS_PRIVATE_EXTERN: NO to export the symbols.
2010-10-19 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
[chromium] Use webkit's TestNetscapePlugIn in DRT mac
https://bugs.webkit.org/show_bug.cgi?id=47850
* DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist: Added. Forked
because we're going to name our plugin WebKitTestNetscapePlugIn
temporarily until the chromium forked plugin goes away.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70081 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9fea42c..87a3b80 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-19 Tony Chang <tony at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ [chromium] Use webkit's TestNetscapePlugIn in DRT mac
+ https://bugs.webkit.org/show_bug.cgi?id=47850
+
+ * platform/chromium/drt_expectations.txt: Update passing/failing test
+ list. More new passing tests than new failing tests.
+
2010-10-19 Antonio Gomes <agomes at rim.com>
Unreviewed complementary fix to r70058 (Part II).
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index 0c54211..ae41d2e 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -17,8 +17,8 @@ BUG_DRT WIN MAC LINUX : fast/speech/input-appearance-searchandspeech.html = IMAG
BUG_DRT WIN MAC LINUX : fast/speech/input-appearance-speechbutton.html = IMAGE
// Plugin failures
-BUG48431 WIN MAC LINUX : plugins/geturlnotify-during-document-teardown.html = TEXT
-BUG48431 WIN MAC LINUX : plugins/open-and-close-window-with-plugin.html = TEXT
+BUG48431 WIN LINUX : plugins/geturlnotify-during-document-teardown.html = TEXT
+BUG48431 WIN LINUX : plugins/open-and-close-window-with-plugin.html = TEXT
// Inspector-related failures
BUG_DRT WIN : http/tests/inspector-enabled/console-log-before-frame-navigation.html = TEXT
@@ -69,6 +69,23 @@ BUG59665 MAC : media/video-play-empty-events.html = CRASH TIMEOUT PASS
BUG59665 MAC : media/video-src-change.html = CRASH TEXT PASS
BUG59665 MAC : media/video-src.html = CRASH TIMEOUT PASS
+// Tests differences from switching to webkit.org's test netscape plugin rather
+// than chromium's old forked copy.
+BUG_DRT MAC : plugins/geturlnotify-during-document-teardown.html = CRASH
+BUG_DRT MAC : plugins/js-from-destroy.html = CRASH
+BUG_DRT MAC : plugins/open-and-close-window-with-plugin.html = CRASH
+BUG_DRT MAC : plugins/npruntime/get-int-identifier-special-values.html = TEXT
+BUG_DRT MAC : plugins/document-open.html = PASS
+BUG_DRT MAC : plugins/update-widgets-crash.html = PASS
+BUG_DRT MAC : plugins/npruntime/round-trip-npobject.html = PASS
+BUG_DRT MAC : plugins/override-node-method.html = PASS
+BUG_DRT MAC : plugins/reloadplugins-no-pages.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
+
// Not investigated.
BUG_DRT WIN MAC LINUX : fast/dynamic/window-resize-scrollbars-test.html = IMAGE+TEXT
BUG_DRT WIN MAC LINUX : storage/domstorage/quota.html = TEXT
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6a6cb70..541bd26 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,15 @@
2010-10-19 Tony Chang <tony at chromium.org>
+ Reviewed by Kent Tamura.
+
+ [chromium] Use webkit's TestNetscapePlugIn in DRT mac
+ https://bugs.webkit.org/show_bug.cgi?id=47850
+
+ * WebKit.gyp: Copy WebKitTestPlugIn into plugins and add
+ GCC_SYMBOLS_PRIVATE_EXTERN: NO to export the symbols.
+
+2010-10-19 Tony Chang <tony at chromium.org>
+
Unreviewed. Rolling chromium DEPS to 63057 to pick up mac plugin
loading in DRT.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 776f42a..e1e1a5f 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -825,7 +825,6 @@
'<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
'<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob',
- '<(chromium_src_dir)/webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugin',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
],
'include_dirs': [
@@ -900,8 +899,11 @@
], # actions
}],
['OS=="mac"', {
- 'dependencies': ['LayoutTestHelper', 'copy_mesa'],
-
+ 'dependencies': [
+ 'copy_mesa',
+ 'LayoutTestHelper',
+ 'TestNetscapePlugIn',
+ ],
'mac_bundle_resources': [
'<(ahem_path)',
'../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf',
@@ -917,14 +919,18 @@
],
# Workaround for http://code.google.com/p/gyp/issues/detail?id=160
'copies': [{
- 'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Contents/PlugIns/',
- 'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'],
+ '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': [
@@ -1011,8 +1017,13 @@
]
},
'xcode_settings': {
- 'INFOPLIST_FILE': '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn/mac/Info.plist',
- }
+ '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',
+ },
}
],
}],
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ae87211..abb4735 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-19 Tony Chang <tony at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ [chromium] Use webkit's TestNetscapePlugIn in DRT mac
+ https://bugs.webkit.org/show_bug.cgi?id=47850
+
+ * DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist: Added. Forked
+ because we're going to name our plugin WebKitTestNetscapePlugIn
+ temporarily until the chromium forked plugin goes away.
+
2010-10-19 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist b/WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist
new file mode 100644
index 0000000..663f058
--- /dev/null
+++ b/WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>WebKitTestNetscapePlugIn</string>
+ <key>CFBundleGetInfoString</key>
+ <string>420+, Copyright 2006-2009 Apple Inc.</string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.testnetscapeplugin</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>BRPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>CFPlugInDynamicRegisterFunction</key>
+ <string></string>
+ <key>CFPlugInDynamicRegistration</key>
+ <string>NO</string>
+ <key>CFPlugInFactories</key>
+ <dict>
+ <key>00000000-0000-0000-0000-000000000000</key>
+ <string>MyFactoryFunction</string>
+ </dict>
+ <key>CFPlugInTypes</key>
+ <dict>
+ <key>00000000-0000-0000-0000-000000000000</key>
+ <array>
+ <string>00000000-0000-0000-0000-000000000000</string>
+ </array>
+ </dict>
+ <key>CFPlugInUnloadFunction</key>
+ <string></string>
+ <key>WebPluginDescription</key>
+ <string>Simple Netscape plug-in that handles test content for WebKit</string>
+ <key>WebPluginMIMETypes</key>
+ <dict>
+ <key>application/x-webkit-test-netscape</key>
+ <dict>
+ <key>WebPluginExtensions</key>
+ <array>
+ <string>testnetscape</string>
+ </array>
+ <key>WebPluginTypeDescription</key>
+ <string>test netscape content</string>
+ </dict>
+ </dict>
+ <key>WebPluginName</key>
+ <string>WebKit Test PlugIn</string>
+</dict>
+</plist>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list