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

[darin]

The following commit has been merged in the debian/unstable branch:
commit af1259cbbd11331e6c0bf6a2173f3d2d89c2e945
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 15 21:44:36 2002 +0000

    	* WebView.subproj/IFHTMLView.mm:
    	(-[IFHTMLView provisionalDataSourceChanged:]): Don't turn negative numbers into
    	0 for margins. This was a mistake.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1376 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 12b00da..dea5013 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
+	* WebView.subproj/IFHTMLView.mm:
+	(-[IFHTMLView provisionalDataSourceChanged:]): Don't turn negative numbers into
+	0 for margins. This was a mistake.
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
 	- fixed 2942808 -- remove all calls to WebKit from WebCore
 
 	Update to use the WebCore bridge for more things, reducing
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 12b00da..dea5013 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
+	* WebView.subproj/IFHTMLView.mm:
+	(-[IFHTMLView provisionalDataSourceChanged:]): Don't turn negative numbers into
+	0 for margins. This was a mistake.
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
 	- fixed 2942808 -- remove all calls to WebKit from WebCore
 
 	Update to use the WebCore bridge for more things, reducing
diff --git a/WebKit/WebView.subproj/IFHTMLView.mm b/WebKit/WebView.subproj/IFHTMLView.mm
index f9c17a2..a5ec75b 100644
--- a/WebKit/WebView.subproj/IFHTMLView.mm
+++ b/WebKit/WebView.subproj/IFHTMLView.mm
@@ -101,16 +101,10 @@
     
     NSRect r = [self frame];
     
-    int mw = [[[dataSource webFrame] webView] _marginWidth];
-    if (mw < 0)
-        mw = 0;
-    int mh = [[[dataSource webFrame] webView] _marginHeight];
-    if (mh < 0)
-        mh = 0;
-
     _private->provisionalWidget = [bridge createKHTMLViewWithNSView:provisionalView
         width:(int)r.size.width height:(int)r.size.height
-        marginWidth:mw marginHeight:mh];
+        marginWidth:[[[dataSource webFrame] webView] _marginWidth]
+        marginHeight:[[[dataSource webFrame] webView] _marginHeight]];
     
     [provisionalView release];
 }
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index f9c17a2..a5ec75b 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -101,16 +101,10 @@
     
     NSRect r = [self frame];
     
-    int mw = [[[dataSource webFrame] webView] _marginWidth];
-    if (mw < 0)
-        mw = 0;
-    int mh = [[[dataSource webFrame] webView] _marginHeight];
-    if (mh < 0)
-        mh = 0;
-
     _private->provisionalWidget = [bridge createKHTMLViewWithNSView:provisionalView
         width:(int)r.size.width height:(int)r.size.height
-        marginWidth:mw marginHeight:mh];
+        marginWidth:[[[dataSource webFrame] webView] _marginWidth]
+        marginHeight:[[[dataSource webFrame] webView] _marginHeight]];
     
     [provisionalView release];
 }

-- 
WebKit Debian packaging