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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit a5872413c26858644c257e4b3e7e6f92eedd30c9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun May 11 06:20:03 2003 +0000

    	Fix the misrendering at the top of cnn.com (the extra tearing
    	by the Google logo on the front page of cnn).
    
    	I am reducing the intrinsic margins of text fields down to 2px
    	to match buttons and selects.
    
    	This is easily sufficient distance to avoid focus ring overlap and
    	still looks nice, e.g., on www.google.com and amazon.com.
    
            Reviewed by mjs
    
            * khtml/rendering/render_form.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4346 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 27a4150..1fddb4d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,20 @@
 2003-05-10  David Hyatt  <hyatt at apple.com>
 
+	Fix the misrendering at the top of cnn.com (the extra tearing
+	by the Google logo on the front page of cnn).  
+
+	I am reducing the intrinsic margins of text fields down to 2px 
+	to match buttons and selects.
+
+	This is easily sufficient distance to avoid focus ring overlap and
+	still looks nice, e.g., on www.google.com and amazon.com.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_form.h:
+
+2003-05-10  David Hyatt  <hyatt at apple.com>
+
 	A refinement of our intrinsic margin rules for form controls.
 	Rather than always applying the intrinsic margin to form controls,
 	this patch makes the application conditional.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 27a4150..1fddb4d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,20 @@
 2003-05-10  David Hyatt  <hyatt at apple.com>
 
+	Fix the misrendering at the top of cnn.com (the extra tearing
+	by the Google logo on the front page of cnn).  
+
+	I am reducing the intrinsic margins of text fields down to 2px 
+	to match buttons and selects.
+
+	This is easily sufficient distance to avoid focus ring overlap and
+	still looks nice, e.g., on www.google.com and amazon.com.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_form.h:
+
+2003-05-10  David Hyatt  <hyatt at apple.com>
+
 	A refinement of our intrinsic margin rules for form controls.
 	Rather than always applying the intrinsic margin to form controls,
 	this patch makes the application conditional.
diff --git a/WebCore/khtml/rendering/render_form.h b/WebCore/khtml/rendering/render_form.h
index 809b0da..570ec7f 100644
--- a/WebCore/khtml/rendering/render_form.h
+++ b/WebCore/khtml/rendering/render_form.h
@@ -91,7 +91,7 @@ public:
     // and honor that value.  
     void addIntrinsicMarginsIfAllowed(RenderStyle* _style);
     virtual bool canHaveIntrinsicMargins() const { return false; }
-    virtual int intrinsicMargin() const { return 2; }
+    int intrinsicMargin() const { return 2; }
 
     virtual void setStyle(RenderStyle* _style);
 #endif
@@ -243,7 +243,6 @@ public:
 #if APPLE_CHANGES
     int calcReplacedHeight() const { return intrinsicHeight(); }
     virtual bool canHaveIntrinsicMargins() const { return true; }
-    virtual int intrinsicMargin() const { return 3; }
 #endif
 
     virtual const char *renderName() const { return "RenderLineEdit"; }
@@ -444,7 +443,6 @@ public:
 
 #if APPLE_CHANGES
     virtual bool canHaveIntrinsicMargins() const { return true; }
-    virtual int intrinsicMargin() const { return 3; }
 #endif
 
 protected slots:

-- 
WebKit Debian packaging