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

Wed Dec 22 12:40:28 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 74779136e722328e4ded2e366cadf81361dbc978
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 00:04:52 2010 +0000

    Fix tests that rely on incorrect implementation of HTMLBaseElement
    to work even if it's implemented as described in HTML5.
    
    Reviewed by Sam Weinig.
    
    * fast/url/resources/utilities.js:
    (setBaseURL): Remove existing base elements as well as adding a new
    base element.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66153 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 531b68e..41cd1c9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-26  Darin Adler  <darin at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix tests that rely on incorrect implementation of HTMLBaseElement
+        to work even if it's implemented as described in HTML5.
+
+        * fast/url/resources/utilities.js:
+        (setBaseURL): Remove existing base elements as well as adding a new
+        base element.
+
 2010-08-26  Dumitru Daniliuc  <dumi at chromium.org>
 
         Unreviewed, updating Chromium expectations.
diff --git a/LayoutTests/fast/url/resources/utilities.js b/LayoutTests/fast/url/resources/utilities.js
index 6392198..631bdec 100644
--- a/LayoutTests/fast/url/resources/utilities.js
+++ b/LayoutTests/fast/url/resources/utilities.js
@@ -12,10 +12,18 @@ function canonicalize(url)
 
 function setBaseURL(url)
 {
-  // According to the HTML5 spec, we're only supposed to honor <base> elements
-  // in the <head>, but we use document.write() here to make the test run in
-  // Firefox.
-  document.write('<base href="' + url + '">');
+    // It would be more elegant to use the DOM here, but we chose document.write()
+    // so the tests ran correctly in Firefox at the time we originally wrote them.
+
+    // Remove any existing base elements.
+    var existingBase = document.getElementsByTagName('base');
+    while (existingBase.length) {
+        var element = existingBase[0];
+        element.parentNode.removeChild(element);
+    }
+
+    // Add a new base element.
+    document.write('<base href="' + url + '">');
 }
 
 function segments(url)

-- 
WebKit Debian packaging

