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

Unified Diff: webkit/tools/test_shell/gtk/webwidget_host.cc

Issue 8000: Start writing the GTK code for test_shell. (Closed)
Patch Set: Sync with master Created 12 years, 2 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
« no previous file with comments | « webkit/tools/test_shell/gtk/webview_host.cc ('k') | webkit/tools/test_shell/webwidget_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/gtk/webwidget_host.cc
diff --git a/webkit/tools/test_shell/gtk/webwidget_host.cc b/webkit/tools/test_shell/gtk/webwidget_host.cc
index 3b21839936bfe35b22fd9df2300646f1ecc50ab8..46e3a83e2ab0f554999696593633e513ca5f7129 100644
--- a/webkit/tools/test_shell/gtk/webwidget_host.cc
+++ b/webkit/tools/test_shell/gtk/webwidget_host.cc
@@ -4,12 +4,179 @@
#include "webkit/tools/test_shell/webwidget_host.h"
+#include <gtk/gtk.h>
+
#include "base/logging.h"
+#include "base/gfx/platform_canvas_linux.h"
+#include "base/gfx/platform_device_linux.h"
+#include "base/gfx/bitmap_platform_device_linux.h"
+#include "webkit/glue/webinputevent.h"
+#include "webkit/glue/webwidget.h"
+
+namespace {
+
+// -----------------------------------------------------------------------------
+// Callback functions to proxy to host...
+
+gboolean ConfigureEvent(GtkWidget* widget, GdkEventConfigure* config,
+ gpointer userdata) {
+ WebWidgetHost* host = (WebWidgetHost* ) userdata;
+ DLOG(INFO) << " -- Resize " << config->width << " " << config->height;
+ host->Resize(gfx::Size(config->width, config->height));
+ return FALSE;
+}
+
+gboolean ExposeEvent(GtkWidget* widget, GdkEventExpose* expose,
+ gpointer userdata) {
+ WebWidgetHost* host = (WebWidgetHost* ) userdata;
+ DLOG(INFO) << " -- Expose";
+ host->Paint();
+ return FALSE;
+}
+
+gboolean DestroyEvent(GtkWidget* widget, GdkEvent* event, gpointer userdata) {
+ WebWidgetHost* host = (WebWidgetHost* ) userdata;
+ DLOG(INFO) << " -- Destroy";
+ host->WindowDestroyed();
+ return FALSE;
+}
+
+gboolean KeyPressEvent(GtkWidget* widget, GdkEventKey* event,
+ gpointer userdata) {
+ WebWidgetHost* host = (WebWidgetHost* ) userdata;
+ DLOG(INFO) << " -- Key press";
+ WebKeyboardEvent wke(event);
+ host->webwidget()->HandleInputEvent(&wke);
+ return FALSE;
+}
+
+gboolean FocusIn(GtkWidget* widget, GdkEventFocus* focus, gpointer userdata) {
+ WebWidgetHost* host = (WebWidgetHost* ) userdata;
+ host->webwidget()->SetFocus(true);
+ return FALSE;
+}
+
+gboolean FocusOut(GtkWidget* widget, GdkEventFocus* focus, gpointer userdata) {
+ WebWidgetHost* host = (WebWidgetHost* ) userdata;
+ host->webwidget()->SetFocus(false);
+ return FALSE;
+}
+
+} // anonymous namespace
+
+// -----------------------------------------------------------------------------
+
+WebWidgetHost* WebWidgetHost::Create(gfx::WindowHandle box,
+ WebWidgetDelegate* delegate) {
+ WebWidgetHost* host = new WebWidgetHost();
+ host->view_ = gtk_drawing_area_new();
+ gtk_widget_add_events(host->view_, GDK_EXPOSURE_MASK |
+ GDK_POINTER_MOTION_MASK |
+ GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_KEY_PRESS_MASK |
+ GDK_KEY_RELEASE_MASK);
+ // TODO(agl): set GTK_CAN_FOCUS flag
+ host->webwidget_ = WebWidget::Create(delegate);
+ g_object_set_data(G_OBJECT(host->view_), "webwidgethost", host);
+
+ g_signal_connect(host->view_, "configure-event", G_CALLBACK(ConfigureEvent), host);
+ g_signal_connect(host->view_, "expose-event", G_CALLBACK(ExposeEvent), host);
+ g_signal_connect(host->view_, "destroy-event", G_CALLBACK(DestroyEvent), host);
+ g_signal_connect(host->view_, "key-press-event", G_CALLBACK(KeyPressEvent), host);
+ g_signal_connect(host->view_, "focus-in-event", G_CALLBACK(FocusIn), host);
+ g_signal_connect(host->view_, "focus-out-event", G_CALLBACK(FocusOut), host);
+
+ gtk_box_pack_start(GTK_BOX(box), host->view_, TRUE, TRUE, 0);
-WebWidgetHost::WebWidgetHost() {
- NOTIMPLEMENTED();
+ return host;
+}
+
+WebWidgetHost* FromWindow(gfx::WindowHandle view) {
+ const gpointer p = g_object_get_data(G_OBJECT(view), "webwidgethost");
+ return (WebWidgetHost* ) p;
+}
+
+WebWidgetHost::WebWidgetHost()
+ : view_(NULL),
+ webwidget_(NULL),
+ scroll_dx_(0),
+ scroll_dy_(0),
+ track_mouse_leave_(false) {
+ set_painting(false);
}
WebWidgetHost::~WebWidgetHost() {
- NOTIMPLEMENTED();
+ webwidget_->Close();
+ webwidget_->Release();
+}
+
+void WebWidgetHost::Resize(const gfx::Size &newsize) {
+ // The pixel buffer backing us is now the wrong size
+ canvas_.reset();
+
+ gtk_widget_set_size_request(GTK_WIDGET(view_), newsize.width(), newsize.height());
+ webwidget_->Resize(gfx::Size(newsize.width(), newsize.height()));
+}
+
+void WebWidgetHost::Paint() {
+ gint width, height;
+ gtk_widget_get_size_request(GTK_WIDGET(view_), &width, &height);
+
+ gfx::Rect client_rect(width, height);
+
+ if (!canvas_.get()) {
+ paint_rect_ = client_rect;
+ canvas_.reset(new gfx::PlatformCanvas(width, height, true));
+ if (!canvas_.get()) {
+ // memory allocation failed, we can't paint.
+ LOG(ERROR) << "Failed to allocate memory for " << width << "x" << height;
+ return;
+ }
+ }
+
+ // This may result in more invalidation
+ webwidget_->Layout();
+
+ // TODO(agl): scrolling code
+
+ // Paint the canvas if necessary. Allow painting to generate extra rects the
+ // first time we call it. This is necessary because some WebCore rendering
+ // objects update their layout only when painted.
+
+ for (int i = 0; i < 2; ++i) {
+ paint_rect_ = client_rect.Intersect(paint_rect_);
+ if (!paint_rect_.IsEmpty()) {
+ gfx::Rect rect(paint_rect_);
+ paint_rect_ = gfx::Rect();
+
+ DLOG_IF(WARNING, i == 1) << "painting caused additional invalidations";
+ PaintRect(rect);
+ }
+ }
+ DCHECK(paint_rect_.IsEmpty());
+
+ // BitBlit to the X server
+ gfx::PlatformDeviceLinux &platdev = canvas_->getTopPlatformDevice();
+ gfx::BitmapPlatformDeviceLinux* const bitdev =
+ static_cast<gfx::BitmapPlatformDeviceLinux* >(&platdev);
+ LOG(INFO) << "Using pixel data at " << (void *) gdk_pixbuf_get_pixels(bitdev->pixbuf());
+ gdk_draw_pixbuf(view_->window, NULL, bitdev->pixbuf(),
+ 0, 0, 0, 0, width, height, GDK_RGB_DITHER_NONE, 0, 0);
+ gdk_pixbuf_save(bitdev->pixbuf(), "output.png", "png", NULL, NULL);
+}
+
+void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
+ set_painting(true);
+ webwidget_->Paint(canvas_.get(), rect);
+ set_painting(false);
+}
+
+// -----------------------------------------------------------------------------
+// This is called when the GTK window is destroyed. In the Windows code this
+// deletes this object. Since it's only test_shell it probably doesn't matter
+// that much.
+// -----------------------------------------------------------------------------
+void WebWidgetHost::WindowDestroyed() {
+ delete this;
}
« no previous file with comments | « webkit/tools/test_shell/gtk/webview_host.cc ('k') | webkit/tools/test_shell/webwidget_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698