Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp - Issue 10905105: Merge 125500

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

Issue 10905105: Merge 125500 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

Patch Set: Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

===================================================================

--- Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (revision 127631)

+++ Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (working copy)

@@ -1633,9 +1633,9 @@

void FrameLoaderClientQt::redirectDataToPlugin(Widget* pluginWidget)

{

- ASSERT(!m_pluginView);

m_pluginView = static_cast<PluginView*>(pluginWidget);

- m_hasSentResponseToPlugin = false;

+ if (pluginWidget)

+ m_hasSentResponseToPlugin = false;

}

PassRefPtr<Widget> FrameLoaderClientQt::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* element, const KURL& url,