Changeset 24118 in webkit
- Timestamp:
- Jul 9, 2007 11:28:49 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r24099 r24118 1 2007-07-09 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Oliver. 4 5 <rdar://problem/4954319> 6 Acrobat 7 / Safari crash: CrashTracer: 99 crashes in Safari at 7 com.apple.WebCore: WebCore::NetscapePlugInStreamLoader::isDone const + 0 8 9 Add tests. 10 11 * plugins/return-error-from-new-stream-callback-in-full-frame-plugin-expected.txt: Added. 12 * plugins/return-error-from-new-stream-callback-in-full-frame-plugin.html: Added. 13 1 14 2007-07-08 Mitz Pettel <mitz@webkit.org> 2 15 -
trunk/WebCore/ChangeLog
r24116 r24118 1 2007-07-09 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Oliver. 4 5 Add DocumentLoader::isLoadingMainResource. 6 7 * WebCore.exp: 8 1 9 2007-07-09 John Sullivan <sullivan@apple.com> 2 10 -
trunk/WebCore/WebCore.exp
r24115 r24118 568 568 __ZNK7WebCore14DocumentLoader19isLoadingInAPISenseEv 569 569 __ZNK7WebCore14DocumentLoader19originalRequestCopyEv 570 __ZNK7WebCore14DocumentLoader21isLoadingMainResourceEv 570 571 __ZNK7WebCore14DocumentLoader3URLEv 571 572 __ZNK7WebCore14DocumentLoader5titleEv -
trunk/WebKit/ChangeLog
r24117 r24118 1 2007-07-09 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Oliver. 4 5 <rdar://problem/4954319> 6 Acrobat 7 / Safari crash: CrashTracer: 99 crashes in Safari at 7 com.apple.WebCore: WebCore::NetscapePlugInStreamLoader::isDone const + 0 8 9 Add a new initWithFrameLoader: method to WebNetscapePluginStream which is to be used when 10 the stream is a "fake" stream for full frame plug-ins. 11 12 * Plugins/WebBaseNetscapePluginView.mm: 13 (-[WebBaseNetscapePluginView pluginView:receivedResponse:]): 14 * Plugins/WebNetscapePluginStream.h: 15 * Plugins/WebNetscapePluginStream.mm: 16 (-[WebNetscapePluginStream initWithFrameLoader:]): 17 (-[WebNetscapePluginStream initWithRequest:plugin:notifyData:sendNotification:]): 18 (-[WebNetscapePluginStream start]): 19 (-[WebNetscapePluginStream cancelLoadWithError:]): 20 (-[WebNetscapePluginStream stop]): 21 * WebCoreSupport/WebFrameLoaderClient.mm: 22 (WebFrameLoaderClient::createFrame): 23 1 24 2007-07-09 John Sullivan <sullivan@apple.com> 2 25 -
trunk/WebKit/Plugins/WebBaseNetscapePluginView.mm
r23977 r24118 1949 1949 ASSERT(!_manualStream); 1950 1950 1951 _manualStream = [[WebNetscapePluginStream alloc] init ];1951 _manualStream = [[WebNetscapePluginStream alloc] initWithFrameLoader:core([self webFrame])->loader()]; 1952 1952 } 1953 1953 -
trunk/WebKit/Plugins/WebNetscapePluginStream.h
r19449 r24118 31 31 32 32 namespace WebCore { 33 class FrameLoader; 33 34 class NetscapePlugInStreamLoader; 34 35 } … … 37 38 @interface WebNetscapePluginStream : WebBaseNetscapePluginStream 38 39 { 40 WebCore::FrameLoader* _frameLoader; 39 41 WebCore::NetscapePlugInStreamLoader* _loader; 40 42 NSURLRequest *request; 41 43 } 42 44 45 - (id)initWithFrameLoader:(WebCore::FrameLoader *)frameLoader; 43 46 - (id)initWithRequest:(NSURLRequest *)theRequest 44 47 plugin:(NPP)thePlugin -
trunk/WebKit/Plugins/WebNetscapePluginStream.mm
r20694 r24118 58 58 #endif 59 59 60 - initWithRequest:(NSURLRequest *)theRequest 60 - (id)initWithFrameLoader:(FrameLoader *)frameLoader 61 { 62 _frameLoader = frameLoader; 63 64 return self; 65 } 66 67 - (id)initWithRequest:(NSURLRequest *)theRequest 61 68 plugin:(NPP)thePlugin 62 69 notifyData:(void *)theNotifyData … … 108 115 { 109 116 ASSERT(request); 110 117 ASSERT(!_frameLoader); 118 111 119 _loader->documentLoader()->addPlugInStreamLoader(_loader); 112 120 _loader->load(request); … … 115 123 - (void)cancelLoadWithError:(NSError *)error 116 124 { 125 if (_frameLoader) { 126 ASSERT(!_loader); 127 128 DocumentLoader* documentLoader = _frameLoader->activeDocumentLoader(); 129 ASSERT(documentLoader); 130 131 if (documentLoader->isLoadingMainResource()) 132 documentLoader->cancelMainResourceLoad(error); 133 return; 134 } 135 117 136 if (!_loader->isDone()) 118 137 _loader->cancel(error); … … 121 140 - (void)stop 122 141 { 142 ASSERT(!_frameLoader); 143 123 144 if (!_loader->isDone()) 124 145 [self cancelLoadAndDestroyStreamWithError:_loader->cancelledError()]; -
trunk/WebKitTools/ChangeLog
r24102 r24118 1 2007-07-09 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Oliver. 4 5 <rdar://problem/4954319> 6 Acrobat 7 / Safari crash: CrashTracer: 99 crashes in Safari at 7 com.apple.WebCore: WebCore::NetscapePlugInStreamLoader::isDone const + 0 8 9 If the src url is "data:application/x-webkit-test-netscape,returnerrorfromnewstream", 10 return an error from NPP_NewStream. 11 12 * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c: 13 (pluginAllocate): 14 * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h: 15 * DumpRenderTree/TestNetscapePlugIn.subproj/main.c: 16 (NPP_New): 17 (NPP_NewStream): 18 1 19 2007-07-08 Mark Rowe <mrowe@apple.com> 2 20 -
trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c
r20879 r24118 335 335 newInstance->eventLogging = FALSE; 336 336 newInstance->logDestroy = FALSE; 337 newInstance->returnErrorFromNewStream = FALSE; 337 338 newInstance->stream = 0; 338 339 -
trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h
r20867 r24118 41 41 NPBool eventLogging; 42 42 NPBool logDestroy; 43 NPBool returnErrorFromNewStream; 43 44 NPObject* testObject; 44 45 NPStream* stream; -
trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c
r20867 r24118 81 81 if (strcasecmp(argn[i], "onstreamload") == 0 && !obj->onStreamLoad) 82 82 obj->onStreamLoad = strdup(argv[i]); 83 else if (strcasecmp(argn[i], "src") == 0 && 84 strcasecmp(argv[i], "data:application/x-webkit-test-netscape,returnerrorfromnewstream") == 0) 85 obj->returnErrorFromNewStream = TRUE; 83 86 } 84 87 … … 115 118 *stype = NP_ASFILEONLY; 116 119 117 if (obj && (browser->version >= NPVERS_HAS_RESPONSE_HEADERS)) 120 if (obj->returnErrorFromNewStream) 121 return NPERR_GENERIC_ERROR; 122 123 if (browser->version >= NPVERS_HAS_RESPONSE_HEADERS) 118 124 notifyStream(obj, stream->url, stream->headers); 119 125
Note: See TracChangeset
for help on using the changeset viewer.