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

Side by Side Diff: android_webview/browser/renderer_host/aw_render_view_host_ext.cc

Issue 1408393003: Propagate pageScaleFactor to GuestViews (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove redundant initialization of AwLayoutSizer's page scale factor in tests Created 5 years, 1 month 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
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/browser/renderer_host/aw_render_view_host_ext.h" 5 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
6 6
7 #include "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 8 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
9 #include "android_webview/common/render_view_messages.h" 9 #include "android_webview/common/render_view_messages.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 void AwRenderViewHostExt::DidNavigateAnyFrame( 126 void AwRenderViewHostExt::DidNavigateAnyFrame(
127 content::RenderFrameHost* render_frame_host, 127 content::RenderFrameHost* render_frame_host,
128 const content::LoadCommittedDetails& details, 128 const content::LoadCommittedDetails& details,
129 const content::FrameNavigateParams& params) { 129 const content::FrameNavigateParams& params) {
130 DCHECK(CalledOnValidThread()); 130 DCHECK(CalledOnValidThread());
131 131
132 AwBrowserContext::FromWebContents(web_contents()) 132 AwBrowserContext::FromWebContents(web_contents())
133 ->AddVisitedURLs(params.redirects); 133 ->AddVisitedURLs(params.redirects);
134 } 134 }
135 135
136 void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) {
137 client_->OnWebLayoutPageScaleFactorChanged(page_scale_factor);
138 }
139
136 bool AwRenderViewHostExt::OnMessageReceived(const IPC::Message& message) { 140 bool AwRenderViewHostExt::OnMessageReceived(const IPC::Message& message) {
137 bool handled = true; 141 bool handled = true;
138 IPC_BEGIN_MESSAGE_MAP(AwRenderViewHostExt, message) 142 IPC_BEGIN_MESSAGE_MAP(AwRenderViewHostExt, message)
139 IPC_MESSAGE_HANDLER(AwViewHostMsg_DocumentHasImagesResponse, 143 IPC_MESSAGE_HANDLER(AwViewHostMsg_DocumentHasImagesResponse,
140 OnDocumentHasImagesResponse) 144 OnDocumentHasImagesResponse)
141 IPC_MESSAGE_HANDLER(AwViewHostMsg_UpdateHitTestData, 145 IPC_MESSAGE_HANDLER(AwViewHostMsg_UpdateHitTestData,
142 OnUpdateHitTestData) 146 OnUpdateHitTestData)
143 IPC_MESSAGE_HANDLER(AwViewHostMsg_PageScaleFactorChanged,
144 OnPageScaleFactorChanged)
145 IPC_MESSAGE_HANDLER(AwViewHostMsg_OnContentsSizeChanged, 147 IPC_MESSAGE_HANDLER(AwViewHostMsg_OnContentsSizeChanged,
146 OnContentsSizeChanged) 148 OnContentsSizeChanged)
147 IPC_MESSAGE_UNHANDLED(handled = false) 149 IPC_MESSAGE_UNHANDLED(handled = false)
148 IPC_END_MESSAGE_MAP() 150 IPC_END_MESSAGE_MAP()
149 151
150 return handled ? true : WebContentsObserver::OnMessageReceived(message); 152 return handled ? true : WebContentsObserver::OnMessageReceived(message);
151 } 153 }
152 154
153 void AwRenderViewHostExt::OnDocumentHasImagesResponse(int msg_id, 155 void AwRenderViewHostExt::OnDocumentHasImagesResponse(int msg_id,
154 bool has_images) { 156 bool has_images) {
155 DCHECK(CalledOnValidThread()); 157 DCHECK(CalledOnValidThread());
156 std::map<int, DocumentHasImagesResult>::iterator pending_req = 158 std::map<int, DocumentHasImagesResult>::iterator pending_req =
157 pending_document_has_images_requests_.find(msg_id); 159 pending_document_has_images_requests_.find(msg_id);
158 if (pending_req == pending_document_has_images_requests_.end()) { 160 if (pending_req == pending_document_has_images_requests_.end()) {
159 DLOG(WARNING) << "unexpected DocumentHasImages Response: " << msg_id; 161 DLOG(WARNING) << "unexpected DocumentHasImages Response: " << msg_id;
160 } else { 162 } else {
161 pending_req->second.Run(has_images); 163 pending_req->second.Run(has_images);
162 pending_document_has_images_requests_.erase(pending_req); 164 pending_document_has_images_requests_.erase(pending_req);
163 } 165 }
164 } 166 }
165 167
166 void AwRenderViewHostExt::OnUpdateHitTestData( 168 void AwRenderViewHostExt::OnUpdateHitTestData(
167 const AwHitTestData& hit_test_data) { 169 const AwHitTestData& hit_test_data) {
168 DCHECK(CalledOnValidThread()); 170 DCHECK(CalledOnValidThread());
169 last_hit_test_data_ = hit_test_data; 171 last_hit_test_data_ = hit_test_data;
170 has_new_hit_test_data_ = true; 172 has_new_hit_test_data_ = true;
171 } 173 }
172 174
173 void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) {
174 client_->OnWebLayoutPageScaleFactorChanged(page_scale_factor);
175 }
176
177 void AwRenderViewHostExt::OnContentsSizeChanged( 175 void AwRenderViewHostExt::OnContentsSizeChanged(
178 const gfx::Size& contents_size) { 176 const gfx::Size& contents_size) {
179 client_->OnWebLayoutContentsSizeChanged(contents_size); 177 client_->OnWebLayoutContentsSizeChanged(contents_size);
180 } 178 }
181 179
182 } // namespace android_webview 180 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698