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

Unified Diff: content/renderer/render_widget.cc

Issue 2143643002: Remove didAutoResize from WebWidgetClient and move it to WebViewClient.. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 129ed07f6eb454e478f97327fc3e4969ea84065a..c64bfee4c281ba45f36c5393a3b9bd4b9bfc87cc 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1075,29 +1075,6 @@ void RenderWidget::SetScreenRects(const gfx::Rect& view_screen_rect,
///////////////////////////////////////////////////////////////////////////////
// WebWidgetClient
-void RenderWidget::didAutoResize(const WebSize& new_size) {
- WebRect new_size_in_window(0, 0, new_size.width, new_size.height);
- convertViewportToWindow(&new_size_in_window);
- if (size_.width() != new_size_in_window.width ||
- size_.height() != new_size_in_window.height) {
- size_ = gfx::Size(new_size_in_window.width, new_size_in_window.height);
-
- if (resizing_mode_selector_->is_synchronous_mode()) {
- gfx::Rect new_pos(rootWindowRect().x,
- rootWindowRect().y,
- size_.width(),
- size_.height());
- view_screen_rect_ = new_pos;
- window_screen_rect_ = new_pos;
- }
-
- AutoResizeCompositor();
-
- if (!resizing_mode_selector_->is_synchronous_mode())
- need_update_rect_for_auto_resize_ = true;
- }
-}
-
void RenderWidget::AutoResizeCompositor() {
physical_backing_size_ = gfx::ScaleToCeiledSize(size_, device_scale_factor_);
if (compositor_)
@@ -1732,6 +1709,27 @@ void RenderWidget::ResetDeviceColorProfileForTesting() {
SetDeviceColorProfile(color_profile);
}
+void RenderWidget::DidAutoResize(const gfx::Size& new_size) {
+ WebRect new_size_in_window(0, 0, new_size.width(), new_size.height());
+ convertViewportToWindow(&new_size_in_window);
+ if (size_.width() != new_size_in_window.width ||
+ size_.height() != new_size_in_window.height) {
+ size_ = gfx::Size(new_size_in_window.width, new_size_in_window.height);
+
+ if (resizing_mode_selector_->is_synchronous_mode()) {
+ gfx::Rect new_pos(rootWindowRect().x, rootWindowRect().y, size_.width(),
+ size_.height());
+ view_screen_rect_ = new_pos;
+ window_screen_rect_ = new_pos;
+ }
+
+ AutoResizeCompositor();
+
+ if (!resizing_mode_selector_->is_synchronous_mode())
+ need_update_rect_for_auto_resize_ = true;
+ }
+}
+
// Check blink::WebTextInputType and ui::TextInputType is kept in sync.
STATIC_ASSERT_ENUM(blink::WebTextInputTypeNone, ui::TEXT_INPUT_TYPE_NONE);
STATIC_ASSERT_ENUM(blink::WebTextInputTypeText, ui::TEXT_INPUT_TYPE_TEXT);

Powered by Google App Engine
This is Rietveld 408576698