OLD | NEW |
---|---|
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 Loading... | |
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 (ChildFrameCompositingHelper* compositing_helper = | |
dcheng
2016/01/21 23:47:20
Just saying:
if (compositing_helper_)
will be s
| |
200 compositing_helper_.get()) { | |
201 FrameHostMsg_HittestData_Params params; | |
202 params.surface_id = compositing_helper->surface_id(); | |
203 params.ignored_for_hittest = web_frame_->ignoredForHittest(); | |
204 render_widget_->QueueMessage( | |
205 new FrameHostMsg_HittestData(render_widget_->routing_id(), params), | |
206 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); | |
207 } | |
208 } | |
209 | |
198 void RenderFrameProxy::DidCommitCompositorFrame() { | 210 void RenderFrameProxy::DidCommitCompositorFrame() { |
199 if (compositing_helper_.get()) | 211 if (compositing_helper_.get()) |
200 compositing_helper_->DidCommitCompositorFrame(); | 212 compositing_helper_->DidCommitCompositorFrame(); |
201 } | 213 } |
202 | 214 |
203 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) { | 215 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) { |
204 DCHECK(web_frame_); | 216 DCHECK(web_frame_); |
205 web_frame_->setReplicatedOrigin(state.origin); | 217 web_frame_->setReplicatedOrigin(state.origin); |
206 web_frame_->setReplicatedSandboxFlags(state.sandbox_flags); | 218 web_frame_->setReplicatedSandboxFlags(state.sandbox_flags); |
207 web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name)); | 219 web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name)); |
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
485 blink::WebLocalFrame* source) { | 497 blink::WebLocalFrame* source) { |
486 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); | 498 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); |
487 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); | 499 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); |
488 } | 500 } |
489 | 501 |
490 void RenderFrameProxy::frameFocused() { | 502 void RenderFrameProxy::frameFocused() { |
491 Send(new FrameHostMsg_FrameFocused(routing_id_)); | 503 Send(new FrameHostMsg_FrameFocused(routing_id_)); |
492 } | 504 } |
493 | 505 |
494 } // namespace | 506 } // namespace |
OLD | NEW |