[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[rniwa at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 107a43b13c851fca188d3fc08c11f49e34c2e301
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 02:40:36 2010 +0000

    2010-12-21  Ryosuke Niwa  <rniwa at webkit.org>
    
            Unreviewed build fix for r74447.
    
            Call usesDashboardBackwardCompatibilityMode() only if DASHBOARD_SUPPORT is enabled.
    
            * html/HTMLImageLoader.cpp:
            (WebCore::HTMLImageLoader::sourceURI):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74448 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d1e72a0..6a0de84 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-21  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Unreviewed build fix for r74447.
+
+        Call usesDashboardBackwardCompatibilityMode() only if DASHBOARD_SUPPORT is enabled.
+
+        * html/HTMLImageLoader.cpp:
+        (WebCore::HTMLImageLoader::sourceURI):
+
 2010-12-21  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebCore/html/HTMLImageLoader.cpp b/WebCore/html/HTMLImageLoader.cpp
index 90f3ca4..f2c68ee 100644
--- a/WebCore/html/HTMLImageLoader.cpp
+++ b/WebCore/html/HTMLImageLoader.cpp
@@ -56,8 +56,12 @@ void HTMLImageLoader::dispatchLoadEvent()
 
 String HTMLImageLoader::sourceURI(const AtomicString& attr) const
 {
+#if ENABLE(DASHBOARD_SUPPORT)
     Settings* settings = element()->document()->settings();
-    if (!settings || !settings->usesDashboardBackwardCompatibilityMode() || attr.length() < 7 || !attr.startsWith("url(\"") || !attr.endsWith("\")"))
+    if (!settings || !settings->usesDashboardBackwardCompatibilityMode())
+        return stripLeadingAndTrailingHTMLSpaces(attr);
+#endif
+    if (attr.length() < 7 || !attr.startsWith("url(\"") || !attr.endsWith("\")"))
         return stripLeadingAndTrailingHTMLSpaces(attr);
 
     return attr.string().substring(5, attr.length() - 7);

-- 
WebKit Debian packaging