[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
tony at chromium.org
tony at chromium.org
Sun Feb 20 22:54:56 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit c87743cb7c9173237d39f16645fd5a0aeb15781c
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 13 17:52:11 2011 +0000
2011-01-13 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
[chromium] fix plugins/plugin-javascript-access.html on Linux and Mac
https://bugs.webkit.org/show_bug.cgi?id=52332
Fix Linux baseline. Mac should now match Safari Mac.
* platform/chromium-linux/plugins/plugin-javascript-access-expected.txt:
* platform/chromium/test_expectations.txt:
2011-01-13 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
[chromium] fix plugins/plugin-javascript-access.html on Linux and Mac
https://bugs.webkit.org/show_bug.cgi?id=52332
Forked Info.plist is not longer needed.
* DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist: Removed.
2011-01-13 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
[chromium] fix plugins/plugin-javascript-access.html on Linux and Mac
https://bugs.webkit.org/show_bug.cgi?id=52332
* WebKit.gyp: Remove WebKitTestNetscapePlugIn
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75719 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7b722c0..d3cb36b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-13 Tony Chang <tony at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ [chromium] fix plugins/plugin-javascript-access.html on Linux and Mac
+ https://bugs.webkit.org/show_bug.cgi?id=52332
+
+ Fix Linux baseline. Mac should now match Safari Mac.
+
+ * platform/chromium-linux/plugins/plugin-javascript-access-expected.txt:
+ * platform/chromium/test_expectations.txt:
+
2011-01-13 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: inspector extensions tests should not use sources as test data. Commenting one out temporarily, filing a bug.
diff --git a/LayoutTests/platform/chromium-linux/plugins/plugin-javascript-access-expected.txt b/LayoutTests/platform/chromium-linux/plugins/plugin-javascript-access-expected.txt
index 8932575..3d2688e 100644
--- a/LayoutTests/platform/chromium-linux/plugins/plugin-javascript-access-expected.txt
+++ b/LayoutTests/platform/chromium-linux/plugins/plugin-javascript-access-expected.txt
@@ -2,7 +2,7 @@ Name: WebKit Test PlugIn
Description: Simple Netscape plug-in that handles test content for WebKit
-Filename: libnpapi_layout_test_plugin.so
+Filename: libTestNetscapePlugIn.so
Mime Types:
@@ -17,17 +17,6 @@ Plugin.item() works.
Plugin.namedItem() works.
-Type: application/x-webkit-test-netscape2
-
-Description: test netscape content2
-
-Suffixes: testnetscape2
-
-
-Plugin.item() works.
-
-Plugin.namedItem() works.
-
PluginArray.item() works.
PluginArray.namedItem() works.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index ec9f369..27c2faa 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -748,14 +748,12 @@ BUG_TONY WIN : plugins/geturlnotify-during-document-teardown.html = CRASH
BUGWK48655 : plugins/js-from-destroy.html = CRASH PASS
BUG_TONY WIN : plugins/mouse-events.html = TEXT
BUG_TONY WIN : plugins/plugin-initiate-popup-window.html = TIMEOUT
-// 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, we'll be able to
-// fix the plugin names.
-BUG_TONY : plugins/plugin-javascript-access.html = TEXT PASS
+// This test is failing because the plugin has changed names on Windows to
+// match the name of the plugin upstream.
+BUG_TONY WIN : plugins/plugin-javascript-access.html = TEXT PASS
// New test introduced at r75217 is failing on Win - for same reason as the
-// test above. (BUG_TONY)
-BUGWK52062 WIN : fast/frames/iframe-reparenting-plugins.html = TEXT
+// test above.
+BUG_TONY BUGWK52062 WIN : fast/frames/iframe-reparenting-plugins.html = TEXT
// Expectations for this test changed upstream. We should fix this test, but
// it doesn't need to block the current release
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c46e5f8..88b2308 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-13 Tony Chang <tony at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ [chromium] fix plugins/plugin-javascript-access.html on Linux and Mac
+ https://bugs.webkit.org/show_bug.cgi?id=52332
+
+ Forked Info.plist is not longer needed.
+
+ * DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist: Removed.
+
2011-01-13 Mikhail Naganov <mnaganov at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/Tools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist b/Tools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist
deleted file mode 100644
index 663f058..0000000
--- a/Tools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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>
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6eacddf..6710785 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-13 Tony Chang <tony at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ [chromium] fix plugins/plugin-javascript-access.html on Linux and Mac
+ https://bugs.webkit.org/show_bug.cgi?id=52332
+
+ * WebKit.gyp: Remove WebKitTestNetscapePlugIn
+
2011-01-12 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index cd499eb..3f205b7 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -1084,13 +1084,10 @@
}],
}],
['OS=="mac"', {
- 'dependencies': ['WebKitTestNetscapePlugIn'],
+ 'dependencies': ['TestNetscapePlugIn'],
'copies': [{
'destination': '<(PRODUCT_DIR)/plugins/',
- 'files': [
- '<(PRODUCT_DIR)/WebKitTestNetscapePlugIn.plugin/',
- '<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/',
- ],
+ 'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'],
}],
}],
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
@@ -1131,41 +1128,6 @@
'files': ['<(PRODUCT_DIR)/osmesa.so'],
}],
},
- {
- 'target_name': 'WebKitTestNetscapePlugIn',
- 'type': 'loadable_module',
- 'sources': [ '<@(test_plugin_files)' ],
- 'dependencies': [
- '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
- ],
- 'include_dirs': [
- '<(chromium_src_dir)',
- '../../Tools/DumpRenderTree/TestNetscapePlugIn',
- '../../Tools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
- ],
- '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': '../../Tools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist',
- },
- },
],
}],
], # conditions
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list