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

Side by Side Diff: android_webview/renderer/aw_render_view_ext.cc

Issue 14888002: Android WebView Merged-Thread Hardware Draw (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/aw_render_view_ext.h" 5 #include "android_webview/renderer/aw_render_view_ext.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "android_webview/common/aw_hit_test_data.h" 9 #include "android_webview/common/aw_hit_test_data.h"
10 #include "android_webview/common/render_view_messages.h" 10 #include "android_webview/common/render_view_messages.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 void AwRenderViewExt::DidCommitProvisionalLoad(WebKit::WebFrame* frame, 185 void AwRenderViewExt::DidCommitProvisionalLoad(WebKit::WebFrame* frame,
186 bool is_new_navigation) { 186 bool is_new_navigation) {
187 content::DocumentState* document_state = 187 content::DocumentState* document_state =
188 content::DocumentState::FromDataSource(frame->dataSource()); 188 content::DocumentState::FromDataSource(frame->dataSource());
189 if (document_state->can_load_local_resources()) { 189 if (document_state->can_load_local_resources()) {
190 WebKit::WebSecurityOrigin origin = frame->document().securityOrigin(); 190 WebKit::WebSecurityOrigin origin = frame->document().securityOrigin();
191 origin.grantLoadLocalResources(); 191 origin.grantLoadLocalResources();
192 } 192 }
193 } 193 }
194 194
195 void AwRenderViewExt::DidActivateCompositor(int input_handler_identifier) {
196 Send(new AwViewHostMsg_DidActivateAcceleratedCompositing(
197 routing_id(), input_handler_identifier));
198 }
199
195 void AwRenderViewExt::DidCommitCompositorFrame() { 200 void AwRenderViewExt::DidCommitCompositorFrame() {
196 UpdatePageScaleFactor(); 201 UpdatePageScaleFactor();
197 } 202 }
198 203
199 void AwRenderViewExt::UpdatePageScaleFactor() { 204 void AwRenderViewExt::UpdatePageScaleFactor() {
200 if (page_scale_factor_ != render_view()->GetWebView()->pageScaleFactor()) { 205 if (page_scale_factor_ != render_view()->GetWebView()->pageScaleFactor()) {
201 page_scale_factor_ = render_view()->GetWebView()->pageScaleFactor(); 206 page_scale_factor_ = render_view()->GetWebView()->pageScaleFactor();
202 Send(new AwViewHostMsg_PageScaleFactorChanged(routing_id(), 207 Send(new AwViewHostMsg_PageScaleFactorChanged(routing_id(),
203 page_scale_factor_)); 208 page_scale_factor_));
204 } 209 }
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 } 274 }
270 275
271 void AwRenderViewExt::OnSetInitialPageScale(double page_scale_factor) { 276 void AwRenderViewExt::OnSetInitialPageScale(double page_scale_factor) {
272 if (!render_view() || !render_view()->GetWebView()) 277 if (!render_view() || !render_view()->GetWebView())
273 return; 278 return;
274 render_view()->GetWebView()->setInitialPageScaleOverride( 279 render_view()->GetWebView()->setInitialPageScaleOverride(
275 page_scale_factor); 280 page_scale_factor);
276 } 281 }
277 282
278 } // namespace android_webview 283 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698