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

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

Issue 1643063002: Revert of Handle pointer-events: none in browser process hittesting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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_proxy.h ('k') | content/renderer/render_widget.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_proxy.h" 5 #include "content/renderer/render_frame_proxy.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 CHECK(result.second) << "Inserted a duplicate item."; 188 CHECK(result.second) << "Inserted a duplicate item.";
189 } 189 }
190 190
191 bool RenderFrameProxy::IsMainFrameDetachedFromTree() const { 191 bool RenderFrameProxy::IsMainFrameDetachedFromTree() const {
192 if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) 192 if (SiteIsolationPolicy::IsSwappedOutStateForbidden())
193 return false; 193 return false;
194 return web_frame_->top() == web_frame_ && 194 return web_frame_->top() == web_frame_ &&
195 render_view_->webview()->mainFrame()->isWebLocalFrame(); 195 render_view_->webview()->mainFrame()->isWebLocalFrame();
196 } 196 }
197 197
198 void RenderFrameProxy::WillBeginCompositorFrame() {
199 if (compositing_helper_) {
200 FrameHostMsg_HittestData_Params params;
201 params.surface_id = compositing_helper_->surface_id();
202 params.ignored_for_hittest = web_frame_->isIgnoredForHitTest();
203 render_widget_->QueueMessage(
204 new FrameHostMsg_HittestData(render_widget_->routing_id(), params),
205 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE);
206 }
207 }
208
209 void RenderFrameProxy::DidCommitCompositorFrame() { 198 void RenderFrameProxy::DidCommitCompositorFrame() {
210 if (compositing_helper_.get()) 199 if (compositing_helper_.get())
211 compositing_helper_->DidCommitCompositorFrame(); 200 compositing_helper_->DidCommitCompositorFrame();
212 } 201 }
213 202
214 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) { 203 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) {
215 DCHECK(web_frame_); 204 DCHECK(web_frame_);
216 web_frame_->setReplicatedOrigin(state.origin); 205 web_frame_->setReplicatedOrigin(state.origin);
217 web_frame_->setReplicatedSandboxFlags(state.sandbox_flags); 206 web_frame_->setReplicatedSandboxFlags(state.sandbox_flags);
218 web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name)); 207 web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name));
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 blink::WebLocalFrame* source) { 485 blink::WebLocalFrame* source) {
497 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); 486 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID();
498 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); 487 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id));
499 } 488 }
500 489
501 void RenderFrameProxy::frameFocused() { 490 void RenderFrameProxy::frameFocused() {
502 Send(new FrameHostMsg_FrameFocused(routing_id_)); 491 Send(new FrameHostMsg_FrameFocused(routing_id_));
503 } 492 }
504 493
505 } // namespace 494 } // namespace
OLDNEW
« no previous file with comments | « content/renderer/render_frame_proxy.h ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698