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

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

Issue 1513053002: WIP - Gutterless resize on Windows Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 5 years 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
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 b33f832c42ceda884cc83c5201d95ff3188f5945..6e3e23597bad0404579d876d201d8db404ca95de 100644
--- a/content/browser/compositor/browser_compositor_view_mac.mm
+++ b/content/browser/compositor/browser_compositor_view_mac.mm
@@ -11,7 +11,7 @@
#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"
+#include "ui/base/window_resize_helper.h"
////////////////////////////////////////////////////////////////////////////////
// BrowserCompositorMac
@@ -43,7 +43,7 @@ BrowserCompositorMac::BrowserCompositorMac()
: accelerated_widget_mac_(
new ui::AcceleratedWidgetMac(WidgetNeedsGLFinishWorkaround())),
compositor_(content::GetContextFactory(),
- ui::WindowResizeHelperMac::Get()->task_runner()) {
+ ui::WindowResizeHelper::Get()->task_runner()) {
compositor_.SetAcceleratedWidget(
accelerated_widget_mac_->accelerated_widget());
compositor_.SetLocksWillTimeOut(false);
@@ -72,7 +72,7 @@ void BrowserCompositorMac::OnCompositingDidCommit(
// static
scoped_ptr<BrowserCompositorMac> BrowserCompositorMac::Create() {
- DCHECK(ui::WindowResizeHelperMac::Get()->task_runner());
+ DCHECK(ui::WindowResizeHelper::Get()->task_runner());
if (g_recyclable_browser_compositor.Get())
return g_recyclable_browser_compositor.Get().Pass();
return scoped_ptr<BrowserCompositorMac>(new BrowserCompositorMac).Pass();

Powered by Google App Engine
This is Rietveld 408576698