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

atwilson at chromium.org atwilson at chromium.org
Wed Dec 22 11:39:15 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 718a03b992e1171ff3e74f5ba18230783a8ea337
Author: atwilson at chromium.org <atwilson at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 2 21:58:59 2010 +0000

    Unreviewed test expectations fixups for chromium.
    
    * platform/chromium-linux/editing/pasteboard/select-element-1-expected.txt:
    * platform/chromium-mac/fast/dom/navigator-detached-no-crash-expected.txt: Removed.
    * platform/chromium-win/editing/pasteboard/input-field-1-expected.txt:
    * platform/chromium-win/editing/pasteboard/merge-end-1-expected.txt:
    * platform/chromium-win/editing/pasteboard/merge-end-2-expected.txt:
    * platform/chromium-win/editing/pasteboard/select-element-1-expected.txt:
    * platform/chromium-win/fast/dom/navigator-detached-no-crash-expected.txt: Removed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64497 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ea07014..3ca550e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-02  Andrew Wilson  <atwilson at chromium.org>
+
+        Unreviewed test expectations fixups for chromium.
+
+        * platform/chromium-linux/editing/pasteboard/select-element-1-expected.txt:
+        * platform/chromium-mac/fast/dom/navigator-detached-no-crash-expected.txt: Removed.
+        * platform/chromium-win/editing/pasteboard/input-field-1-expected.txt:
+        * platform/chromium-win/editing/pasteboard/merge-end-1-expected.txt:
+        * platform/chromium-win/editing/pasteboard/merge-end-2-expected.txt:
+        * platform/chromium-win/editing/pasteboard/select-element-1-expected.txt:
+        * platform/chromium-win/fast/dom/navigator-detached-no-crash-expected.txt: Removed.
+
 2010-08-02  Ojan Vafai  <ojan at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/chromium-linux/editing/pasteboard/select-element-1-expected.txt b/LayoutTests/platform/chromium-linux/editing/pasteboard/select-element-1-expected.txt
index d02db54..f8056e4 100644
--- a/LayoutTests/platform/chromium-linux/editing/pasteboard/select-element-1-expected.txt
+++ b/LayoutTests/platform/chromium-linux/editing/pasteboard/select-element-1-expected.txt
@@ -1,8 +1,9 @@
 EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
 EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document toDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: shouldDeleteDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
