| OLD | NEW |
| 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 Loading... |
| 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 | |
| 200 void AwRenderViewExt::DidCommitCompositorFrame() { | 195 void AwRenderViewExt::DidCommitCompositorFrame() { |
| 201 UpdatePageScaleFactor(); | 196 UpdatePageScaleFactor(); |
| 202 } | 197 } |
| 203 | 198 |
| 204 void AwRenderViewExt::UpdatePageScaleFactor() { | 199 void AwRenderViewExt::UpdatePageScaleFactor() { |
| 205 if (page_scale_factor_ != render_view()->GetWebView()->pageScaleFactor()) { | 200 if (page_scale_factor_ != render_view()->GetWebView()->pageScaleFactor()) { |
| 206 page_scale_factor_ = render_view()->GetWebView()->pageScaleFactor(); | 201 page_scale_factor_ = render_view()->GetWebView()->pageScaleFactor(); |
| 207 Send(new AwViewHostMsg_PageScaleFactorChanged(routing_id(), | 202 Send(new AwViewHostMsg_PageScaleFactorChanged(routing_id(), |
| 208 page_scale_factor_)); | 203 page_scale_factor_)); |
| 209 } | 204 } |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 } | 269 } |
| 275 | 270 |
| 276 void AwRenderViewExt::OnSetInitialPageScale(double page_scale_factor) { | 271 void AwRenderViewExt::OnSetInitialPageScale(double page_scale_factor) { |
| 277 if (!render_view() || !render_view()->GetWebView()) | 272 if (!render_view() || !render_view()->GetWebView()) |
| 278 return; | 273 return; |
| 279 render_view()->GetWebView()->setInitialPageScaleOverride( | 274 render_view()->GetWebView()->setInitialPageScaleOverride( |
| 280 page_scale_factor); | 275 page_scale_factor); |
| 281 } | 276 } |
| 282 | 277 |
| 283 } // namespace android_webview | 278 } // namespace android_webview |
| OLD | NEW |