[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[zimmermann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 092a83c586fb3cde171ca39a021364b1b25f961c
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 09:26:48 2010 +0000

    2010-08-27  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Nikolas Zimmermann.
    
            r66141 caused fast/forms/select-style.html to fail on mac:
            https://bugs.webkit.org/show_bug.cgi?id=44737
    
            Handle the fact that a CSSImageValue may have a value of CSSValueNone,
            in which case we should not return a pending image.
    
            * css/CSSImageValue.cpp:
            (WebCore::CSSImageValue::cachedOrPendingImage):
            * css/CSSStyleSelector.cpp:
            (WebCore::CSSStyleSelector::cachedOrPendingFromValue):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66195 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1abed79..fdcea42 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-27  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        r66141 caused fast/forms/select-style.html to fail on mac:
+        https://bugs.webkit.org/show_bug.cgi?id=44737
+
+        Handle the fact that a CSSImageValue may have a value of CSSValueNone,
+        in which case we should not return a pending image.
+
+        * css/CSSImageValue.cpp:
+        (WebCore::CSSImageValue::cachedOrPendingImage):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::cachedOrPendingFromValue):
+
 2010-08-27  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/css/CSSImageValue.cpp b/WebCore/css/CSSImageValue.cpp
index 058d0e9..dc2d700 100644
--- a/WebCore/css/CSSImageValue.cpp
+++ b/WebCore/css/CSSImageValue.cpp
@@ -50,6 +50,9 @@ CSSImageValue::~CSSImageValue()
 
 StyleImage* CSSImageValue::cachedOrPendingImage()
 {
+    if (getIdent() == CSSValueNone)
+        return 0;
+
     if (!m_image)
         m_image = StylePendingImage::create(this);
 
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 2abb8eb..26cc9de 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -5774,7 +5774,7 @@ StyleImage* CSSStyleSelector::styleImage(CSSPropertyID property, CSSValue* value
 StyleImage* CSSStyleSelector::cachedOrPendingFromValue(CSSPropertyID property, CSSImageValue* value)
 {
     StyleImage* image = value->cachedOrPendingImage();
-    if (image->isPendingImage())
+    if (image && image->isPendingImage())
         m_pendingImageProperties.add(property);
     return image;
 }

-- 
WebKit Debian packaging