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

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: addressing comments 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 1399 matching lines...) Expand 10 before | Expand all | Expand 10 after
1410 1410
1411 Send(new InputHostMsg_QueueSyntheticGesture(routing_id_, gesture_packet)); 1411 Send(new InputHostMsg_QueueSyntheticGesture(routing_id_, gesture_packet));
1412 } 1412 }
1413 1413
1414 void RenderWidget::Close() { 1414 void RenderWidget::Close() {
1415 screen_metrics_emulator_.reset(); 1415 screen_metrics_emulator_.reset();
1416 WillCloseLayerTreeView(); 1416 WillCloseLayerTreeView();
1417 compositor_.reset(); 1417 compositor_.reset();
1418 if (webwidget_) { 1418 if (webwidget_) {
1419 webwidget_->close(); 1419 webwidget_->close();
1420 webwidget_ = NULL; 1420 webwidget_ = nullptr;
1421 } 1421 }
1422 } 1422 }
1423 1423
1424 WebRect RenderWidget::windowRect() { 1424 WebRect RenderWidget::windowRect() {
1425 if (pending_window_rect_count_) 1425 if (pending_window_rect_count_)
1426 return pending_window_rect_; 1426 return pending_window_rect_;
1427 1427
1428 return view_screen_rect_; 1428 return view_screen_rect_;
1429 } 1429 }
1430 1430
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
2093 } 2093 }
2094 2094
2095 float RenderWidget::GetOriginalDeviceScaleFactor() const { 2095 float RenderWidget::GetOriginalDeviceScaleFactor() const {
2096 return 2096 return
2097 screen_metrics_emulator_ ? 2097 screen_metrics_emulator_ ?
2098 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : 2098 screen_metrics_emulator_->original_screen_info().deviceScaleFactor :
2099 device_scale_factor_; 2099 device_scale_factor_;
2100 } 2100 }
2101 2101
2102 } // namespace content 2102 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698