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

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

Issue 1386873003: OOPIFs: Transitioning MHTML generation from view-oriented to frame-oriented. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mhtml-generation-mgr-cleanup
Patch Set: Moving "using" declaration under a singly-included section of frame_messges.h Created 5 years 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_frame_impl.cc ('k') | content/renderer/web_frame_utils.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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "content/renderer/drop_data_builder.h" 78 #include "content/renderer/drop_data_builder.h"
79 #include "content/renderer/gpu/render_widget_compositor.h" 79 #include "content/renderer/gpu/render_widget_compositor.h"
80 #include "content/renderer/history_controller.h" 80 #include "content/renderer/history_controller.h"
81 #include "content/renderer/history_serialization.h" 81 #include "content/renderer/history_serialization.h"
82 #include "content/renderer/idle_user_detector.h" 82 #include "content/renderer/idle_user_detector.h"
83 #include "content/renderer/ime_event_guard.h" 83 #include "content/renderer/ime_event_guard.h"
84 #include "content/renderer/input/input_handler_manager.h" 84 #include "content/renderer/input/input_handler_manager.h"
85 #include "content/renderer/internal_document_state_data.h" 85 #include "content/renderer/internal_document_state_data.h"
86 #include "content/renderer/media/audio_device_factory.h" 86 #include "content/renderer/media/audio_device_factory.h"
87 #include "content/renderer/media/video_capture_impl_manager.h" 87 #include "content/renderer/media/video_capture_impl_manager.h"
88 #include "content/renderer/mhtml_generator.h"
89 #include "content/renderer/navigation_state_impl.h" 88 #include "content/renderer/navigation_state_impl.h"
90 #include "content/renderer/render_frame_impl.h" 89 #include "content/renderer/render_frame_impl.h"
91 #include "content/renderer/render_frame_proxy.h" 90 #include "content/renderer/render_frame_proxy.h"
92 #include "content/renderer/render_process.h" 91 #include "content/renderer/render_process.h"
93 #include "content/renderer/render_thread_impl.h" 92 #include "content/renderer/render_thread_impl.h"
94 #include "content/renderer/render_view_mouse_lock_dispatcher.h" 93 #include "content/renderer/render_view_mouse_lock_dispatcher.h"
95 #include "content/renderer/render_widget_fullscreen_pepper.h" 94 #include "content/renderer/render_widget_fullscreen_pepper.h"
96 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 95 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
97 #include "content/renderer/resizing_mode_selector.h" 96 #include "content/renderer/resizing_mode_selector.h"
98 #include "content/renderer/savable_resources.h" 97 #include "content/renderer/savable_resources.h"
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 OnSetRendererPrefs(params.renderer_preferences); 771 OnSetRendererPrefs(params.renderer_preferences);
773 772
774 ApplyBlinkSettings(command_line, webview()->settings()); 773 ApplyBlinkSettings(command_line, webview()->settings());
775 774
776 if (!params.enable_auto_resize) { 775 if (!params.enable_auto_resize) {
777 OnResize(params.initial_size); 776 OnResize(params.initial_size);
778 } else { 777 } else {
779 OnEnableAutoResize(params.min_size, params.max_size); 778 OnEnableAutoResize(params.min_size, params.max_size);
780 } 779 }
781 780
782 new MHTMLGenerator(this);
783 #if defined(OS_MACOSX) 781 #if defined(OS_MACOSX)
784 new TextInputClientObserver(this); 782 new TextInputClientObserver(this);
785 #endif // defined(OS_MACOSX) 783 #endif // defined(OS_MACOSX)
786 784
787 // The next group of objects all implement RenderViewObserver, so are deleted 785 // The next group of objects all implement RenderViewObserver, so are deleted
788 // along with the RenderView automatically. 786 // along with the RenderView automatically.
789 mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this); 787 mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this);
790 788
791 // We don't use HistoryController in OOPIF-enabled modes. 789 // We don't use HistoryController in OOPIF-enabled modes.
792 if (!SiteIsolationPolicy::UseSubframeNavigationEntries()) 790 if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
(...skipping 2917 matching lines...) Expand 10 before | Expand all | Expand 10 after
3710 if (IsUseZoomForDSFEnabled()) { 3708 if (IsUseZoomForDSFEnabled()) {
3711 compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_); 3709 compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_);
3712 webview()->setZoomFactorForDeviceScaleFactor( 3710 webview()->setZoomFactorForDeviceScaleFactor(
3713 device_scale_factor_); 3711 device_scale_factor_);
3714 } else { 3712 } else {
3715 webview()->setDeviceScaleFactor(device_scale_factor_); 3713 webview()->setDeviceScaleFactor(device_scale_factor_);
3716 } 3714 }
3717 } 3715 }
3718 3716
3719 } // namespace content 3717 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/web_frame_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698