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

Side by Side Diff: content/renderer/render_widget.cc

Issue 1918183004: Switch the inheritance of WebView from WebWidget to protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: set webwidget on frame creation instead of view creation Created 4 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
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 "content/renderer/render_widget.h" 5 #include "content/renderer/render_widget.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after
1420 1420
1421 Send(new InputHostMsg_QueueSyntheticGesture(routing_id_, gesture_packet)); 1421 Send(new InputHostMsg_QueueSyntheticGesture(routing_id_, gesture_packet));
1422 } 1422 }
1423 1423
1424 void RenderWidget::Close() { 1424 void RenderWidget::Close() {
1425 screen_metrics_emulator_.reset(); 1425 screen_metrics_emulator_.reset();
1426 WillCloseLayerTreeView(); 1426 WillCloseLayerTreeView();
1427 compositor_.reset(); 1427 compositor_.reset();
1428 if (webwidget_) { 1428 if (webwidget_) {
1429 webwidget_->close(); 1429 webwidget_->close();
1430 webwidget_ = NULL; 1430 webwidget_ = nullptr;
1431 } 1431 }
1432 } 1432 }
1433 1433
1434 WebRect RenderWidget::windowRect() { 1434 WebRect RenderWidget::windowRect() {
1435 if (pending_window_rect_count_) 1435 if (pending_window_rect_count_)
1436 return pending_window_rect_; 1436 return pending_window_rect_;
1437 1437
1438 return view_screen_rect_; 1438 return view_screen_rect_;
1439 } 1439 }
1440 1440
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
2103 } 2103 }
2104 2104
2105 float RenderWidget::GetOriginalDeviceScaleFactor() const { 2105 float RenderWidget::GetOriginalDeviceScaleFactor() const {
2106 return 2106 return
2107 screen_metrics_emulator_ ? 2107 screen_metrics_emulator_ ?
2108 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : 2108 screen_metrics_emulator_->original_screen_info().deviceScaleFactor :
2109 device_scale_factor_; 2109 device_scale_factor_;
2110 } 2110 }
2111 2111
2112 } // namespace content 2112 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698