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

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0ea2fc1a37f0edcccab2bcadac769351763ddf49
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 7 03:30:25 2010 +0000

    2010-08-06  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Ojan Vafai.
    
            dump-as-markup should work in Firefox
            https://bugs.webkit.org/show_bug.cgi?id=43606
    
            Apparently Firefox lacks this API.
    
            * resources/dump-as-markup.js:
            (Markup._getMarkupForTextNode):
            (Markup._getSelectionMarker):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64892 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index be79eab..9dd37d3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-06  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Ojan Vafai.
+
+        dump-as-markup should work in Firefox
+        https://bugs.webkit.org/show_bug.cgi?id=43606
+
+        Apparently Firefox lacks this API.
+
+        * resources/dump-as-markup.js:
+        (Markup._getMarkupForTextNode):
+        (Markup._getSelectionMarker):
+
 2010-08-06  Dimitri Glazkov  <dglazkov at chromium.org>
 
         [Chromium/DRT] One more tweak to the expectation overrides to pacify the bot.
diff --git a/LayoutTests/resources/dump-as-markup.js b/LayoutTests/resources/dump-as-markup.js
index 5676f3a..ded8176 100644
--- a/LayoutTests/resources/dump-as-markup.js
+++ b/LayoutTests/resources/dump-as-markup.js
@@ -260,29 +260,33 @@ Markup._getMarkupForTextNode = function(node)
     var startOffset, endOffset, startText, endText;
 
     var sel = Markup._getSelectionFromNode(node);
-    if (node == sel.anchorNode && node == sel.focusNode) {
-        if (sel.isCollapsed) {
-            startOffset = sel.anchorOffset;
-            startText = Markup._SELECTION_CARET;
-        } else {
-            if (sel.focusOffset > sel.anchorOffset) {
+    // Firefox doesn't have a sel in a display:none iframe.
+    // https://bugs.webkit.org/show_bug.cgi?id=43655
+    if (sel) {
+        if (node == sel.anchorNode && node == sel.focusNode) {
+            if (sel.isCollapsed) {
                 startOffset = sel.anchorOffset;
-                endOffset = sel.focusOffset;
-                startText = Markup._SELECTION_ANCHOR;
-                endText = Markup._SELECTION_FOCUS;
+                startText = Markup._SELECTION_CARET;
             } else {
-                startOffset = sel.focusOffset;
-                endOffset = sel.anchorOffset;
-                startText = Markup._SELECTION_FOCUS;
-                endText = Markup._SELECTION_ANCHOR;
+                if (sel.focusOffset > sel.anchorOffset) {
+                    startOffset = sel.anchorOffset;
+                    endOffset = sel.focusOffset;
+                    startText = Markup._SELECTION_ANCHOR;
+                    endText = Markup._SELECTION_FOCUS;
+                } else {
+                    startOffset = sel.focusOffset;
+                    endOffset = sel.anchorOffset;
+                    startText = Markup._SELECTION_FOCUS;
+                    endText = Markup._SELECTION_ANCHOR;
+                }
             }
+        } else if (node == sel.focusNode) {
+            startOffset = sel.focusOffset;
+            startText = Markup._SELECTION_FOCUS;
+        } else if (node == sel.anchorNode) {
+            startOffset = sel.anchorOffset;
+            startText = Markup._SELECTION_ANCHOR;
         }
-    } else if (node == sel.focusNode) {
-        startOffset = sel.focusOffset;
-        startText = Markup._SELECTION_FOCUS;
-    } else if (node == sel.anchorNode) {
-        startOffset = sel.anchorOffset;
-        startText = Markup._SELECTION_ANCHOR;
     }
     
     if (startText && endText)
@@ -299,6 +303,12 @@ Markup._getSelectionMarker = function(node, index)
         return '';
 
     var sel = Markup._getSelectionFromNode(node);;
+
+    // Firefox doesn't have a sel in a display:none iframe.
+    // https://bugs.webkit.org/show_bug.cgi?id=43655
+    if (!sel)
+        return '';
+
     if (index == sel.anchorOffset && node == sel.anchorNode) {
         if (sel.isCollapsed)
             return Markup._SELECTION_CARET;

-- 
WebKit Debian packaging