diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 00:50:55 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 00:50:55 +0000 |
| commit | ffe7ef80bf38bbdeea2a0b22d625797e9bcb44d3 (patch) | |
| tree | e4597dc487fc1ff4648e7421c67d1b0720fdf234 /webkit/gpu | |
| parent | 9b67ab0fb78d8f26e6ad3c208cbf27b8362f7db9 (diff) | |
| download | chromium_src-ffe7ef80bf38bbdeea2a0b22d625797e9bcb44d3.zip chromium_src-ffe7ef80bf38bbdeea2a0b22d625797e9bcb44d3.tar.gz chromium_src-ffe7ef80bf38bbdeea2a0b22d625797e9bcb44d3.tar.bz2 | |
Update src/webkit/gpu to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
Review URL: http://codereview.chromium.org/7240013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 25597b4..9a6f472 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -27,6 +27,7 @@ #include "gpu/command_buffer/service/gpu_scheduler.h" #include "gpu/command_buffer/service/command_buffer_service.h" #include "gpu/GLES2/gles2_command_buffer.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 "ui/gfx/gl/gl_share_group.h" @@ -795,7 +796,7 @@ bool WebGraphicsContext3DInProcessCommandBufferImpl::initialize( GURL active_url; if (web_view && web_view->mainFrame()) - active_url = GURL(web_view->mainFrame()->url()); + active_url = GURL(web_view->mainFrame()->document().url()); GLInProcessContext* parent_context = NULL; if (!render_directly_to_web_view) { |