diff options
| author | piman <piman@chromium.org> | 2016-03-25 19:21:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-26 02:23:00 +0000 |
| commit | af5d661c72f723eebb145b9df57dddc745d059c7 (patch) | |
| tree | bb8906091b17e0d6df06c24fde125e3615b3fe9a | |
| parent | 5454af3a1ad9788910f70e4a601d29da0bd37e60 (diff) | |
| download | chromium_src-af5d661c72f723eebb145b9df57dddc745d059c7.zip chromium_src-af5d661c72f723eebb145b9df57dddc745d059c7.tar.gz chromium_src-af5d661c72f723eebb145b9df57dddc745d059c7.tar.bz2 | |
Make the test NPAPI plugin not handle png
This is not a feature we have/need in PPAPI
BUG=493212
Review URL: https://codereview.chromium.org/1829293002
Cr-Commit-Position: refs/heads/master@{#383437}
6 files changed, 9 insertions, 15 deletions
diff --git a/content/shell/tools/plugin/mac/Info.plist b/content/shell/tools/plugin/mac/Info.plist index 689819766..6163742 100644 --- a/content/shell/tools/plugin/mac/Info.plist +++ b/content/shell/tools/plugin/mac/Info.plist @@ -44,15 +44,6 @@ <string>Simple Netscape plug-in that handles test content for WebKit</string> <key>WebPluginMIMETypes</key> <dict> - <key>image/png</key> - <dict> - <key>WebPluginExtensions</key> - <array> - <string>png</string> - </array> - <key>WebPluginTypeDescription</key> - <string>PNG image</string> - </dict> <key>application/x-webkit-test-netscape</key> <dict> <key>WebPluginExtensions</key> diff --git a/content/shell/tools/plugin/main.cpp b/content/shell/tools/plugin/main.cpp index ea969d4..0f1887e 100644 --- a/content/shell/tools/plugin/main.cpp +++ b/content/shell/tools/plugin/main.cpp @@ -842,7 +842,7 @@ NPError NPP_SetValue(NPP instance, NPNVariable variable, void *value) extern "C" const char* NP_GetMIMEDescription(void) { - return "application/x-webkit-test-netscape:testnetscape:test netscape content;image/png:png:PNG image"; + return "application/x-webkit-test-netscape:testnetscape:test netscape content"; } extern "C" diff --git a/content/shell/tools/plugin/win/TestNetscapePlugin.rc b/content/shell/tools/plugin/win/TestNetscapePlugin.rc index a485eeb..7c8245f 100644 --- a/content/shell/tools/plugin/win/TestNetscapePlugin.rc +++ b/content/shell/tools/plugin/win/TestNetscapePlugin.rc @@ -71,10 +71,10 @@ BEGIN BEGIN VALUE "CompanyName", "Apple Inc." VALUE "FileDescription", "Simple Netscape plug-in that handles test content for WebKit" - VALUE "FileExtents", "testnetscape|png" - VALUE "FileOpenName", "test netscape content|PNG image" + VALUE "FileExtents", "testnetscape" + VALUE "FileOpenName", "test netscape content" VALUE "LegalCopyright", "Copyright Apple Inc. 2007-2009" - VALUE "MIMEType", "application/x-webkit-test-netscape|image/png" + VALUE "MIMEType", "application/x-webkit-test-netscape" VALUE "OriginalFilename", "np_test_netscape_plugin.dll" VALUE "ProductName", "WebKit Test PlugIn" END diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index b9d6580..3895e8f 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations @@ -1381,3 +1381,6 @@ crbug.com/592185 fast/repaint/fixed-right-in-page-scale.html [ Failure Pass ] crbug.com/592409 inspector-protocol/debugger/stepping-with-blackboxed-ranges.html [ NeedsManualRebaseline ] crbug.com/594595 [ Linux ] http/tests/security/mixedContent/websocket/insecure-websocket-in-secure-page-worker-allowed.html [ Timeout Pass ] + +crbug.com/493212 [ Linux ] fast/block/float/4145535Crash.html [ NeedsRebaseline ] +crbug.com/493212 [ Linux ] fast/replaced/replaced-breaking.html [ NeedsRebaseline ] diff --git a/third_party/WebKit/LayoutTests/fast/block/float/4145535Crash.html b/third_party/WebKit/LayoutTests/fast/block/float/4145535Crash.html index ccea589..d1f0f99 100644 --- a/third_party/WebKit/LayoutTests/fast/block/float/4145535Crash.html +++ b/third_party/WebKit/LayoutTests/fast/block/float/4145535Crash.html @@ -1,3 +1,3 @@ <table CELLSPACING=8888888888> -<EMBED UNITS="4" type="image/png"> +<EMBED UNITS="4" type="application/x-blink-test-plugin"> diff --git a/third_party/WebKit/LayoutTests/fast/replaced/replaced-breaking.html b/third_party/WebKit/LayoutTests/fast/replaced/replaced-breaking.html index 1368c31..2553a0a 100644 --- a/third_party/WebKit/LayoutTests/fast/replaced/replaced-breaking.html +++ b/third_party/WebKit/LayoutTests/fast/replaced/replaced-breaking.html @@ -15,7 +15,7 @@ <input type="checkbox"><input type="checkbox"> <input type="radio"><input type="radio"> <iframe></iframe><iframe></iframe> - <embed type="image/png"></embed><embed type="image/png"></embed> + <embed type="application/x-blink-test-plugin"></embed><embed type="application/x-blink-test-plugin"></embed> </div> </body> </html> |