Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: android_webview/browser/browser_view_renderer_impl.cc

Issue 14888002: Android WebView Merged-Thread Hardware Draw (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/browser/browser_view_renderer_impl.h" 5 #include "android_webview/browser/browser_view_renderer_impl.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include "android_webview/browser/in_process_renderer/in_process_view_renderer.h " 9 #include "android_webview/browser/in_process_renderer/in_process_view_renderer.h "
10 #include "android_webview/common/aw_switches.h" 10 #include "android_webview/common/aw_switches.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 UserData* data = reinterpret_cast<UserData*>( 111 UserData* data = reinterpret_cast<UserData*>(
112 contents->GetUserData(kUserDataKey)); 112 contents->GetUserData(kUserDataKey));
113 return data ? data->instance_ : NULL; 113 return data ? data->instance_ : NULL;
114 } 114 }
115 115
116 private: 116 private:
117 BrowserViewRendererImpl* instance_; 117 BrowserViewRendererImpl* instance_;
118 }; 118 };
119 119
120 // static 120 // static
121 BrowserViewRendererImpl* BrowserViewRendererImpl::Create( 121 BrowserViewRenderer* BrowserViewRendererImpl::Create(
122 BrowserViewRenderer::Client* client, 122 BrowserViewRenderer::Client* client,
123 JavaHelper* java_helper) { 123 JavaHelper* java_helper) {
124 if (CommandLine::ForCurrentProcess()->HasSwitch( 124 if (CommandLine::ForCurrentProcess()->HasSwitch(
125 switches::kMergeUIAndRendererCompositorThreads)) { 125 switches::kMergeUIAndRendererCompositorThreads)) {
126 return new InProcessViewRenderer(client, java_helper); 126 return new InProcessViewRenderer(client, java_helper);
127 } 127 }
128 128
129 return new BrowserViewRendererImpl(client, java_helper); 129 return new BrowserViewRendererImpl(client, java_helper);
130 } 130 }
131 131
132 // static 132 // static
133 BrowserViewRendererImpl* BrowserViewRendererImpl::FromWebContents( 133 BrowserViewRendererImpl* BrowserViewRendererImpl::FromWebContents(
134 content::WebContents* contents) { 134 content::WebContents* contents) {
135 return UserData::GetInstance(contents); 135 return UserData::GetInstance(contents);
136 } 136 }
137 137
138 // static
139 BrowserViewRendererImpl* BrowserViewRendererImpl::FromId(int render_process_id,
140 int render_view_id) {
141 const content::RenderViewHost* rvh =
142 content::RenderViewHost::FromID(render_process_id, render_view_id);
143 if (!rvh) return NULL;
144 return FromWebContents(content::WebContents::FromRenderViewHost(rvh));
145 }
146
147 BrowserViewRendererImpl::BrowserViewRendererImpl( 138 BrowserViewRendererImpl::BrowserViewRendererImpl(
148 BrowserViewRenderer::Client* client, 139 BrowserViewRenderer::Client* client,
149 JavaHelper* java_helper) 140 JavaHelper* java_helper)
150 : client_(client), 141 : client_(client),
151 java_helper_(java_helper), 142 java_helper_(java_helper),
152 view_renderer_host_(new ViewRendererHost(NULL, this)), 143 view_renderer_host_(new ViewRendererHost(NULL, this)),
153 compositor_(Compositor::Create(this)), 144 compositor_(Compositor::Create(this)),
154 view_clip_layer_(cc::Layer::Create()), 145 view_clip_layer_(cc::Layer::Create()),
155 transform_layer_(cc::Layer::Create()), 146 transform_layer_(cc::Layer::Create()),
156 scissor_clip_layer_(cc::Layer::Create()), 147 scissor_clip_layer_(cc::Layer::Create()),
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 566
576 void BrowserViewRendererImpl::OnFrameInfoUpdated( 567 void BrowserViewRendererImpl::OnFrameInfoUpdated(
577 const gfx::SizeF& content_size, 568 const gfx::SizeF& content_size,
578 const gfx::Vector2dF& scroll_offset, 569 const gfx::Vector2dF& scroll_offset,
579 float page_scale_factor) { 570 float page_scale_factor) {
580 page_scale_ = page_scale_factor; 571 page_scale_ = page_scale_factor;
581 content_size_css_ = content_size; 572 content_size_css_ = content_size;
582 } 573 }
583 574
584 } // namespace android_webview 575 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698