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

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit db6a1fd09a4082b1cbe5a425808607d1fc525ba7
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 07:16:32 2010 +0000

    Unreviewed correction to unreviewed build fix for r74447.
    
    Inappropriate code was left behind in sourceURI function for non-Dashboard platforms.
    
    * html/HTMLImageLoader.cpp:
    (WebCore::HTMLImageLoader::sourceURI): Change the logic so all the bug-workaround
    logic is inside the #ifdef.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74465 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b5d07e0..dbd3bbf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-21  Darin Adler  <darin at apple.com>
+
+        Unreviewed correction to unreviewed build fix for r74447.
+
+        Inappropriate code was left behind in sourceURI function for non-Dashboard platforms.
+
+        * html/HTMLImageLoader.cpp:
+        (WebCore::HTMLImageLoader::sourceURI): Change the logic so all the bug-workaround
+        logic is inside the #ifdef.
+
 2010-12-21  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/html/HTMLImageLoader.cpp b/WebCore/html/HTMLImageLoader.cpp
index f2c68ee..710c177 100644
--- a/WebCore/html/HTMLImageLoader.cpp
+++ b/WebCore/html/HTMLImageLoader.cpp
@@ -58,13 +58,11 @@ String HTMLImageLoader::sourceURI(const AtomicString& attr) const
 {
 #if ENABLE(DASHBOARD_SUPPORT)
     Settings* settings = element()->document()->settings();
-    if (!settings || !settings->usesDashboardBackwardCompatibilityMode())
-        return stripLeadingAndTrailingHTMLSpaces(attr);
+    if (settings && settings->usesDashboardBackwardCompatibilityMode() && attr.length() > 7 && attr.startsWith("url(\"") && attr.endsWith("\")"))
+        return attr.string().substring(5, attr.length() - 7);
 #endif
-    if (attr.length() < 7 || !attr.startsWith("url(\"") || !attr.endsWith("\")"))
-        return stripLeadingAndTrailingHTMLSpaces(attr);
 
-    return attr.string().substring(5, attr.length() - 7);
+    return stripLeadingAndTrailingHTMLSpaces(attr);
 }
 
 void HTMLImageLoader::notifyFinished(CachedResource*)

-- 
WebKit Debian packaging