Changeset 74144 in webkit
- Timestamp:
- Dec 15, 2010 3:03:10 PM (13 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r74141 r74144 1 2010-12-15 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Fix assertion in plugins/return-error-from-new-stream-callback-in-full-frame-plugin.html test 6 https://bugs.webkit.org/show_bug.cgi?id=51136 7 8 Ensure that a plug-in that has explicitly cancelled the manual stream won't get any more callbacks. 9 10 * PluginProcess/PluginControllerProxy.cpp: 11 (WebKit::PluginControllerProxy::PluginControllerProxy): 12 (WebKit::PluginControllerProxy::cancelManualStreamLoad): 13 (WebKit::PluginControllerProxy::manualStreamDidReceiveResponse): 14 (WebKit::PluginControllerProxy::manualStreamDidReceiveData): 15 (WebKit::PluginControllerProxy::manualStreamDidFinishLoading): 16 (WebKit::PluginControllerProxy::manualStreamDidFail): 17 * PluginProcess/PluginControllerProxy.h: 18 1 19 2010-12-15 Brian Weinstein <bweinstein@apple.com> 2 20 -
trunk/WebKit2/PluginProcess/PluginControllerProxy.cpp
r74046 r74144 58 58 , m_paintTimer(RunLoop::main(), this, &PluginControllerProxy::paint) 59 59 , m_waitingForDidUpdate(false) 60 , m_pluginCanceledManualStreamLoad(false) 60 61 #if PLATFORM(MAC) 61 62 , m_isComplexTextInputEnabled(false) … … 170 171 void PluginControllerProxy::cancelManualStreamLoad() 171 172 { 173 m_pluginCanceledManualStreamLoad = true; 174 172 175 m_connection->connection()->send(Messages::PluginProxy::CancelManualStreamLoad(), m_pluginInstanceID); 173 176 } … … 330 333 void PluginControllerProxy::manualStreamDidReceiveResponse(const String& responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers) 331 334 { 335 if (m_pluginCanceledManualStreamLoad) 336 return; 337 332 338 m_plugin->manualStreamDidReceiveResponse(KURL(ParsedURLString, responseURLString), streamLength, lastModifiedTime, mimeType, headers); 333 339 } … … 335 341 void PluginControllerProxy::manualStreamDidReceiveData(const CoreIPC::DataReference& data) 336 342 { 343 if (m_pluginCanceledManualStreamLoad) 344 return; 345 337 346 m_plugin->manualStreamDidReceiveData(reinterpret_cast<const char*>(data.data()), data.size()); 338 347 } … … 340 349 void PluginControllerProxy::manualStreamDidFinishLoading() 341 350 { 351 if (m_pluginCanceledManualStreamLoad) 352 return; 353 342 354 m_plugin->manualStreamDidFinishLoading(); 343 355 } … … 345 357 void PluginControllerProxy::manualStreamDidFail(bool wasCancelled) 346 358 { 359 if (m_pluginCanceledManualStreamLoad) 360 return; 361 347 362 m_plugin->manualStreamDidFail(wasCancelled); 348 363 } -
trunk/WebKit2/PluginProcess/PluginControllerProxy.h
r74046 r74144 156 156 bool m_waitingForDidUpdate; 157 157 158 // Whether the plug-in has canceled the manual stream load. 159 bool m_pluginCanceledManualStreamLoad; 160 158 161 #if PLATFORM(MAC) 159 162 // Whether complex text input is enabled for this plug-in.
Note: See TracChangeset
for help on using the changeset viewer.