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

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

Issue 1851093005: Remove content/child/npapi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_combined_01_02
Patch Set: rebase Created 4 years, 8 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
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | ipc/ipc_message_start.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <utility> 7 #include <utility>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 11 matching lines...) Expand all
22 #include "base/trace_event/trace_event.h" 22 #include "base/trace_event/trace_event.h"
23 #include "base/trace_event/trace_event_synthetic_delay.h" 23 #include "base/trace_event/trace_event_synthetic_delay.h"
24 #include "build/build_config.h" 24 #include "build/build_config.h"
25 #include "cc/base/switches.h" 25 #include "cc/base/switches.h"
26 #include "cc/debug/benchmark_instrumentation.h" 26 #include "cc/debug/benchmark_instrumentation.h"
27 #include "cc/output/output_surface.h" 27 #include "cc/output/output_surface.h"
28 #include "cc/scheduler/begin_frame_source.h" 28 #include "cc/scheduler/begin_frame_source.h"
29 #include "cc/trees/layer_tree_host.h" 29 #include "cc/trees/layer_tree_host.h"
30 #include "components/scheduler/renderer/render_widget_scheduling_state.h" 30 #include "components/scheduler/renderer/render_widget_scheduling_state.h"
31 #include "components/scheduler/renderer/renderer_scheduler.h" 31 #include "components/scheduler/renderer/renderer_scheduler.h"
32 #include "content/child/npapi/webplugin.h"
33 #include "content/common/content_switches_internal.h" 32 #include "content/common/content_switches_internal.h"
34 #include "content/common/gpu/client/context_provider_command_buffer.h" 33 #include "content/common/gpu/client/context_provider_command_buffer.h"
35 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 34 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
36 #include "content/common/gpu_process_launch_causes.h" 35 #include "content/common/gpu_process_launch_causes.h"
37 #include "content/common/input/synthetic_gesture_packet.h" 36 #include "content/common/input/synthetic_gesture_packet.h"
38 #include "content/common/input/web_input_event_traits.h" 37 #include "content/common/input/web_input_event_traits.h"
39 #include "content/common/input_messages.h" 38 #include "content/common/input_messages.h"
40 #include "content/common/swapped_out_messages.h" 39 #include "content/common/swapped_out_messages.h"
41 #include "content/common/view_messages.h" 40 #include "content/common/view_messages.h"
42 #include "content/public/common/content_features.h" 41 #include "content/public/common/content_features.h"
(...skipping 2106 matching lines...) Expand 10 before | Expand all | Expand 10 after
2149 } 2148 }
2150 2149
2151 float RenderWidget::GetOriginalDeviceScaleFactor() const { 2150 float RenderWidget::GetOriginalDeviceScaleFactor() const {
2152 return 2151 return
2153 screen_metrics_emulator_ ? 2152 screen_metrics_emulator_ ?
2154 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : 2153 screen_metrics_emulator_->original_screen_info().deviceScaleFactor :
2155 device_scale_factor_; 2154 device_scale_factor_;
2156 } 2155 }
2157 2156
2158 } // namespace content 2157 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | ipc/ipc_message_start.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698