webkit/glue/chromium_bridge_impl.cc - Issue 200054: Hook up WebFrameClient, replacing many WebViewDelegate methods....

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: webkit/glue/chromium_bridge_impl.cc

Issue 200054: Hook up WebFrameClient, replacing many WebViewDelegate methods.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 11 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: webkit/glue/chromium_bridge_impl.cc

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

--- webkit/glue/chromium_bridge_impl.cc (revision 25715)

+++ webkit/glue/chromium_bridge_impl.cc (working copy)

@@ -32,6 +32,7 @@

#include "googleurl/src/url_util.h"

#include "skia/ext/skia_utils_win.h"

#include "webkit/api/public/WebCursorInfo.h"

+#include "webkit/api/public/WebFrameClient.h"

#include "webkit/api/public/WebScreenInfo.h"

#include "webkit/glue/chrome_client_impl.h"

#include "webkit/glue/glue_util.h"

@@ -94,11 +95,10 @@

if (!frame)

return;

- // Dispatch to the delegate of the view that owns the frame.

- WebViewImpl* webview = WebFrameImpl::FromFrame(frame)->GetWebViewImpl();

- if (!webview || !webview->delegate())

+ WebFrameImpl* webframe = WebFrameImpl::FromFrame(frame);

+ if (!webframe->client())

return;

- webview->delegate()->JSOutOfMemory();

+ webframe->client()->didExhaustMemoryAvailableForScript(webframe);

}

// Plugin ---------------------------------------------------------------------

« no previous file with comments | « webkit/glue/chrome_client_impl.cc ('k') | webkit/glue/context_menu_unittest.cc » ('j') | no next file with comments »