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

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

Issue 2278283002: Implement Mac Pop-up Dictionary for OOPIF. (Closed)
Patch Set: Addressing lfg@'s comment Created 4 years, 2 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.h ('k') | content/renderer/render_widget.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 #include <memory> 9 #include <memory>
10 10
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 #include "content/renderer/navigation_state_impl.h" 87 #include "content/renderer/navigation_state_impl.h"
88 #include "content/renderer/render_frame_impl.h" 88 #include "content/renderer/render_frame_impl.h"
89 #include "content/renderer/render_frame_proxy.h" 89 #include "content/renderer/render_frame_proxy.h"
90 #include "content/renderer/render_process.h" 90 #include "content/renderer/render_process.h"
91 #include "content/renderer/render_thread_impl.h" 91 #include "content/renderer/render_thread_impl.h"
92 #include "content/renderer/render_widget_fullscreen_pepper.h" 92 #include "content/renderer/render_widget_fullscreen_pepper.h"
93 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 93 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
94 #include "content/renderer/resizing_mode_selector.h" 94 #include "content/renderer/resizing_mode_selector.h"
95 #include "content/renderer/savable_resources.h" 95 #include "content/renderer/savable_resources.h"
96 #include "content/renderer/speech_recognition_dispatcher.h" 96 #include "content/renderer/speech_recognition_dispatcher.h"
97 #include "content/renderer/text_input_client_observer.h"
98 #include "content/renderer/web_ui_extension_data.h" 97 #include "content/renderer/web_ui_extension_data.h"
99 #include "content/renderer/websharedworker_proxy.h" 98 #include "content/renderer/websharedworker_proxy.h"
100 #include "media/audio/audio_output_device.h" 99 #include "media/audio/audio_output_device.h"
101 #include "media/base/media_switches.h" 100 #include "media/base/media_switches.h"
102 #include "media/renderers/audio_renderer_impl.h" 101 #include "media/renderers/audio_renderer_impl.h"
103 #include "media/renderers/gpu_video_accelerator_factories.h" 102 #include "media/renderers/gpu_video_accelerator_factories.h"
104 #include "net/base/data_url.h" 103 #include "net/base/data_url.h"
105 #include "net/base/escape.h" 104 #include "net/base/escape.h"
106 #include "net/base/net_errors.h" 105 #include "net/base/net_errors.h"
107 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 106 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 827
829 UpdateWebViewWithDeviceScaleFactor(); 828 UpdateWebViewWithDeviceScaleFactor();
830 OnSetRendererPrefs(params.renderer_preferences); 829 OnSetRendererPrefs(params.renderer_preferences);
831 830
832 if (!params.enable_auto_resize) { 831 if (!params.enable_auto_resize) {
833 OnResize(params.initial_size); 832 OnResize(params.initial_size);
834 } else { 833 } else {
835 OnEnableAutoResize(params.min_size, params.max_size); 834 OnEnableAutoResize(params.min_size, params.max_size);
836 } 835 }
837 836
838 #if defined(OS_MACOSX)
839 new TextInputClientObserver(this);
840 #endif // defined(OS_MACOSX)
841
842 // We don't use HistoryController in OOPIF-enabled modes. 837 // We don't use HistoryController in OOPIF-enabled modes.
843 if (!SiteIsolationPolicy::UseSubframeNavigationEntries()) 838 if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
844 history_controller_.reset(new HistoryController(this)); 839 history_controller_.reset(new HistoryController(this));
845 840
846 new IdleUserDetector(this); 841 new IdleUserDetector(this);
847 842
848 if (command_line.HasSwitch(switches::kDomAutomationController)) 843 if (command_line.HasSwitch(switches::kDomAutomationController))
849 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION; 844 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION;
850 if (command_line.HasSwitch(switches::kStatsCollectionController)) 845 if (command_line.HasSwitch(switches::kStatsCollectionController))
851 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION; 846 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION;
(...skipping 2152 matching lines...) Expand 10 before | Expand all | Expand 10 after
3004 return; 2999 return;
3005 if (IsUseZoomForDSFEnabled()) { 3000 if (IsUseZoomForDSFEnabled()) {
3006 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); 3001 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
3007 } else { 3002 } else {
3008 webview()->setDeviceScaleFactor(device_scale_factor_); 3003 webview()->setDeviceScaleFactor(device_scale_factor_);
3009 } 3004 }
3010 webview()->settings()->setPreferCompositingToLCDTextEnabled( 3005 webview()->settings()->setPreferCompositingToLCDTextEnabled(
3011 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 3006 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
3012 } 3007 }
3013 3008
3014 #if defined(ENABLE_PLUGINS)
3015 PepperPluginInstanceImpl* RenderViewImpl::GetFocusedPepperPlugin() {
3016 blink::WebFrame* frame = GetWebView()->mainFrame();
3017
3018 while (frame) {
3019 if (frame->isWebLocalFrame()) {
3020 RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
3021 if (render_frame->focused_pepper_plugin())
3022 return render_frame->focused_pepper_plugin();
3023 }
3024 frame = frame->traverseNext(false);
3025 }
3026
3027 return nullptr;
3028 }
3029 #endif
3030
3031 } // namespace content 3009 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698