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

Unified Diff: ui/views/cocoa/bridged_native_widget.mm

Issue 2563783002: ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate (Closed)
Patch Set: Restore mash Created 4 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
« no previous file with comments | « ui/snapshot/snapshot_aura_unittest.cc ('k') | ui/views/mus/surface_context_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/cocoa/bridged_native_widget.mm
diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
index b787dbc9549e986fd395cc5c8355a1408a58f427..28383b02dd7411822f9a2bc65d945fd3f950ad4d 100644
--- a/ui/views/cocoa/bridged_native_widget.mm
+++ b/ui/views/cocoa/bridged_native_widget.mm
@@ -1259,12 +1259,14 @@ void BridgedNativeWidget::CreateCompositor() {
ui::ContextFactory* context_factory =
ViewsDelegate::GetInstance()->GetContextFactory();
DCHECK(context_factory);
+ ui::ContextFactoryPrivate* context_factory_private =
+ ViewsDelegate::GetInstance()->GetContextFactoryPrivate();
AddCompositorSuperview();
compositor_widget_.reset(new ui::AcceleratedWidgetMac());
- compositor_.reset(
- new ui::Compositor(context_factory, GetCompositorTaskRunner()));
+ compositor_.reset(new ui::Compositor(context_factory, context_factory_private,
+ GetCompositorTaskRunner()));
compositor_->SetAcceleratedWidget(compositor_widget_->accelerated_widget());
compositor_widget_->SetNSView(this);
}
« no previous file with comments | « ui/snapshot/snapshot_aura_unittest.cc ('k') | ui/views/mus/surface_context_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698