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

Unified Diff: ui/gfx/compositor/compositor_gl.cc

Issue 7273073: Animated Rotation (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Moved screen rotation code under touch; use lock object to disable painting Created 9 years, 4 months 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/gfx/compositor/compositor_gl.cc
diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc
index 6d7bd29bb010c257ba425b2032ef983e935ea520..9e2e4c474180f2e7d4e1f3988fe402b77da563c5 100644
--- a/ui/gfx/compositor/compositor_gl.cc
+++ b/ui/gfx/compositor/compositor_gl.cc
@@ -4,6 +4,10 @@
#include "ui/gfx/compositor/compositor_gl.h"
+// for CompositorGL::SchedulePaint
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
@@ -429,7 +433,8 @@ void TextureGL::DrawInternal(const ui::TextureProgramGL& program,
CompositorGL::CompositorGL(gfx::AcceleratedWidget widget,
const gfx::Size& size)
- : size_(size),
+ : widget_(widget),
+ size_(size),
started_(false) {
gl_surface_ = gfx::GLSurface::CreateViewGLSurface(false, widget);
gl_context_ = SharedResources::GetInstance()->
@@ -490,8 +495,16 @@ void CompositorGL::Blur(const gfx::Rect& bounds) {
}
void CompositorGL::SchedulePaint() {
- // TODO: X doesn't provide coalescing of regions, its left to the toolkit.
- NOTIMPLEMENTED();
+ // TODO(vollick) Remove or ifdef the gdk/gtk code.
+ GdkDisplay* display = gdk_display_get_default();
+ GdkWindow* window = gdk_window_lookup_for_display(display, widget_);
+ if (window == NULL)
+ return;
+ gpointer data = NULL;
+ gdk_window_get_user_data(window, &data);
+ GtkWidget* widget = reinterpret_cast<GtkWidget*>(data);
+ if (widget && GTK_IS_WIDGET(widget) && GTK_WIDGET_DRAWABLE(widget))
+ gtk_widget_queue_draw_area(widget, 0, 0, size_.width(), size_.height());
}
void CompositorGL::OnWidgetSizeChanged(const gfx::Size& size) {

Powered by Google App Engine
This is Rietveld 408576698