[webkit-changes] [94013] releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk

[mrobinson]

Title: [94013] releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk

Revision

94013

Author

mrobin...@webkit.org

Date

2011-08-29 13:58:31 -0700 (Mon, 29 Aug 2011)

Log Message

Merging r86116

Modified Paths

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

Diff

Modified: releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/ChangeLog (94012 => 94013)

--- releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/ChangeLog	2011-08-29 20:56:57 UTC (rev 94012)
+++ releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/ChangeLog	2011-08-29 20:58:31 UTC (rev 94013)
@@ -1,3 +1,14 @@
+2011-08-29  Xan Lopez  <xlo...@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  <mrobin...@igalia.com>
 
         Reviewed by Gustavo Noronha Silva.

Modified: releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/webkit/webkitwebview.cpp (94012 => 94013)

--- releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/webkit/webkitwebview.cpp	2011-08-29 20:56:57 UTC (rev 94012)
+++ releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/webkit/webkitwebview.cpp	2011-08-29 20:58:31 UTC (rev 94013)
@@ -482,7 +482,7 @@
 {
     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;
 }
 
@@ -490,7 +490,7 @@
 {
     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;
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes