Changeset 21153 for S60/trunk/WebCore

Timestamp:

04/27/07 12:58:34 (21 months ago)

Author:

zbujtas

Message:

2007-04-27 w3liu <wei.liu@nokia.com>

reviewed by Zalan <zbujtas@gmail.com>
DESC: handle codebase in HTMLImageLoader
http://bugs.webkit.org/show_bug.cgi?id=13491

WARNING: NO TEST CASES ADDED OR CHANGED

• khtml/html/html_imageimpl.cpp: (HTMLImageLoader::updateFromElement):

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/html/html_imageimpl.cpp (modified) (1 diff)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+w3liu   <wei.liu@nokia.com>
+reviewed by Zalan <zbujtas@gmail.com>
+ DESC: handle codebase in HTMLImageLoader
+ http://bugs.webkit.org/show_bug.cgi?id=13491
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/html/html_imageimpl.cpp:
+        (HTMLImageLoader::updateFromElement):
+
 rathnasa, reviewed by zbujtas
  DESC: Widget Menu API

S60/trunk/WebCore/khtml/html/html_imageimpl.cpp

@@ -75 +75 @@
         return;
 
-    AtomicString attr;
+    DOMString attr;
     if (element()->id() == ID_OBJECT)
-        attr = element()->getAttribute(ATTR_DATA);
+    {
+        attr = khtml::parseURL(element()->getAttribute(ATTR_DATA));
+#if NOKIA_CHANGES
+        QString attrCodebase = element()->getAttribute(ATTR_CODEBASE).string();
+        if ( attrCodebase.length() )
+        {
+            KURL dataURL(attr.string());
+            if (!dataURL.isValid() )    // if data attr only contains relative URL, check for code base part
+            {
+            if ( !attrCodebase.endsWith(QString("/")) )
+                attrCodebase.append(QString("/"));
+            attr.insert(attrCodebase, 0);
+            }
+        }
+#endif
+    }
     else
-        attr = element()->getAttribute(ATTR_SRC);
+        attr = khtml::parseURL(element()->getAttribute(ATTR_SRC));
     
     // Treat a lack of src or empty string for src as no image at all.
     CachedImage* newImage = 0;
     if (!attr.isEmpty())
-        newImage = element()->getDocument()->docLoader()->requestImage(khtml::parseURL(attr));
+        newImage = element()->getDocument()->docLoader()->requestImage(attr);
 
     if (newImage != m_image) {