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

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

Issue 2610723002: Unify SurfaceInfo (Closed)
Patch Set: Cleanup offscreen canvas Created 3 years, 11 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
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 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 // can happen when swapping a WebRemoteFrame with a WebLocalFrame, where this 331 // can happen when swapping a WebRemoteFrame with a WebLocalFrame, where this
332 // message may arrive after the frame was removed from the frame tree, but 332 // message may arrive after the frame was removed from the frame tree, but
333 // before the frame has been destroyed. http://crbug.com/446575. 333 // before the frame has been destroyed. http://crbug.com/446575.
334 if (!web_frame()->parent()) 334 if (!web_frame()->parent())
335 return; 335 return;
336 336
337 if (!compositing_helper_.get()) { 337 if (!compositing_helper_.get()) {
338 compositing_helper_ = 338 compositing_helper_ =
339 ChildFrameCompositingHelper::CreateForRenderFrameProxy(this); 339 ChildFrameCompositingHelper::CreateForRenderFrameProxy(this);
340 } 340 }
341 compositing_helper_->OnSetSurface(surface_id, frame_size, scale_factor, 341 compositing_helper_->OnSetSurface(
342 sequence); 342 cc::SurfaceInfo(surface_id, scale_factor, frame_size), sequence);
343 } 343 }
344 344
345 void RenderFrameProxy::OnUpdateOpener(int opener_routing_id) { 345 void RenderFrameProxy::OnUpdateOpener(int opener_routing_id) {
346 blink::WebFrame* opener = RenderFrameImpl::ResolveOpener(opener_routing_id); 346 blink::WebFrame* opener = RenderFrameImpl::ResolveOpener(opener_routing_id);
347 web_frame_->setOpener(opener); 347 web_frame_->setOpener(opener);
348 } 348 }
349 349
350 void RenderFrameProxy::OnDidStartLoading() { 350 void RenderFrameProxy::OnDidStartLoading() {
351 web_frame_->didStartLoading(); 351 web_frame_->didStartLoading();
352 } 352 }
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 blink::WebLocalFrame* source) { 520 blink::WebLocalFrame* source) {
521 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); 521 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID();
522 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); 522 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id));
523 } 523 }
524 524
525 void RenderFrameProxy::frameFocused() { 525 void RenderFrameProxy::frameFocused() {
526 Send(new FrameHostMsg_FrameFocused(routing_id_)); 526 Send(new FrameHostMsg_FrameFocused(routing_id_));
527 } 527 }
528 528
529 } // namespace 529 } // namespace
OLDNEW
« no previous file with comments | « content/renderer/child_frame_compositing_helper.cc ('k') | services/ui/public/cpp/surface_id_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698