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

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: Rebasing... 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
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/mojo_bindings_controller.h" 88 #include "content/renderer/mojo_bindings_controller.h"
90 #include "content/renderer/navigation_state_impl.h" 89 #include "content/renderer/navigation_state_impl.h"
91 #include "content/renderer/net_info_helper.h" 90 #include "content/renderer/net_info_helper.h"
92 #include "content/renderer/render_frame_impl.h" 91 #include "content/renderer/render_frame_impl.h"
93 #include "content/renderer/render_frame_proxy.h" 92 #include "content/renderer/render_frame_proxy.h"
94 #include "content/renderer/render_process.h" 93 #include "content/renderer/render_process.h"
95 #include "content/renderer/render_thread_impl.h" 94 #include "content/renderer/render_thread_impl.h"
96 #include "content/renderer/render_view_mouse_lock_dispatcher.h" 95 #include "content/renderer/render_view_mouse_lock_dispatcher.h"
97 #include "content/renderer/render_widget_fullscreen_pepper.h" 96 #include "content/renderer/render_widget_fullscreen_pepper.h"
98 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 97 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 OnSetRendererPrefs(params.renderer_preferences); 775 OnSetRendererPrefs(params.renderer_preferences);
777 776
778 ApplyBlinkSettings(command_line, webview()->settings()); 777 ApplyBlinkSettings(command_line, webview()->settings());
779 778
780 if (!params.enable_auto_resize) { 779 if (!params.enable_auto_resize) {
781 OnResize(params.initial_size); 780 OnResize(params.initial_size);
782 } else { 781 } else {
783 OnEnableAutoResize(params.min_size, params.max_size); 782 OnEnableAutoResize(params.min_size, params.max_size);
784 } 783 }
785 784
786 new MHTMLGenerator(this);
787 #if defined(OS_MACOSX) 785 #if defined(OS_MACOSX)
788 new TextInputClientObserver(this); 786 new TextInputClientObserver(this);
789 #endif // defined(OS_MACOSX) 787 #endif // defined(OS_MACOSX)
790 788
791 // The next group of objects all implement RenderViewObserver, so are deleted 789 // The next group of objects all implement RenderViewObserver, so are deleted
792 // along with the RenderView automatically. 790 // along with the RenderView automatically.
793 mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this); 791 mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this);
794 792
795 // We don't use HistoryController in OOPIF-enabled modes. 793 // We don't use HistoryController in OOPIF-enabled modes.
796 if (!SiteIsolationPolicy::UseSubframeNavigationEntries()) 794 if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
(...skipping 2917 matching lines...) Expand 10 before | Expand all | Expand 10 after
3714 if (IsUseZoomForDSFEnabled()) { 3712 if (IsUseZoomForDSFEnabled()) {
3715 compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_); 3713 compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_);
3716 webview()->setZoomFactorForDeviceScaleFactor( 3714 webview()->setZoomFactorForDeviceScaleFactor(
3717 device_scale_factor_); 3715 device_scale_factor_);
3718 } else { 3716 } else {
3719 webview()->setDeviceScaleFactor(device_scale_factor_); 3717 webview()->setDeviceScaleFactor(device_scale_factor_);
3720 } 3718 }
3721 } 3719 }
3722 3720
3723 } // namespace content 3721 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698