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

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

Issue 753933002: MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20141124-MacViews-MoveSoftwareLayerMac-fromcl
Patch Set: gn check Created 6 years, 1 month 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 aa889d62e6210a11eefd86559f954ef2ad041aef..7b2c799b6651ab900715a2d145076df9efc0eb54 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/accelerated_widget_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()) {
« no previous file with comments | « content/browser/compositor/browser_compositor_view_mac.h ('k') | content/browser/compositor/io_surface_context_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698