[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 0d3ae4f99c6f2449b720b599f400852c85d29ed1
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 6 18:09:22 2002 +0000

    WebCore:
    
    	WebCore part of fix for 2915396 -- implement larger/smaller font
    	or page zoom functionality
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::setZoomFactor): inside APPLE_CHANGES, remove use of
    	KHTML limits for zoom factor; this is a client responsibility in
    	our model.
    
    WebBrowser:
    
    	WebBrowser part of fix for 2915396 -- implement larger/smaller font
    	or page zoom functionality
    
            * BrowserDocument.h:
            * BrowserDocument.m:
    	Define min/max text multiplier values, and ratio
            (-[BrowserDocument canMakeTextLarger]),
            (-[BrowserDocument canMakeTextSmaller]):
    	New methods, check that there's a page and that the new size
    	wouldn't be too big/small.
    
            (-[BrowserDocument makeTextLarger:]),
            (-[BrowserDocument makeTextSmaller:]):
    	New methods, set web controller's text multiplier.
    
            (-[BrowserDocument validateUserInterfaceItem:]):
    	Disable makeTextLarger and makeTextSmaller when appropriate.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1751 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3a77107..b16b156 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-08-06  John Sullivan  <sullivan at apple.com>
+
+	WebCore part of fix for 2915396 -- implement larger/smaller font
+	or page zoom functionality
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::setZoomFactor): inside APPLE_CHANGES, remove use of
+	KHTML limits for zoom factor; this is a client responsibility in
+	our model.
+
 2002-08-06  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3a77107..b16b156 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-08-06  John Sullivan  <sullivan at apple.com>
+
+	WebCore part of fix for 2915396 -- implement larger/smaller font
+	or page zoom functionality
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::setZoomFactor): inside APPLE_CHANGES, remove use of
+	KHTML limits for zoom factor; this is a client responsibility in
+	our model.
+
 2002-08-06  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3a77107..b16b156 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-08-06  John Sullivan  <sullivan at apple.com>
+
+	WebCore part of fix for 2915396 -- implement larger/smaller font
+	or page zoom functionality
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::setZoomFactor): inside APPLE_CHANGES, remove use of
+	KHTML limits for zoom factor; this is a client responsibility in
+	our model.
+
 2002-08-06  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 71ca9b3..0438856 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3736,8 +3736,11 @@ void KHTMLPart::slotDecZoom()
 
 void KHTMLPart::setZoomFactor (int percent)
 {
+#ifndef APPLE_CHANGES // limits are client's responsibility
   if (percent < minZoom) percent = minZoom;
   if (percent > maxZoom) percent = maxZoom;
+#endif
+  
   if (d->m_zoomFactor == percent) return;
   d->m_zoomFactor = percent;
 

-- 
WebKit Debian packaging