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

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: rebase 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 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1391 1391
1392 Send(new InputHostMsg_QueueSyntheticGesture(routing_id_, gesture_packet)); 1392 Send(new InputHostMsg_QueueSyntheticGesture(routing_id_, gesture_packet));
1393 } 1393 }
1394 1394
1395 void RenderWidget::Close() { 1395 void RenderWidget::Close() {
1396 screen_metrics_emulator_.reset(); 1396 screen_metrics_emulator_.reset();
1397 WillCloseLayerTreeView(); 1397 WillCloseLayerTreeView();
1398 compositor_.reset(); 1398 compositor_.reset();
1399 if (webwidget_) { 1399 if (webwidget_) {
1400 webwidget_->close(); 1400 webwidget_->close();
1401 webwidget_ = NULL; 1401 webwidget_ = nullptr;
1402 } 1402 }
1403 } 1403 }
1404 1404
1405 WebRect RenderWidget::windowRect() { 1405 WebRect RenderWidget::windowRect() {
1406 if (pending_window_rect_count_) 1406 if (pending_window_rect_count_)
1407 return pending_window_rect_; 1407 return pending_window_rect_;
1408 1408
1409 return view_screen_rect_; 1409 return view_screen_rect_;
1410 } 1410 }
1411 1411
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
2074 } 2074 }
2075 2075
2076 float RenderWidget::GetOriginalDeviceScaleFactor() const { 2076 float RenderWidget::GetOriginalDeviceScaleFactor() const {
2077 return 2077 return
2078 screen_metrics_emulator_ ? 2078 screen_metrics_emulator_ ?
2079 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : 2079 screen_metrics_emulator_->original_screen_info().deviceScaleFactor :
2080 device_scale_factor_; 2080 device_scale_factor_;
2081 } 2081 }
2082 2082
2083 } // namespace content 2083 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/shell/renderer/layout_test/blink_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698