Index: webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc |
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc b/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc |
index ebd76192d1d804a8e0c916df9c7a11b8adeb81f3..e7d6ff5624e8c96996554dac5b4b22275474e19e 100644 |
--- a/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc |
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc |
@@ -19,6 +19,7 @@ |
#include "skia/ext/platform_canvas.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
+#include "ui/base/gtk/gtk_compat.h" |
#include "ui/gfx/blit.h" |
#include "webkit/plugins/npapi/gtk_plugin_container.h" |
#include "webkit/plugins/npapi/plugin_constants_win.h" |
@@ -242,7 +243,7 @@ void WebPluginDelegateImpl::WindowlessUpdateGeometry( |
void WebPluginDelegateImpl::EnsurePixmapAtLeastSize(int width, int height) { |
if (pixmap_) { |
gint cur_width, cur_height; |
- gdk_drawable_get_size(pixmap_, &cur_width, &cur_height); |
+ gdk_pixmap_get_size(pixmap_, &cur_width, &cur_height); |
if (cur_width >= width && cur_height >= height) |
return; // We are already the appropriate size. |
@@ -256,9 +257,10 @@ void WebPluginDelegateImpl::EnsurePixmapAtLeastSize(int width, int height) { |
pixmap_ = gdk_pixmap_new(NULL, // use width/height/depth params |
std::max(1, width), std::max(1, height), |
sys_visual->depth); |
+ // TODO(erg): Replace this with GdkVisual when we move to GTK3. |
GdkColormap* colormap = gdk_colormap_new(gdk_visual_get_system(), |
FALSE); |
- gdk_drawable_set_colormap(GDK_DRAWABLE(pixmap_), colormap); |
+ gdk_drawable_set_colormap(pixmap_, colormap); |
// The GdkDrawable now owns the GdkColormap. |
g_object_unref(colormap); |
} |