Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp - Issue 6955016: Merge 85823

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/chromium/src/GraphicsContext3DChromium.cpp

Issue 6955016: Merge 85823 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/

Patch Set: Created 9 years, 7 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/chromium/src/GraphicsContext3DChromium.cpp

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

--- Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (revision 85996)

+++ Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (working copy)

@@ -114,10 +114,8 @@

return false;

Chrome* chrome = static_cast<Chrome*>(hostWindow);

- WebKit::ChromeClientImpl* chromeClientImpl = static_cast<WebKit::ChromeClientImpl*>(chrome->client());

+ m_webViewImpl = static_cast<WebKit::WebViewImpl*>(chrome->client()->webView());

- m_webViewImpl = chromeClientImpl->webView();

if (!m_webViewImpl)

return false;

if (!webContext->initialize(webAttributes, m_webViewImpl, renderDirectlyToHostWindow)) {