content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc - Issue 7242014: Update src/content/renderer to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE

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: content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc

Issue 7242014: Update src/content/renderer to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 6 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:

View side-by-side diff with in-line comments

Download patch

Index: content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc

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

--- content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc (revision 90236)

+++ content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc (working copy)

@@ -25,6 +25,7 @@

#include "content/renderer/render_view.h"

#include "gpu/command_buffer/client/gles2_implementation.h"

#include "gpu/command_buffer/common/constants.h"

+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

#include "webkit/glue/gl_bindings_skia_cmd_buffer.h"

@@ -102,7 +103,7 @@

GURL active_url;

if (web_view && web_view->mainFrame())

- active_url = GURL(web_view->mainFrame()->url());

+ active_url = GURL(web_view->mainFrame()->document().url());

RendererGLContext* parent_context = NULL;

if (render_directly_to_web_view) {

« no previous file with comments | « no previous file | content/renderer/notification_provider.cc » ('j') | no next file with comments »