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

Unified Diff: ui/views/widget/native_widget_gtk.cc

Issue 8805033: Makes tests either use mock compositor or mock WebGraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 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: ui/views/widget/native_widget_gtk.cc
diff --git a/ui/views/widget/native_widget_gtk.cc b/ui/views/widget/native_widget_gtk.cc
index a970976de5e456fb3a36f9662994d09430605eab..cfd3f6eafdb975d2fbec6d4bf414619e192c9ae1 100644
--- a/ui/views/widget/native_widget_gtk.cc
+++ b/ui/views/widget/native_widget_gtk.cc
@@ -673,15 +673,11 @@ void NativeWidgetGtk::InitNativeWidget(const Widget::InitParams& params) {
}
if (View::get_use_acceleration_when_possible()) {
- if (ui::Compositor::compositor_factory()) {
- compositor_ = (*ui::Compositor::compositor_factory())(this);
- } else {
- gint width, height;
- gdk_drawable_get_size(window_contents_->window, &width, &height);
- compositor_ = ui::Compositor::Create(this,
- GDK_WINDOW_XID(window_contents_->window),
- gfx::Size(width, height));
- }
+ gint width, height;
+ gdk_drawable_get_size(window_contents_->window, &width, &height);
+ compositor_ = ui::Compositor::Create(this,
+ GDK_WINDOW_XID(window_contents_->window),
+ gfx::Size(width, height));
if (compositor_.get()) {
View* root_view = delegate_->AsWidget()->GetRootView();
root_view->SetPaintToLayer(true);

Powered by Google App Engine
This is Rietveld 408576698