Changeset 82526 in webkit

Timestamp:

Mar 30, 2011 6:06:24 PM (13 years ago)

Author:

Martin Robinson

Message:

2011-03-30 Martin Robinson <​mrobinson@igalia.com>

Fix the GTK+ WebKit2 build.

• Shared/WebGraphicsContext.cpp: (WebKit::WebGraphicsContext::WebGraphicsContext):
• WebProcess/WebPage/gtk/WebPageGtk.cpp: (WebKit::WebPage::platformCanHandleRequest):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebGraphicsContext.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-30  Martin Robinson  <mrobinson@igalia.com>
+
+        Fix the GTK+ WebKit2 build.
+
+        * Shared/WebGraphicsContext.cpp:
+        (WebKit::WebGraphicsContext::WebGraphicsContext):
+        * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+        (WebKit::WebPage::platformCanHandleRequest):
+
+2011-03-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Build failed with ‘GDK_KEY_KP_Space’ was not declared in this scope
+        https://bugs.webkit.org/show_bug.cgi?id=55314
+
+        Build fix for older versions of GTK+. Use the deprecated names for GDK key
+        defines and include GtkVersioning.h to allow building on newer versions
+        of GTK+.
+
+        * Shared/gtk/WebEventFactory.cpp:
+        (WebKit::isGdkKeyCodeFromKeyPad): Update key defines.
+
 2011-03-30  Steve Falkenburg  <sfalken@apple.com>
 

trunk/Source/WebKit2/Shared/WebGraphicsContext.cpp

@@ -27 +27 @@
 #include "WebGraphicsContext.h"
 
+#if PLATFORM(GTK)
+#include <WebCore/PlatformContextCairo.h>
+#endif
+
 using namespace WebCore;
 
@@ -35 +39 @@
     : m_platformContext(graphicsContext->platformContext())
 #elif PLATFORM(GTK)
-    : m_platformContext(graphicsContext->platformContext())
+    : m_platformContext(graphicsContext->platformContext()->cr())
 #endif
 {