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

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 2691363002: Centralize FrameSinkId allocation in one place (Closed)
Patch Set: explicit Created 3 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
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/browser/renderer_host/render_widget_host_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <set> 9 #include <set>
10 #include <tuple> 10 #include <tuple>
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #include "ui/gfx/color_space.h" 88 #include "ui/gfx/color_space.h"
89 #include "ui/gfx/geometry/size_conversions.h" 89 #include "ui/gfx/geometry/size_conversions.h"
90 #include "ui/gfx/geometry/vector2d_conversions.h" 90 #include "ui/gfx/geometry/vector2d_conversions.h"
91 #include "ui/gfx/image/image.h" 91 #include "ui/gfx/image/image.h"
92 #include "ui/gfx/image/image_skia.h" 92 #include "ui/gfx/image/image_skia.h"
93 #include "ui/gfx/skbitmap_operations.h" 93 #include "ui/gfx/skbitmap_operations.h"
94 #include "ui/snapshot/snapshot.h" 94 #include "ui/snapshot/snapshot.h"
95 95
96 #if defined(OS_ANDROID) 96 #if defined(OS_ANDROID)
97 #include "ui/android/view_android.h" 97 #include "ui/android/view_android.h"
98 #else
99 #include "content/browser/compositor/image_transport_factory.h"
100 // nogncheck as dependency of "ui/compositor" is on non-Android platforms only.
101 #include "ui/compositor/compositor.h" // nogncheck
98 #endif 102 #endif
99 103
100 #if defined(OS_MACOSX) 104 #if defined(OS_MACOSX)
101 #include "device/power_save_blocker/power_save_blocker.h" 105 #include "device/power_save_blocker/power_save_blocker.h"
102 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" 106 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
103 #endif 107 #endif
104 108
105 using base::Time; 109 using base::Time;
106 using base::TimeDelta; 110 using base::TimeDelta;
107 using base::TimeTicks; 111 using base::TimeTicks;
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 } 422 }
419 423
420 int RenderWidgetHostImpl::GetRoutingID() const { 424 int RenderWidgetHostImpl::GetRoutingID() const {
421 return routing_id_; 425 return routing_id_;
422 } 426 }
423 427
424 RenderWidgetHostViewBase* RenderWidgetHostImpl::GetView() const { 428 RenderWidgetHostViewBase* RenderWidgetHostImpl::GetView() const {
425 return view_.get(); 429 return view_.get();
426 } 430 }
427 431
432 cc::FrameSinkId RenderWidgetHostImpl::AllocateFrameSinkId(
433 bool is_guest_view_hack) {
434 // GuestViews have two RenderWidgetHostViews and so we need to make sure
435 // we don't have FrameSinkId collisions.
436 // The FrameSinkId generated here must not conflict with FrameSinkId allocated
437 // in cc::FrameSinkIdAllocator.
438 #if !defined(OS_ANDROID)
439 if (is_guest_view_hack) {
440 ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
441 return factory->GetContextFactoryPrivate()->AllocateFrameSinkId();
442 }
443 #endif
444 return cc::FrameSinkId(
445 base::checked_cast<uint32_t>(this->GetProcess()->GetID()),
446 base::checked_cast<uint32_t>(this->GetRoutingID()));
447 }
448
428 void RenderWidgetHostImpl::ResetSizeAndRepaintPendingFlags() { 449 void RenderWidgetHostImpl::ResetSizeAndRepaintPendingFlags() {
429 resize_ack_pending_ = false; 450 resize_ack_pending_ = false;
430 if (repaint_ack_pending_) { 451 if (repaint_ack_pending_) {
431 TRACE_EVENT_ASYNC_END0( 452 TRACE_EVENT_ASYNC_END0(
432 "renderer_host", "RenderWidgetHostImpl::repaint_ack_pending_", this); 453 "renderer_host", "RenderWidgetHostImpl::repaint_ack_pending_", this);
433 } 454 }
434 repaint_ack_pending_ = false; 455 repaint_ack_pending_ = false;
435 if (old_resize_params_) 456 if (old_resize_params_)
436 old_resize_params_->new_size = gfx::Size(); 457 old_resize_params_->new_size = gfx::Size();
437 } 458 }
(...skipping 2071 matching lines...) Expand 10 before | Expand all | Expand 10 after
2509 // different from the receiver's. 2530 // different from the receiver's.
2510 file_system_file.url = 2531 file_system_file.url =
2511 GURL(storage::GetIsolatedFileSystemRootURIString( 2532 GURL(storage::GetIsolatedFileSystemRootURIString(
2512 file_system_url.origin(), filesystem_id, std::string()) 2533 file_system_url.origin(), filesystem_id, std::string())
2513 .append(register_name)); 2534 .append(register_name));
2514 file_system_file.filesystem_id = filesystem_id; 2535 file_system_file.filesystem_id = filesystem_id;
2515 } 2536 }
2516 } 2537 }
2517 2538
2518 } // namespace content 2539 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698