| 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 aa889d62e6210a11eefd86559f954ef2ad041aef..811ff90df334d09e0454356412d014019932c34d 100644
|
| --- a/content/browser/compositor/browser_compositor_view_mac.mm
|
| +++ b/content/browser/compositor/browser_compositor_view_mac.mm
|
| @@ -6,9 +6,11 @@
|
|
|
| #include "base/debug/trace_event.h"
|
| #include "base/lazy_instance.h"
|
| -#include "content/browser/compositor/browser_compositor_ca_layer_tree_mac.h"
|
| +#include "content/browser/gpu/gpu_data_manager_impl.h"
|
| #include "content/browser/renderer_host/render_widget_resize_helper.h"
|
| #include "content/public/browser/context_factory.h"
|
| +#include "gpu/config/gpu_driver_bug_workaround_type.h"
|
| +#include "ui/compositor/mac/accelerated_widget_mac.h"
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // BrowserCompositorMac
|
| @@ -26,10 +28,16 @@ uint32 g_placeholder_count = 0;
|
| base::LazyInstance<scoped_ptr<BrowserCompositorMac>>
|
| g_recyclable_browser_compositor;
|
|
|
| +bool WidgetNeedsGLFinishWorkaround() {
|
| + return GpuDataManagerImpl::GetInstance()->IsDriverBugWorkaroundActive(
|
| + gpu::FORCE_GL_FINISH_AFTER_COMPOSITING);
|
| +}
|
| +
|
| } // namespace
|
|
|
| BrowserCompositorMac::BrowserCompositorMac()
|
| - : compositor_(
|
| + : accelerated_widget_mac_(WidgetNeedsGLFinishWorkaround()),
|
| + compositor_(
|
| accelerated_widget_mac_.accelerated_widget(),
|
| content::GetContextFactory(),
|
| RenderWidgetResizeHelper::Get()->task_runner()) {
|
|
|