commit b4737d9156164330e6b939d285e41f06a9ce672c
author weinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Sep 11 04:09:12 2010 +0000
committer weinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Sep 11 04:09:12 2010 +0000
tree 62acbdc0c0425b6cd6e69bf42b9e7ba733565de7
parent e680913e80b8df6e81627d6fcf34ccff8508d81e

Fix GTK build.

* webkit/webkitwebview.cpp:
(webkit_web_view_set_full_content_zoom):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/gtk/ChangeLog

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 56ce34d..014f1ed 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,5 +1,12 @@
 2010-09-10  Sam Weinig  <sam@webkit.org>
 
+        Fix GTK build.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_set_full_content_zoom):
+
+2010-09-10  Sam Weinig  <sam@webkit.org>
+
         Reviewed by Darin Adler.
 
         Remove unnecessary constraint in WebCore of choosing either text zoom or full page zoom.

WebKit/gtk/webkit/webkitwebview.cpp

diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index d4125b1..9020064 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -4214,9 +4214,9 @@
 
     priv->zoomFullContent = zoomFullContent;
     if (priv->zoomFullContent)
-        view->setPageAndTextZoomFactors(multiplier, 1);
+        view->setPageAndTextZoomFactors(zoomLevel, 1);
     else
-        view->setPageAndTextZoomFactors(1, multiplier);
+        view->setPageAndTextZoomFactors(1, zoomLevel);
 
     g_object_notify(G_OBJECT(webView), "full-content-zoom");
 }