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

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

Issue 2719333002: second stage
Patch Set: Need to get around resource loading without web/ Created 3 years, 9 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_frame_impl.h ('k') | extensions/browser/BUILD.gn » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2700 matching lines...) Expand 10 before | Expand all | Expand 10 after
2711 // the default zoom anyways. 2711 // the default zoom anyways.
2712 #if !defined(OS_ANDROID) 2712 #if !defined(OS_ANDROID)
2713 // On Android, page zoom isn't used, and in case of WebView, text zoom is used 2713 // On Android, page zoom isn't used, and in case of WebView, text zoom is used
2714 // for legacy WebView text scaling emulation. Thus, the code that resets 2714 // for legacy WebView text scaling emulation. Thus, the code that resets
2715 // the zoom level from this map will be effectively resetting text zoom level. 2715 // the zoom level from this map will be effectively resetting text zoom level.
2716 host_zoom_levels_[url] = zoom_level; 2716 host_zoom_levels_[url] = zoom_level;
2717 #endif 2717 #endif
2718 } 2718 }
2719 2719
2720 // blink::WebFrameClient implementation ---------------------------------------- 2720 // blink::WebFrameClient implementation ----------------------------------------
2721 int32_t RenderFrameImpl::getUniqueElementIdForMimeHandlerView() {
2722 return BrowserPluginManager::Get()->GetNextInstanceID();
2723 }
2721 2724
2722 blink::WebPlugin* RenderFrameImpl::createPlugin( 2725 blink::WebPlugin* RenderFrameImpl::createPlugin(
2723 blink::WebLocalFrame* frame, 2726 blink::WebLocalFrame* frame,
2724 const blink::WebPluginParams& params) { 2727 const blink::WebPluginParams& params) {
2725 DCHECK_EQ(frame_, frame); 2728 DCHECK_EQ(frame_, frame);
2726 blink::WebPlugin* plugin = NULL; 2729 blink::WebPlugin* plugin = NULL;
2727 if (GetContentClient()->renderer()->OverrideCreatePlugin( 2730 if (GetContentClient()->renderer()->OverrideCreatePlugin(
2728 this, frame, params, &plugin)) { 2731 this, frame, params, &plugin)) {
2729 return plugin; 2732 return plugin;
2730 } 2733 }
(...skipping 4110 matching lines...) Expand 10 before | Expand all | Expand 10 after
6841 // event target. Potentially a Pepper plugin will receive the event. 6844 // event target. Potentially a Pepper plugin will receive the event.
6842 // In order to tell whether a plugin gets the last mouse event and which it 6845 // In order to tell whether a plugin gets the last mouse event and which it
6843 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6846 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6844 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6847 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6845 // |pepper_last_mouse_event_target_|. 6848 // |pepper_last_mouse_event_target_|.
6846 pepper_last_mouse_event_target_ = nullptr; 6849 pepper_last_mouse_event_target_ = nullptr;
6847 #endif 6850 #endif
6848 } 6851 }
6849 6852
6850 } // namespace content 6853 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | extensions/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698