[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 6363e160110bf0ff670f50b73e0ae268c2c80f6f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 15 21:44:16 2002 +0000

    	* kwq/WebCoreBridge.mm:
    	(-[WebCoreBridge createKHTMLViewWithNSView:width:height:marginWidth:marginHeight:]):
    	Implement the rule where a negative number means "don't set the margin".
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1375 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3279521..52dd04b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
+	* kwq/WebCoreBridge.mm:
+	(-[WebCoreBridge createKHTMLViewWithNSView:width:height:marginWidth:marginHeight:]):
+	Implement the rule where a negative number means "don't set the margin".
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
 	* kwq/kio/jobclasses.h: Removed import of WebFoundation.h.
 	* kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
 	* kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3279521..52dd04b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,11 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
+	* kwq/WebCoreBridge.mm:
+	(-[WebCoreBridge createKHTMLViewWithNSView:width:height:marginWidth:marginHeight:]):
+	Implement the rule where a negative number means "don't set the margin".
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
 	* kwq/kio/jobclasses.h: Removed import of WebFoundation.h.
 	* kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
 	* kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3279521..52dd04b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,11 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
+	* kwq/WebCoreBridge.mm:
+	(-[WebCoreBridge createKHTMLViewWithNSView:width:height:marginWidth:marginHeight:]):
+	Implement the rule where a negative number means "don't set the margin".
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
 	* kwq/kio/jobclasses.h: Removed import of WebFoundation.h.
 	* kwq/KWQKjobclasses.mm: Added import of IFURLHandle.h.
 	* kwq/KWQKloader.mm: Added import of IFError.h and IFURLHandle.h.
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index d448609..22beb80 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -87,8 +87,10 @@
     part->impl->setView(kview);
 
     kview->setView(view);
-    kview->setMarginWidth(mw);
-    kview->setMarginHeight(mh);
+    if (mw >= 0)
+        kview->setMarginWidth(mw);
+    if (mh >= 0)
+        kview->setMarginHeight(mh);
     kview->resize(width, height);
     
     return kview;

-- 
WebKit Debian packaging