diff --git a/LayoutTests/platform/chromium-mac/fast/dom/navigator-detached-no-crash-expected.txt b/LayoutTests/platform/chromium-mac/fast/dom/navigator-detached-no-crash-expected.txt
deleted file mode 100644
index 3d0bca7..0000000
--- a/LayoutTests/platform/chromium-mac/fast/dom/navigator-detached-no-crash-expected.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-This tests that the navigator object of a deleted frame is disconnected properly. Accessing fields or methods shouldn't crash the browser. 
- Check Navigator
-navigator.appCodeName is OK
-navigator.appName is OK
-navigator.appVersion is OK
-navigator.cookieEnabled is OK
-navigator.getStorageUpdates() is OK
-navigator.javaEnabled() is OK
-navigator.language is OK
-navigator.mimeTypes is OK
-navigator.onLine is OK
-navigator.platform is OK
-navigator.plugins is OK
-navigator.product is OK
-navigator.productSub is OK
-navigator.userAgent is OK
-navigator.vendor is OK
-navigator.vendorSub is OK
-navigator.appCodeName is OK
-navigator.appName is OK
-navigator.appVersion is OK
-navigator.cookieEnabled is OK
-navigator.getStorageUpdates() is OK
-navigator.javaEnabled() is OK
-navigator.language is OK
-navigator.mimeTypes is OK
-navigator.onLine is OK
-navigator.platform is OK
-navigator.plugins is OK
-navigator.product is OK
-navigator.productSub is OK
-navigator.userAgent is OK
-navigator.vendor is OK
-navigator.vendorSub is OK
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/input-field-1-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/input-field-1-expected.txt
index 3342e4d..65bd8bf 100644
--- a/LayoutTests/platform/chromium-win/editing/pasteboard/input-field-1-expected.txt
+++ b/LayoutTests/platform/chromium-win/editing/pasteboard/input-field-1-expected.txt
@@ -1,31 +1,32 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 1 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document toDOMRange:range from 2 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 224x19
-          text run at (0,0) width 224: "This tests Copy/Paste of a input field."
-      RenderBlock {DIV} at (0,36) size 784x26
-        RenderTextControl {INPUT} at (2,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderTextControl {INPUT} at (161,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-      RenderBlock {UL} at (0,78) size 784x20
-        RenderListItem {LI} at (40,0) size 744x20
-          RenderListMarker at (-18,0) size 7x19: bullet
-          RenderText {#text} at (0,0) size 43x19
-            text run at (0,0) width 43: "Passed"
-layer at (12,49) size 151x16
-  RenderBlock {DIV} at (2,3) size 151x16
-layer at (171,49) size 151x16
-  RenderBlock {DIV} at (2,3) size 151x16
-caret: position 1 of child 1 {INPUT} of child 2 {DIV} of body
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 1 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document toDOMRange:range from 2 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 224x19
+          text run at (0,0) width 224: "This tests Copy/Paste of a input field."
+      RenderBlock {DIV} at (0,36) size 784x26
+        RenderTextControl {INPUT} at (2,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderTextControl {INPUT} at (161,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+      RenderBlock {UL} at (0,78) size 784x20
+        RenderListItem {LI} at (40,0) size 744x20
+          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderText {#text} at (0,0) size 43x19
+            text run at (0,0) width 43: "Passed"
+layer at (12,49) size 151x16
+  RenderBlock {DIV} at (2,3) size 151x16
+layer at (171,49) size 151x16
+  RenderBlock {DIV} at (2,3) size 151x16
+caret: position 1 of child 1 {INPUT} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/merge-end-1-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/merge-end-1-expected.txt
index 69a78e7..c379bc1 100644
--- a/LayoutTests/platform/chromium-win/editing/pasteboard/merge-end-1-expected.txt
+++ b/LayoutTests/platform/chromium-win/editing/pasteboard/merge-end-1-expected.txt
@@ -1,34 +1,33 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 781x39
-          text run at (0,0) width 781: "This tests one of the cases where it is necessary for paste to merge the last paragraph in the fragment being pasted with the content"
-          text run at (0,20) width 265: "after the position where the paste will occur."
-      RenderBlock {DIV} at (0,56) size 784x60
-        RenderBlock (anonymous) at (0,0) size 784x20
-          RenderInline {SPAN} at (0,0) size 4x19
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: "f"
-        RenderBlock (anonymous) at (0,20) size 784x0
-        RenderBlock (anonymous) at (0,20) size 784x40
-          RenderInline {SPAN} at (0,0) size 37x39
-            RenderText {#text} at (0,0) size 20x19
-              text run at (0,0) width 20: "bar"
-            RenderBR {BR} at (20,15) size 0x0
-            RenderText {#text} at (0,20) size 21x19
-              text run at (0,20) width 21: "baz"
-            RenderText {#text} at (21,20) size 16x19
-              text run at (21,20) width 16: "oo"
-caret: position 3 of child 3 {#text} of child 0 {SPAN} of child 2 {DIV} of body
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 781x39
+          text run at (0,0) width 781: "This tests one of the cases where it is necessary for paste to merge the last paragraph in the fragment being pasted with the content"
+          text run at (0,20) width 265: "after the position where the paste will occur."
+      RenderBlock {DIV} at (0,56) size 784x60
+        RenderBlock (anonymous) at (0,0) size 784x20
+          RenderInline {SPAN} at (0,0) size 4x19
+            RenderText {#text} at (0,0) size 4x19
+              text run at (0,0) width 4: "f"
+        RenderBlock (anonymous) at (0,20) size 784x0
+        RenderBlock (anonymous) at (0,20) size 784x40
+          RenderInline {SPAN} at (0,0) size 37x39
+            RenderText {#text} at (0,0) size 20x19
+              text run at (0,0) width 20: "bar"
+            RenderBR {BR} at (20,15) size 0x0
+            RenderText {#text} at (0,20) size 21x19
+              text run at (0,20) width 21: "baz"
+            RenderText {#text} at (21,20) size 16x19
+              text run at (21,20) width 16: "oo"
+caret: position 3 of child 3 {#text} of child 0 {SPAN} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/merge-end-2-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/merge-end-2-expected.txt
index f6a73fd..864cc57 100644
--- a/LayoutTests/platform/chromium-win/editing/pasteboard/merge-end-2-expected.txt
+++ b/LayoutTests/platform/chromium-win/editing/pasteboard/merge-end-2-expected.txt
@@ -1,36 +1,35 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 781x39
-          text run at (0,0) width 781: "This tests one of the cases where it is necessary for paste to merge the last paragraph in the fragment being pasted with the content"
-          text run at (0,20) width 265: "after the position where the paste will occur."
-      RenderBlock {DIV} at (0,56) size 784x60
-        RenderBlock (anonymous) at (0,0) size 784x20
-          RenderInline {SPAN} at (0,0) size 4x19
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: "f"
-        RenderBlock (anonymous) at (0,20) size 784x0
-        RenderBlock (anonymous) at (0,20) size 784x40
-          RenderInline {SPAN} at (0,0) size 37x39
-            RenderText {#text} at (0,0) size 20x19
-              text run at (0,0) width 20: "bar"
-            RenderBR {BR} at (20,15) size 0x0
-            RenderText {#text} at (0,20) size 21x19
-              text run at (0,20) width 21: "baz"
-            RenderText {#text} at (21,20) size 16x19
-              text run at (21,20) width 16: "oo"
-          RenderText {#text} at (37,20) size 20x19
-            text run at (37,20) width 20: "bar"
-caret: position 3 of child 3 {#text} of child 0 {SPAN} of child 2 {DIV} of body
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 781x39
+          text run at (0,0) width 781: "This tests one of the cases where it is necessary for paste to merge the last paragraph in the fragment being pasted with the content"
+          text run at (0,20) width 265: "after the position where the paste will occur."
+      RenderBlock {DIV} at (0,56) size 784x60
+        RenderBlock (anonymous) at (0,0) size 784x20
+          RenderInline {SPAN} at (0,0) size 4x19
+            RenderText {#text} at (0,0) size 4x19
+              text run at (0,0) width 4: "f"
+        RenderBlock (anonymous) at (0,20) size 784x0
+        RenderBlock (anonymous) at (0,20) size 784x40
+          RenderInline {SPAN} at (0,0) size 37x39
+            RenderText {#text} at (0,0) size 20x19
+              text run at (0,0) width 20: "bar"
+            RenderBR {BR} at (20,15) size 0x0
+            RenderText {#text} at (0,20) size 21x19
+              text run at (0,20) width 21: "baz"
+            RenderText {#text} at (21,20) size 16x19
+              text run at (21,20) width 16: "oo"
+          RenderText {#text} at (37,20) size 20x19
+            text run at (37,20) width 20: "bar"
+caret: position 3 of child 3 {#text} of child 0 {SPAN} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/select-element-1-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/select-element-1-expected.txt
index 65ce02b..f34c124 100644
--- a/LayoutTests/platform/chromium-win/editing/pasteboard/select-element-1-expected.txt
+++ b/LayoutTests/platform/chromium-win/editing/pasteboard/select-element-1-expected.txt
@@ -1,8 +1,9 @@
 EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
 EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document toDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: shouldDeleteDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
diff --git a/LayoutTests/platform/chromium-win/fast/dom/navigator-detached-no-crash-expected.txt b/LayoutTests/platform/chromium-win/fast/dom/navigator-detached-no-crash-expected.txt
deleted file mode 100644
index 3d0bca7..0000000
--- a/LayoutTests/platform/chromium-win/fast/dom/navigator-detached-no-crash-expected.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-This tests that the navigator object of a deleted frame is disconnected properly. Accessing fields or methods shouldn't crash the browser. 
- Check Navigator
-navigator.appCodeName is OK
-navigator.appName is OK
-navigator.appVersion is OK
-navigator.cookieEnabled is OK
-navigator.getStorageUpdates() is OK
-navigator.javaEnabled() is OK
-navigator.language is OK
-navigator.mimeTypes is OK
-navigator.onLine is OK
-navigator.platform is OK
-navigator.plugins is OK
-navigator.product is OK
-navigator.productSub is OK
-navigator.userAgent is OK
-navigator.vendor is OK
-navigator.vendorSub is OK
-navigator.appCodeName is OK
-navigator.appName is OK
-navigator.appVersion is OK
-navigator.cookieEnabled is OK
-navigator.getStorageUpdates() is OK
-navigator.javaEnabled() is OK
-navigator.language is OK
-navigator.mimeTypes is OK
-navigator.onLine is OK
-navigator.platform is OK
-navigator.plugins is OK
-navigator.product is OK
-navigator.productSub is OK
-navigator.userAgent is OK
-navigator.vendor is OK
-navigator.vendorSub is OK
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 326367f..50a5cd2 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3130,3 +3130,8 @@ BUG50832 : printing/stretch-to-view-height.html = TEXT
 
 // New test added in r64470 fails in Chromium Linux.
 BUG50969 LINUX : fast/events/keydown-numpad-keys.html = TEXT
+
+BUGATWILSON REBASELINE MAC : editing/pasteboard/input-field-1.html = TEXT
+BUGATWILSON REBASELINE MAC : editing/pasteboard/merge-end-1.html = TEXT
+BUGATWILSON REBASELINE MAC : editing/pasteboard/merge-end-2.html = TEXT
+BUGATWILSON REBASELINE MAC : editing/pasteboard/select-element-1.html = TEXT

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list