Changeset 86487 in webkit
- Timestamp:
- May 14, 2011 9:31:11 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r86483 r86487 1 2011-05-14 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Kevin Decker. 4 5 NPP_URLNotify is not called if a URL passed to NPN_GetURLNotify fails to load 6 https://bugs.webkit.org/show_bug.cgi?id=60823 7 <rdar://problem/9430386> 8 9 Add test. 10 11 * platform/gtk/Skipped: 12 Add test to Skipped list since it apparently crashes. 13 14 * plugins/get-url-notify-with-url-that-fails-to-load-expected.txt: Added. 15 * plugins/get-url-notify-with-url-that-fails-to-load.html: Added. 16 1 17 2011-05-14 Csaba Osztrogonác <ossy@webkit.org> 2 18 -
trunk/LayoutTests/platform/gtk/Skipped
r86224 r86487 157 157 # https://bugs.webkit.org/show_bug.cgi?id=31433 158 158 plugins/document-open.html 159 160 # https://bugs.webkit.org/show_bug.cgi?id=60838 161 plugins/get-url-notify-with-url-that-fails-to-load.html 159 162 160 163 # https://bugs.webkit.org/show_bug.cgi?id=37574 -
trunk/Source/WebKit2/ChangeLog
r86486 r86487 1 2011-05-14 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Kevin Decker. 4 5 NPP_URLNotify is not called if a URL passed to NPN_GetURLNotify fails to load 6 https://bugs.webkit.org/show_bug.cgi?id=60823 7 <rdar://problem/9430386> 8 9 If a plug-in stream fails to load before it's been started, we won't destroy the stream. 10 11 * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp: 12 (WebKit::NetscapePluginStream::stop): 13 Call notifyAndDestroyStream which will call NPP_URLNotify if necessary, and also destroy the stream. 14 15 (WebKit::NetscapePluginStream::notifyAndDestroyStream): 16 Pass the request URL to NPP_URLNotify, matching other browsers. 17 1 18 2011-05-14 Jer Noble <jer.noble@apple.com> 2 19 -
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
r86481 r86487 281 281 // The stream was stopped before it got a chance to start. This can happen if a stream is cancelled by 282 282 // WebKit before it received a response. 283 if (!m_isStarted) 284 return; 283 if (!m_isStarted) { 284 ASSERT(reason != NPRES_DONE); 285 notifyAndDestroyStream(reason); 286 return; 287 } 285 288 286 289 if (reason == NPRES_DONE && m_deliveryData && !m_deliveryData->isEmpty()) { … … 346 349 347 350 if (m_sendNotification) { 348 m_plugin->NPP_URLNotify(m_re sponseURL.data(), reason, m_notificationData);351 m_plugin->NPP_URLNotify(m_requestURLString.utf8().data(), reason, m_notificationData); 349 352 350 353 #if !ASSERT_DISABLED -
trunk/Tools/ChangeLog
r86481 r86487 1 2011-05-14 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Kevin Decker. 4 5 NPP_URLNotify is not called if a URL passed to NPN_GetURLNotify fails to load 6 https://bugs.webkit.org/show_bug.cgi?id=60823 7 <rdar://problem/9430386> 8 9 Add test that calls NPN_GetURLNotify on a URL that can't be loaded, and checks if NPP_URLNotify is called. 10 11 * DumpRenderTree/DumpRenderTree.gypi: 12 * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: 13 * DumpRenderTree/TestNetscapePlugIn/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp: Added. 14 (GetURLNotifyWithURLThatFailsToLoad::GetURLNotifyWithURLThatFailsToLoad): 15 (GetURLNotifyWithURLThatFailsToLoad::NPP_New): 16 (GetURLNotifyWithURLThatFailsToLoad::NPP_URLNotify): 17 * DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj: 18 * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro: 19 * GNUmakefile.am: 20 1 21 2011-05-14 Sheriff Bot <webkit.review.bot@gmail.com> 2 22 -
trunk/Tools/DumpRenderTree/DumpRenderTree.gypi
r86481 r86487 53 53 'TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp', 54 54 'TestNetscapePlugIn/Tests/EvaluateJSAfterRemovingPluginElement.cpp', 55 'TestNetscapePlugIn/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp', 55 56 'TestNetscapePlugIn/Tests/GetURLWithJavaScriptURL.cpp', 56 57 'TestNetscapePlugIn/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp', -
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
r86481 r86487 48 48 1AD4CB2212A6D1350027A7AF /* GetUserAgentWithNullNPPFromNPPNew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD4CB2012A6D1350027A7AF /* GetUserAgentWithNullNPPFromNPPNew.cpp */; }; 49 49 1AD9D2FE12028409001A70D1 /* PluginScriptableNPObjectInvokeDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD9D2FD12028409001A70D1 /* PluginScriptableNPObjectInvokeDefault.cpp */; }; 50 1AFF66BC137DEFD200791696 /* GetURLNotifyWithURLThatFailsToLoad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFF66BB137DEA8300791696 /* GetURLNotifyWithURLThatFailsToLoad.cpp */; }; 50 51 23BCB8900EA57623003C6289 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BCB88F0EA57623003C6289 /* OpenGL.framework */; }; 51 52 29CFBA10122736E600BC30C0 /* AccessibilityTextMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CFBA0E122736E600BC30C0 /* AccessibilityTextMarker.h */; }; … … 226 227 1AD4CB2012A6D1350027A7AF /* GetUserAgentWithNullNPPFromNPPNew.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GetUserAgentWithNullNPPFromNPPNew.cpp; sourceTree = "<group>"; }; 227 228 1AD9D2FD12028409001A70D1 /* PluginScriptableNPObjectInvokeDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginScriptableNPObjectInvokeDefault.cpp; sourceTree = "<group>"; }; 229 1AFF66BB137DEA8300791696 /* GetURLNotifyWithURLThatFailsToLoad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GetURLNotifyWithURLThatFailsToLoad.cpp; sourceTree = "<group>"; }; 228 230 23BCB88F0EA57623003C6289 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; 229 231 29CFBA0E122736E600BC30C0 /* AccessibilityTextMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityTextMarker.h; sourceTree = "<group>"; }; … … 490 492 1A215A7511F26072008AD0F5 /* DocumentOpenInDestroyStream.cpp */, 491 493 C0E720741281C828004EF533 /* EvaluateJSAfterRemovingPluginElement.cpp */, 494 1AFF66BB137DEA8300791696 /* GetURLNotifyWithURLThatFailsToLoad.cpp */, 492 495 1A5CC1F3137DD2EC00A5D7E7 /* GetURLWithJavaScriptURL.cpp */, 493 496 1A3E28A91311D73B00501349 /* GetURLWithJavaScriptURLDestroyingPlugin.cpp */, … … 804 807 C031182B134E4A2B00919757 /* NPPSetWindowCalledDuringDestruction.cpp in Sources */, 805 808 1A5CC1F5137DD2EC00A5D7E7 /* GetURLWithJavaScriptURL.cpp in Sources */, 809 1AFF66BC137DEFD200791696 /* GetURLNotifyWithURLThatFailsToLoad.cpp in Sources */, 806 810 ); 807 811 runOnlyForDeploymentPostprocessing = 0; -
trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj
r86481 r86487 399 399 </File> 400 400 <File 401 RelativePath="..\Tests\GetURLNotifyWithURLThatFailsToLoad.cpp" 402 > 403 </File> 404 <File 401 405 RelativePath="..\Tests\GetURLWithJavaScriptURL.cpp" 402 406 > -
trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
r86481 r86487 31 31 Tests/DocumentOpenInDestroyStream.cpp \ 32 32 Tests/EvaluateJSAfterRemovingPluginElement.cpp \ 33 Tests/GetURLNotifyWithURLThatFailsToLoad.cpp \ 33 34 Tests/GetURLWithJavaScriptURL.cpp \ 34 35 Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp \ -
trunk/Tools/GNUmakefile.am
r86481 r86487 186 186 Tools/DumpRenderTree/TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp \ 187 187 Tools/DumpRenderTree/TestNetscapePlugIn/Tests/EvaluateJSAfterRemovingPluginElement.cpp \ 188 Tools/DumpRenderTree/TestNetscapePlugIn/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp \ 188 189 Tools/DumpRenderTree/TestNetscapePlugIn/Tests/GetURLWithJavaScriptURL.cpp \ 189 190 Tools/DumpRenderTree/TestNetscapePlugIn/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp \
Note: See TracChangeset
for help on using the changeset viewer.