diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
| commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
| tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp | |
| parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
| download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz | |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp index 1e315660a..5dd02b563 100644 --- a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp +++ b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp @@ -304,7 +304,7 @@ void FrameLoaderClientImpl::detachedFromParent3() // will cause a crash. If you remove/modify this, just ensure that you can // go to a page and then navigate to a new page without getting any asserts // or crashes. - m_webFrame->frame()->script()->proxy()->clearForClose(); + m_webFrame->frame()->script()->clearForClose(); // Alert the client that the frame is being detached. This is the last // chance we have to communicate with the client. @@ -1490,9 +1490,8 @@ PassRefPtr<Widget> FrameLoaderClientImpl::createPlugin( // (e.g., acrobat reader). void FrameLoaderClientImpl::redirectDataToPlugin(Widget* pluginWidget) { - if (pluginWidget->isPluginContainer()) - m_pluginWidget = static_cast<WebPluginContainerImpl*>(pluginWidget); - ASSERT(m_pluginWidget); + ASSERT(!pluginWidget || pluginWidget->isPluginContainer()); + m_pluginWidget = static_cast<WebPluginContainerImpl*>(pluginWidget); } PassRefPtr<Widget> FrameLoaderClientImpl::createJavaAppletWidget( |