[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 2b1e67a32bab26bc6a2d288cfc687ded6d81930f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 4 18:34:00 2003 +0000

            Reviewed by Dave.
    
    	- fixed 3125850 -- VIP: "search by goo" instead of "search by google" at livepage.apple.com
    
            We decided not to fix the general problem right now, but just hack the site.
    
            * khtml/html/html_formimpl.cpp: (HTMLSelectElementImpl::parseAttribute):
            Just ignore the style set by livepage.apple.com, so we get a too-big
            "Search by Google" rather than a cut off "Search by Goo".
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4027 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 387e63a..d26318c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-04-04  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3125850 -- VIP: "search by goo" instead of "search by google" at livepage.apple.com
+        
+        We decided not to fix the general problem right now, but just hack the site.
+
+        * khtml/html/html_formimpl.cpp: (HTMLSelectElementImpl::parseAttribute):
+        Just ignore the style set by livepage.apple.com, so we get a too-big
+        "Search by Google" rather than a cut off "Search by Goo".
+
 2003-04-04  David Hyatt  <hyatt at apple.com>
 
 	Fix for the Search button cutoff on livepage.apple.com  We
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 387e63a..d26318c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-04-04  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3125850 -- VIP: "search by goo" instead of "search by google" at livepage.apple.com
+        
+        We decided not to fix the general problem right now, but just hack the site.
+
+        * khtml/html/html_formimpl.cpp: (HTMLSelectElementImpl::parseAttribute):
+        Just ignore the style set by livepage.apple.com, so we get a too-big
+        "Search by Google" rather than a cut off "Search by Goo".
+
 2003-04-04  David Hyatt  <hyatt at apple.com>
 
 	Fix for the Search button cutoff on livepage.apple.com  We
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index a227622..1aa5be9 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -1992,6 +1992,18 @@ void HTMLSelectElementImpl::parseAttribute(AttributeImpl *attr)
         setHTMLEventListener(EventImpl::CHANGE_EVENT,
             getDocument()->createHTMLEventListener(attr->value().string()));
         break;
+#if APPLE_CHANGES
+    case ATTR_STYLE:
+        // Super-hack for livepage.apple.com.
+        // Ignore this particular style string altogether on select elements.
+        // Even though this is for only one site, no need to check the URL because:
+        //    1) we'd never get a better result by respecting this particular style
+        //    2) due to the misspelling it's unlikely to show up anywhere else
+        if (attr->value().string() != "width:110px;font-family:arial,helevitca,sans-serif; font-size:10px;") {
+            HTMLGenericFormElementImpl::parseAttribute(attr);
+        }
+        break;
+#endif
     default:
         HTMLGenericFormElementImpl::parseAttribute(attr);
     }
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 0425601..2e852c9 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -924,7 +924,9 @@ void DocumentImpl::recalcStyle( StyleChange change )
                 fontDef.family.setFamily(stdfont);
                 fontDef.family.appendFamily(0);
             }
-            fontDef.size = m_styleSelector->fontSizes()[3];
+            if (m_styleSelector) {
+                fontDef.size = m_styleSelector->fontSizes()[3];
+            }
         }
 
         //kdDebug() << "DocumentImpl::attach: setting to charset " << settings->charset() << endl;
@@ -1090,6 +1092,9 @@ Tokenizer *DocumentImpl::createTokenizer()
 
 void DocumentImpl::setPaintDevice( QPaintDevice *dev )
 {
+    if (m_paintDevice == dev) {
+        return;
+    }
     m_paintDevice = dev;
     delete m_paintDeviceMetrics;
     m_paintDeviceMetrics = new QPaintDeviceMetrics( dev );

-- 
WebKit Debian packaging