Source/WebKit/mac/WebView/WebFrame.mm - 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/mac/WebView/WebFrame.mm

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/mac/WebView/WebFrame.mm

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

--- Source/WebKit/mac/WebView/WebFrame.mm (revision 85996)

+++ Source/WebKit/mac/WebView/WebFrame.mm (working copy)

@@ -246,7 +246,7 @@

WebView *kit(Page* page)

{

- return page ? static_cast<WebChromeClient*>(page->chrome()->client())->webView() : nil;

+ return page ? static_cast<WebView*>(page->chrome()->client()->webView()) : nil;

}

WebView *getWebView(WebFrame *webFrame)