[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ojan at chromium.org
ojan at chromium.org
Wed Dec 22 11:39:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 366cea29f60aa8a5d9c253e352378d3531cf234b
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 2 22:22:16 2010 +0000
2010-08-02 Ojan Vafai <ojan at chromium.org>
platform specific expectations after r64488
https://bugs.webkit.org/show_bug.cgi?id=43384
Followup updates after r64488 for tests that had platform-specific expecations.
* platform/chromium-linux/editing/pasteboard/select-element-1-expected.txt:
* platform/chromium-linux/fast/dom/focus-contenteditable-expected.checksum:
* platform/chromium-linux/fast/dom/focus-contenteditable-expected.png:
* platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.checksum:
* platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.png:
* 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/focus-contenteditable-expected.checksum:
* platform/chromium-win/fast/dom/focus-contenteditable-expected.png:
* platform/chromium-win/fast/dom/focus-contenteditable-expected.txt:
* platform/chromium-win/fast/overflow/overflow-focus-ring-expected.checksum:
* platform/chromium-win/fast/overflow/overflow-focus-ring-expected.png:
* platform/chromium-win/fast/overflow/overflow-focus-ring-expected.txt:
* platform/qt/editing/pasteboard/merge-end-1-expected.txt:
* platform/qt/editing/pasteboard/merge-end-2-expected.txt:
* platform/qt/editing/pasteboard/select-element-1-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64498 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3ca550e..d8fde33 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,29 @@
+2010-08-02 Ojan Vafai <ojan at chromium.org>
+
+ platform specific expectations after r64488
+ https://bugs.webkit.org/show_bug.cgi?id=43384
+
+ Followup updates after r64488 for tests that had platform-specific expecations.
+
+ * platform/chromium-linux/editing/pasteboard/select-element-1-expected.txt:
+ * platform/chromium-linux/fast/dom/focus-contenteditable-expected.checksum:
+ * platform/chromium-linux/fast/dom/focus-contenteditable-expected.png:
+ * platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.checksum:
+ * platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.png:
+ * 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/focus-contenteditable-expected.checksum:
+ * platform/chromium-win/fast/dom/focus-contenteditable-expected.png:
+ * platform/chromium-win/fast/dom/focus-contenteditable-expected.txt:
+ * platform/chromium-win/fast/overflow/overflow-focus-ring-expected.checksum:
+ * platform/chromium-win/fast/overflow/overflow-focus-ring-expected.png:
+ * platform/chromium-win/fast/overflow/overflow-focus-ring-expected.txt:
+ * platform/qt/editing/pasteboard/merge-end-1-expected.txt:
+ * platform/qt/editing/pasteboard/merge-end-2-expected.txt:
+ * platform/qt/editing/pasteboard/select-element-1-expected.txt:
+
2010-08-02 Andrew Wilson <atwilson at chromium.org>
Unreviewed test expectations fixups for chromium.
diff --git a/LayoutTests/platform/chromium-linux/fast/dom/focus-contenteditable-expected.checksum b/LayoutTests/platform/chromium-linux/fast/dom/focus-contenteditable-expected.checksum
index 12af6ee..40aa657 100644
--- a/LayoutTests/platform/chromium-linux/fast/dom/focus-contenteditable-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/fast/dom/focus-contenteditable-expected.checksum
@@ -1 +1 @@
-0a1eb8a9add9a69d6a1e2be011c30b04
\ No newline at end of file
+97f949776ce6f5a599e3d1309081d9ec
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/dom/focus-contenteditable-expected.png b/LayoutTests/platform/chromium-linux/fast/dom/focus-contenteditable-expected.png
index 752a8ba..33e98f8 100644
Binary files a/LayoutTests/platform/chromium-linux/fast/dom/focus-contenteditable-expected.png and b/LayoutTests/platform/chromium-linux/fast/dom/focus-contenteditable-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.checksum b/LayoutTests/platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.checksum
index a55233a..f12a8f0 100644
--- a/LayoutTests/platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.checksum
@@ -1 +1 @@
-13582e4313f025d8641a3467a22d23cc
\ No newline at end of file
+3845ebaab558b6ba88c185f951740310
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.png b/LayoutTests/platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.png
index 3fdce49..e685cb6 100644
Binary files a/LayoutTests/platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.png and b/LayoutTests/platform/chromium-linux/fast/overflow/overflow-focus-ring-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.checksum b/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.checksum
index cc9e6bd..06d0dda 100644
--- a/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.checksum
+++ b/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.checksum
@@ -1 +1 @@
-bc52dbdd38aff0d4e9f8d81be1d38018
\ No newline at end of file
+31bb56e3d1f85a6d538694a8177fdecf
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.png b/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.png
index 5d684cc..d57995d 100644
Binary files a/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.png and b/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.txt b/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.txt
index acfa58f..ecb0e72 100644
--- a/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/dom/focus-contenteditable-expected.txt
@@ -1,22 +1,21 @@
-layer at (0,0) size 785x902
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x902
- RenderBlock {HTML} at (0,0) size 785x902
- RenderBody {BODY} at (8,8) size 769x886
- RenderBlock (anonymous) at (0,0) size 769x40
- RenderText {#text} at (0,0) size 472x19
- text run at (0,0) width 472: "This test will try to call focus() on a contenteditable div, and then a normal div. "
- RenderBR {BR} at (0,0) size 0x0
- RenderText {#text} at (0,20) size 353x19
- text run at (0,20) width 353: "The window should scroll to reveal the contenteditable div."
- RenderBlock {DIV} at (0,40) size 500x800
- RenderBlock {DIV} at (0,840) size 769x26 [border: (3px solid #000000)]
- RenderText {#text} at (3,3) size 115x19
- text run at (3,3) width 115: "contentEditable div"
- RenderBlock {DIV} at (0,866) size 769x20
- RenderText {#text} at (0,0) size 77x19
- text run at (0,0) width 77: "Test Passed."
- RenderBlock {DIV} at (0,886) size 769x0
-selection start: position 0 of child 0 {#text} of child 5 {DIV} of body
-selection end: position 19 of child 0 {#text} of child 5 {DIV} of body
-scrolled to 0,282
+layer at (0,0) size 785x902
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x902
+ RenderBlock {HTML} at (0,0) size 785x902
+ RenderBody {BODY} at (8,8) size 769x886
+ RenderBlock (anonymous) at (0,0) size 769x40
+ RenderText {#text} at (0,0) size 472x19
+ text run at (0,0) width 472: "This test will try to call focus() on a contenteditable div, and then a normal div. "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,20) size 353x19
+ text run at (0,20) width 353: "The window should scroll to reveal the contenteditable div."
+ RenderBlock {DIV} at (0,40) size 500x800
+ RenderBlock {DIV} at (0,840) size 769x26 [border: (3px solid #000000)]
+ RenderText {#text} at (3,3) size 115x19
+ text run at (3,3) width 115: "contentEditable div"
+ RenderBlock {DIV} at (0,866) size 769x20
+ RenderText {#text} at (0,0) size 77x19
+ text run at (0,0) width 77: "Test Passed."
+ RenderBlock {DIV} at (0,886) size 769x0
+caret: position 0 of child 0 {#text} of child 5 {DIV} of body
+scrolled to 0,282
diff --git a/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.checksum b/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.checksum
index bc0dd93..1e0df2f 100644
--- a/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.checksum
+++ b/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.checksum
@@ -1 +1 @@
-0a0033323efddad73e90ac40a1480af4
\ No newline at end of file
+a88551d0d0014b0079a6b5e6fb38483f
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.png b/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.png
index fe8c7e0..598e60f 100644
Binary files a/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.png and b/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.txt b/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.txt
index 88a00af..8b0fae0 100644
--- a/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/overflow/overflow-focus-ring-expected.txt
@@ -1,49 +1,48 @@
-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 (anonymous) at (0,0) size 784x20
- RenderText {#text} at (0,0) size 474x19
- text run at (0,0) width 474: "The focus ring of the following div should not extend beyond the size of the div."
-layer at (8,28) size 500x400 scrollWidth 501 scrollHeight 719
- RenderBlock {DIV} at (0,20) size 500x400
- RenderText {#text} at (0,0) size 500x719
- text run at (0,0) width 500: "............................................................................................................................."
- text run at (0,20) width 500: "............................................................................................................................."
- text run at (0,40) width 500: "............................................................................................................................."
- text run at (0,60) width 500: "............................................................................................................................."
- text run at (0,80) width 500: "............................................................................................................................."
- text run at (0,100) width 500: "............................................................................................................................."
- text run at (0,120) width 500: "............................................................................................................................."
- text run at (0,140) width 500: "............................................................................................................................."
- text run at (0,160) width 500: "............................................................................................................................."
- text run at (0,180) width 500: "............................................................................................................................."
- text run at (0,200) width 500: "............................................................................................................................."
- text run at (0,220) width 500: "............................................................................................................................."
- text run at (0,240) width 500: "............................................................................................................................."
- text run at (0,260) width 500: "............................................................................................................................."
- text run at (0,280) width 500: "............................................................................................................................."
- text run at (0,300) width 500: "............................................................................................................................."
- text run at (0,320) width 500: "............................................................................................................................."
- text run at (0,340) width 500: "............................................................................................................................."
- text run at (0,360) width 500: "............................................................................................................................."
- text run at (0,380) width 500: "............................................................................................................................."
- text run at (0,400) width 500: "............................................................................................................................."
- text run at (0,420) width 500: "............................................................................................................................."
- text run at (0,440) width 500: "............................................................................................................................."
- text run at (0,460) width 500: "............................................................................................................................."
- text run at (0,480) width 500: "............................................................................................................................."
- text run at (0,500) width 500: "............................................................................................................................."
- text run at (0,520) width 500: "............................................................................................................................."
- text run at (0,540) width 500: "............................................................................................................................."
- text run at (0,560) width 500: "............................................................................................................................."
- text run at (0,580) width 500: "............................................................................................................................."
- text run at (0,600) width 500: "............................................................................................................................."
- text run at (0,620) width 500: "............................................................................................................................."
- text run at (0,640) width 500: "............................................................................................................................."
- text run at (0,660) width 500: "............................................................................................................................."
- text run at (0,680) width 500: "............................................................................................................................."
- text run at (0,700) width 212: "....................................................."
-selection start: position 0 of child 0 {#text} of child 1 {DIV} of body
-selection end: position 4428 of child 0 {#text} of child 1 {DIV} of body
+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 (anonymous) at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 474x19
+ text run at (0,0) width 474: "The focus ring of the following div should not extend beyond the size of the div."
+layer at (8,28) size 500x400 scrollWidth 501 scrollHeight 719
+ RenderBlock {DIV} at (0,20) size 500x400
+ RenderText {#text} at (0,0) size 500x719
+ text run at (0,0) width 500: "............................................................................................................................."
+ text run at (0,20) width 500: "............................................................................................................................."
+ text run at (0,40) width 500: "............................................................................................................................."
+ text run at (0,60) width 500: "............................................................................................................................."
+ text run at (0,80) width 500: "............................................................................................................................."
+ text run at (0,100) width 500: "............................................................................................................................."
+ text run at (0,120) width 500: "............................................................................................................................."
+ text run at (0,140) width 500: "............................................................................................................................."
+ text run at (0,160) width 500: "............................................................................................................................."
+ text run at (0,180) width 500: "............................................................................................................................."
+ text run at (0,200) width 500: "............................................................................................................................."
+ text run at (0,220) width 500: "............................................................................................................................."
+ text run at (0,240) width 500: "............................................................................................................................."
+ text run at (0,260) width 500: "............................................................................................................................."
+ text run at (0,280) width 500: "............................................................................................................................."
+ text run at (0,300) width 500: "............................................................................................................................."
+ text run at (0,320) width 500: "............................................................................................................................."
+ text run at (0,340) width 500: "............................................................................................................................."
+ text run at (0,360) width 500: "............................................................................................................................."
+ text run at (0,380) width 500: "............................................................................................................................."
+ text run at (0,400) width 500: "............................................................................................................................."
+ text run at (0,420) width 500: "............................................................................................................................."
+ text run at (0,440) width 500: "............................................................................................................................."
+ text run at (0,460) width 500: "............................................................................................................................."
+ text run at (0,480) width 500: "............................................................................................................................."
+ text run at (0,500) width 500: "............................................................................................................................."
+ text run at (0,520) width 500: "............................................................................................................................."
+ text run at (0,540) width 500: "............................................................................................................................."
+ text run at (0,560) width 500: "............................................................................................................................."
+ text run at (0,580) width 500: "............................................................................................................................."
+ text run at (0,600) width 500: "............................................................................................................................."
+ text run at (0,620) width 500: "............................................................................................................................."
+ text run at (0,640) width 500: "............................................................................................................................."
+ text run at (0,660) width 500: "............................................................................................................................."
+ text run at (0,680) width 500: "............................................................................................................................."
+ text run at (0,700) width 212: "....................................................."
+caret: position 0 of child 0 {#text} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/qt/editing/pasteboard/merge-end-1-expected.txt b/LayoutTests/platform/qt/editing/pasteboard/merge-end-1-expected.txt
index 35c9ca4..8896926 100644
--- a/LayoutTests/platform/qt/editing/pasteboard/merge-end-1-expected.txt
+++ b/LayoutTests/platform/qt/editing/pasteboard/merge-end-1-expected.txt
@@ -1,7 +1,6 @@
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: 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
diff --git a/LayoutTests/platform/qt/editing/pasteboard/merge-end-2-expected.txt b/LayoutTests/platform/qt/editing/pasteboard/merge-end-2-expected.txt
index 6afe06b..a525f69 100644
--- a/LayoutTests/platform/qt/editing/pasteboard/merge-end-2-expected.txt
+++ b/LayoutTests/platform/qt/editing/pasteboard/merge-end-2-expected.txt
@@ -1,7 +1,6 @@
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: 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
diff --git a/LayoutTests/platform/qt/editing/pasteboard/select-element-1-expected.txt b/LayoutTests/platform/qt/editing/pasteboard/select-element-1-expected.txt
index 1b350ca..21b36ef 100644
--- a/LayoutTests/platform/qt/editing/pasteboard/select-element-1-expected.txt
+++ b/LayoutTests/platform/qt/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
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list