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

Unified Diff: content/browser/compositor/browser_compositor_view_mac.mm

Issue 1354533002: Mac: move content::RenderWidgetResizeHelper to ui::WindowResizeHelperMac (acelerated_widget_mac) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rejig class comments Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/browser_compositor_view_mac.mm
diff --git a/content/browser/compositor/browser_compositor_view_mac.mm b/content/browser/compositor/browser_compositor_view_mac.mm
index 50547a6052b3a9356e6920fcb21f314796668bd9..ab0133d7ca03ba8104ae2d5d83cc02bfd4621e5d 100644
--- a/content/browser/compositor/browser_compositor_view_mac.mm
+++ b/content/browser/compositor/browser_compositor_view_mac.mm
@@ -8,10 +8,10 @@
#include "base/trace_event/trace_event.h"
#include "content/browser/compositor/image_transport_factory.h"
#include "content/browser/gpu/gpu_data_manager_impl.h"
-#include "content/browser/renderer_host/render_widget_resize_helper_mac.h"
#include "content/public/browser/context_factory.h"
#include "gpu/config/gpu_driver_bug_workaround_type.h"
#include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
+#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
////////////////////////////////////////////////////////////////////////////////
// BrowserCompositorMac
@@ -42,9 +42,8 @@ bool WidgetNeedsGLFinishWorkaround() {
BrowserCompositorMac::BrowserCompositorMac()
: accelerated_widget_mac_(
new ui::AcceleratedWidgetMac(WidgetNeedsGLFinishWorkaround())),
- compositor_(
- content::GetContextFactory(),
- RenderWidgetResizeHelper::Get()->task_runner()) {
+ compositor_(content::GetContextFactory(),
+ ui::WindowResizeHelperMac::Get()->task_runner()) {
compositor_.SetAcceleratedWidgetAndStartCompositor(
accelerated_widget_mac_->accelerated_widget());
compositor_.SetLocksWillTimeOut(false);
@@ -73,6 +72,7 @@ void BrowserCompositorMac::OnCompositingDidCommit(
// static
scoped_ptr<BrowserCompositorMac> BrowserCompositorMac::Create() {
+ DCHECK(ui::WindowResizeHelperMac::Get()->task_runner());
if (g_recyclable_browser_compositor.Get())
return g_recyclable_browser_compositor.Get().Pass();
return scoped_ptr<BrowserCompositorMac>(new BrowserCompositorMac).Pass();
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698