Changeset 94013 in webkit

Timestamp:

Aug 29, 2011, 1:58:31 PM (15 years ago)

Author:

Martin Robinson

Message:

Merging r86116

Location:

releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-08-29  Xan Lopez  <xlopez@igalia.com>
+
+        Unreviewed build fix..
+
+        Fix GTK+3.x build.
+
+        * webkit/webkitwebview.cpp:
+        (getHorizontalAdjustment): the adjustment is in
+        adjustmentWatcher() now.
+        (getVerticalAdjustment): ditto.
+
 2011-08-29  Martin Robinson  <mrobinson@igalia.com>
 

releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -483 +483 @@
     Page* page = core(webView);
     if (page)
-        return static_cast<WebKit::ChromeClient*>(page->chrome()->client())->horizontalAdjustment();
+        return static_cast<WebKit::ChromeClientGtk*>(page->chrome()->client())->adjustmentWatcher()->horizontalAdjustment();
     return 0;
 }
@@ -491 +491 @@
     Page* page = core(webView);
     if (page)
-        return static_cast<WebKit::ChromeClient*>(page->chrome()->client())->verticalAdjustment();
+        return static_cast<WebKit::ChromeClient*>(page->chrome()->client())->adjustmentWatcher()->verticalAdjustment();
     return 0;
 }