| 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 "content/browser/renderer_host/render_widget_host_impl.h" | 5 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <tuple> | 10 #include <tuple> |
| (...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 resize_params->is_fullscreen_granted = | 584 resize_params->is_fullscreen_granted = |
| 585 delegate_->IsFullscreenForCurrentTab(); | 585 delegate_->IsFullscreenForCurrentTab(); |
| 586 resize_params->display_mode = delegate_->GetDisplayMode(this); | 586 resize_params->display_mode = delegate_->GetDisplayMode(this); |
| 587 } else { | 587 } else { |
| 588 resize_params->is_fullscreen_granted = false; | 588 resize_params->is_fullscreen_granted = false; |
| 589 resize_params->display_mode = blink::WebDisplayModeBrowser; | 589 resize_params->display_mode = blink::WebDisplayModeBrowser; |
| 590 } | 590 } |
| 591 | 591 |
| 592 if (view_) { | 592 if (view_) { |
| 593 resize_params->new_size = view_->GetRequestedRendererSize(); | 593 resize_params->new_size = view_->GetRequestedRendererSize(); |
| 594 // TODO(wjmaclean): Can we just get rid of physical_backing_size and just |
| 595 // deal with it on the renderer side? It seems to always be |
| 596 // ScaleToCeiledSize(new_size, device_scale_factor) ?? |
| 594 resize_params->physical_backing_size = view_->GetPhysicalBackingSize(); | 597 resize_params->physical_backing_size = view_->GetPhysicalBackingSize(); |
| 595 resize_params->top_controls_height = view_->GetTopControlsHeight(); | 598 resize_params->top_controls_height = view_->GetTopControlsHeight(); |
| 596 resize_params->top_controls_shrink_blink_size = | 599 resize_params->top_controls_shrink_blink_size = |
| 597 view_->DoTopControlsShrinkBlinkSize(); | 600 view_->DoTopControlsShrinkBlinkSize(); |
| 598 resize_params->visible_viewport_size = view_->GetVisibleViewportSize(); | 601 resize_params->visible_viewport_size = view_->GetVisibleViewportSize(); |
| 599 } | 602 } |
| 600 | 603 |
| 601 const bool size_changed = | 604 const bool size_changed = |
| 602 !old_resize_params_ || | 605 !old_resize_params_ || |
| 603 old_resize_params_->new_size != resize_params->new_size || | 606 old_resize_params_->new_size != resize_params->new_size || |
| (...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1217 input_event_observers_.AddObserver(observer); | 1220 input_event_observers_.AddObserver(observer); |
| 1218 } | 1221 } |
| 1219 | 1222 |
| 1220 void RenderWidgetHostImpl::RemoveInputEventObserver( | 1223 void RenderWidgetHostImpl::RemoveInputEventObserver( |
| 1221 RenderWidgetHost::InputEventObserver* observer) { | 1224 RenderWidgetHost::InputEventObserver* observer) { |
| 1222 input_event_observers_.RemoveObserver(observer); | 1225 input_event_observers_.RemoveObserver(observer); |
| 1223 } | 1226 } |
| 1224 | 1227 |
| 1225 void RenderWidgetHostImpl::GetWebScreenInfo(blink::WebScreenInfo* result) { | 1228 void RenderWidgetHostImpl::GetWebScreenInfo(blink::WebScreenInfo* result) { |
| 1226 TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::GetWebScreenInfo"); | 1229 TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::GetWebScreenInfo"); |
| 1227 if (view_) | 1230 if (delegate_) |
| 1228 view_->GetScreenInfo(result); | 1231 delegate_->GetScreenInfo(result); |
| 1229 else | 1232 else |
| 1230 RenderWidgetHostViewBase::GetDefaultScreenInfo(result); | 1233 NOTREACHED(); |
| 1234 |
| 1231 // TODO(sievers): find a way to make this done another way so the method | 1235 // TODO(sievers): find a way to make this done another way so the method |
| 1232 // can be const. | 1236 // can be const. |
| 1233 latency_tracker_.set_device_scale_factor(result->deviceScaleFactor); | 1237 latency_tracker_.set_device_scale_factor(result->deviceScaleFactor); |
| 1234 if (IsUseZoomForDSFEnabled()) | 1238 if (IsUseZoomForDSFEnabled()) |
| 1235 input_router_->SetDeviceScaleFactor(result->deviceScaleFactor); | 1239 input_router_->SetDeviceScaleFactor(result->deviceScaleFactor); |
| 1236 } | 1240 } |
| 1237 | 1241 |
| 1238 void RenderWidgetHostImpl::HandleCompositorProto( | 1242 void RenderWidgetHostImpl::HandleCompositorProto( |
| 1239 const std::vector<uint8_t>& proto) { | 1243 const std::vector<uint8_t>& proto) { |
| 1240 DCHECK(!proto.empty()); | 1244 DCHECK(!proto.empty()); |
| (...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2166 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; | 2170 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; |
| 2167 } | 2171 } |
| 2168 | 2172 |
| 2169 BrowserAccessibilityManager* | 2173 BrowserAccessibilityManager* |
| 2170 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { | 2174 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { |
| 2171 return delegate_ ? | 2175 return delegate_ ? |
| 2172 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; | 2176 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; |
| 2173 } | 2177 } |
| 2174 | 2178 |
| 2175 } // namespace content | 2179 } // namespace content |
| OLD | NEW |