Diff
Modified: branches/subpixellayout/LayoutTests/fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport-expected.txt (104765 => 104766)
--- branches/subpixellayout/LayoutTests/fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport-expected.txt 2012-01-12 00:48:41 UTC (rev 104765)
+++ branches/subpixellayout/LayoutTests/fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport-expected.txt 2012-01-12 00:51:14 UTC (rev 104766)
@@ -22,13 +22,13 @@
PASS Range.startOffset check (got 14, expected 14)
PASS Range.startContainer check (got [object Text], expected [object Text])
-PASS Range.startOffset check (got 1, expected 1)
+PASS Range.startOffset check (got 0, expected 0)
PASS Range.startContainer check (got [object Text], expected [object Text])
-PASS Range.startOffset check (got 13, expected 13)
+PASS Range.startOffset check (got 6, expected 6)
PASS Range.startContainer check (got [object Text], expected [object Text])
PASS Range.startOffset check (got 4, expected 4)
PASS Range.startContainer check (got [object Text], expected [object Text])
-PASS Range.startOffset check (got 16, expected 16)
+PASS Range.startOffset check (got 10, expected 10)
PASS successfullyParsed is true
Modified: branches/subpixellayout/LayoutTests/fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport.html (104765 => 104766)
--- branches/subpixellayout/LayoutTests/fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport.html 2012-01-12 00:48:41 UTC (rev 104765)
+++ branches/subpixellayout/LayoutTests/fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport.html 2012-01-12 00:51:14 UTC (rev 104766)
@@ -64,10 +64,10 @@
}
if (zoomOrNot == "zoom") {
- test(1, 0, 0);
- test(13, 0, 25);
+ test(0, 0, 0);
+ test(6, 0, 25);
test(4, 50, 0);
- test(16, 50, 25);
+ test(10, 50, 25);
} else {
test(0, 0, 0);
test(12, 0, 25);
Modified: branches/subpixellayout/LayoutTests/fast/dom/Window/webkitConvertPoint-expected.txt (104765 => 104766)
--- branches/subpixellayout/LayoutTests/fast/dom/Window/webkitConvertPoint-expected.txt 2012-01-12 00:48:41 UTC (rev 104765)
+++ branches/subpixellayout/LayoutTests/fast/dom/Window/webkitConvertPoint-expected.txt 2012-01-12 00:51:14 UTC (rev 104766)
@@ -38,120 +38,120 @@
Test 1
PASS x is 8
-PASS y is 12
+PASS y is 13
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 13
-PASS y is 52
+PASS y is 53
Round Trip of (5,40)
PASS x is 5
PASS y is 40
Test 2
PASS x is 8
-PASS y is 50
+PASS y is 51
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 13
-PASS y is 90
+PASS y is 91
Round Trip of (5,40)
PASS x is 5
PASS y is 40
Test 3
PASS x is 8
-PASS y is 84
+PASS y is 85
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 13
-PASS y is 124
+PASS y is 125
Round Trip of (5,40)
PASS x is 5
PASS y is 40
Test 4
PASS x is 8
-PASS y is 118
+PASS y is 119
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 13
-PASS y is 158
+PASS y is 159
Round Trip of (5,40)
PASS x is 5
PASS y is 40
Test 5
PASS x is 28
-PASS y is 152
+PASS y is 153
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 33
-PASS y is 192
+PASS y is 193
Round Trip of (5,40)
PASS x is 5
PASS y is 40
Test 6
PASS x is 28
-PASS y is 186
+PASS y is 187
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 33
-PASS y is 226
+PASS y is 227
Round Trip of (5,40)
PASS x is 5
PASS y is 40
Test 7
PASS x is 8
-PASS y is 238
+PASS y is 239
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 13
-PASS y is 278
+PASS y is 279
Round Trip of (5,40)
PASS x is 5
PASS y is 40
Test 8
PASS x is 8
-PASS y is 272
+PASS y is 273
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 13
-PASS y is 312
+PASS y is 313
Round Trip of (5,40)
PASS x is 5
PASS y is 40
Test 9
PASS x is 28
-PASS y is 290
+PASS y is 291
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 33
-PASS y is 330
+PASS y is 331
Round Trip of (5,40)
PASS x is 5
PASS y is 40
Test 10
PASS x is 28
-PASS y is 308
+PASS y is 309
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 33
-PASS y is 348
+PASS y is 349
Round Trip of (5,40)
PASS x is 5
PASS y is 40
@@ -182,12 +182,12 @@
Test 13
PASS x is 28
-PASS y is 486
+PASS y is 487
Round Trip of (0,0)
PASS x is 0
PASS y is 0
PASS x is 33
-PASS y is 526
+PASS y is 527
Round Trip of (5,40)
PASS x is 5
PASS y is 40
Modified: branches/subpixellayout/LayoutTests/fast/dom/Window/webkitConvertPoint.html (104765 => 104766)
--- branches/subpixellayout/LayoutTests/fast/dom/Window/webkitConvertPoint.html 2012-01-12 00:48:41 UTC (rev 104765)
+++ branches/subpixellayout/LayoutTests/fast/dom/Window/webkitConvertPoint.html 2012-01-12 00:51:14 UTC (rev 104766)
@@ -128,19 +128,19 @@
testFailed("null parameter test b");
debug("Test did not crash and therefore was successful");
- runTest("Test 1", "test1", 8, 12, 13, 52);
- runTest("Test 2", "test2", 8, 50, 13, 90);
- runTest("Test 3", "test3", 8, 84, 13, 124);
- runTest("Test 4", "test4", 8, 118, 13, 158);
- runTest("Test 5", "test5", 28, 152, 33, 192);
- runTest("Test 6", "test6", 28, 186, 33, 226);
- runTest("Test 7", "test7", 8, 238, 13, 278);
- runTest("Test 8", "test8", 8, 272, 13, 312);
- runTest("Test 9", "test9", 28, 290, 33, 330);
- runTest("Test 10", "test10", 28, 308, 33, 348);
+ runTest("Test 1", "test1", 8, 13, 13, 53);
+ runTest("Test 2", "test2", 8, 51, 13, 91);
+ runTest("Test 3", "test3", 8, 85, 13, 125);
+ runTest("Test 4", "test4", 8, 119, 13, 159);
+ runTest("Test 5", "test5", 28, 153, 33, 193);
+ runTest("Test 6", "test6", 28, 187, 33, 227);
+ runTest("Test 7", "test7", 8, 239, 13, 279);
+ runTest("Test 8", "test8", 8, 273, 13, 313);
+ runTest("Test 9", "test9", 28, 291, 33, 331);
+ runTest("Test 10", "test10", 28, 309, 33, 349);
runTest("Test 11", "test11", 158, 355, 174, 373);
runTest("Test 12", "test12", 168, 428, 184, 446);
- runTest("Test 13", "test13", 28, 486, 33, 526);
+ runTest("Test 13", "test13", 28, 487, 33, 527);
isSuccessfullyParsed();
}
Modified: branches/subpixellayout/LayoutTests/fast/dom/elementFromPoint-relative-to-viewport-expected.txt (104765 => 104766)
--- branches/subpixellayout/LayoutTests/fast/dom/elementFromPoint-relative-to-viewport-expected.txt 2012-01-12 00:48:41 UTC (rev 104765)
+++ branches/subpixellayout/LayoutTests/fast/dom/elementFromPoint-relative-to-viewport-expected.txt 2012-01-12 00:51:14 UTC (rev 104766)
@@ -12,9 +12,9 @@
PASS scrolledRightBoxOffscreen is '3'
PASS scrolledDownAndRightBoxOffscreen is '8'
PASS unscrolledBoxInitial is '0'
-PASS scrolledDownBoxInitial is '5'
+PASS scrolledDownBoxInitial is '4'
PASS scrolledRightBoxInitial is '3'
-PASS scrolledDownAndRightBoxInitial is '8'
+PASS scrolledDownAndRightBoxInitial is '7'
PASS successfullyParsed is true
TEST COMPLETE
Modified: branches/subpixellayout/LayoutTests/fast/dom/elementFromPoint-relative-to-viewport.html (104765 => 104766)
--- branches/subpixellayout/LayoutTests/fast/dom/elementFromPoint-relative-to-viewport.html 2012-01-12 00:48:41 UTC (rev 104765)
+++ branches/subpixellayout/LayoutTests/fast/dom/elementFromPoint-relative-to-viewport.html 2012-01-12 00:51:14 UTC (rev 104766)
@@ -39,7 +39,7 @@
description('This test document.elementFromPoint is evaluated in with respect to the viewport, not the document.');
- function testElement(element, label, offsetX, offsetY) {
+ function testElement(element, label, offsetX, offsetY, zoomed) {
for (var i = 0; i < 25; ++i) {
var item = document.createElement("div");
item.className = "testItem";
@@ -79,20 +79,28 @@
// Test scrolling down and right
window[scrolledDownAndRightBox] = getFromPoint(50, 20);
- shouldBe(unscrolledBox, "'0'");
- shouldBe(scrolledDownBox, "'5'");
- shouldBe(scrolledRightBox, "'3'");
- shouldBe(scrolledDownAndRightBox, "'8'");
+ if (zoomed) {
+ shouldBe(unscrolledBox, "'0'");
+ shouldBe(scrolledDownBox, "'4'");
+ shouldBe(scrolledRightBox, "'3'");
+ shouldBe(scrolledDownAndRightBox, "'7'");
+ } else {
+ shouldBe(unscrolledBox, "'0'");
+ shouldBe(scrolledDownBox, "'5'");
+ shouldBe(scrolledRightBox, "'3'");
+ shouldBe(scrolledDownAndRightBox, "'8'");
+ }
+
}
var elementInitial = document.getElementById('test-initial');
var elementOffscreen = document.getElementById('test-offscreen');
var offset = elementInitial.getBoundingClientRect();
- testElement(elementInitial, "Initial", offset.left, offset.top);
- testElement(elementOffscreen, "Offscreen", offset.left, offset.top + 1100);
+ testElement(elementInitial, "Initial", offset.left, offset.top, false);
+ testElement(elementOffscreen, "Offscreen", offset.left, offset.top + 1100, false);
eventSender.zoomPageOut();
- testElement(elementInitial, "Initial", offset.left, offset.top);
+ testElement(elementInitial, "Initial", offset.left, offset.top, true);
if (window.layoutTestController) {
var area = document.getElementById('testArea');
Modified: branches/subpixellayout/LayoutTests/platform/mac/fast/dom/HTMLTableElement/createCaption-expected.png
(Binary files differ)
Modified: branches/subpixellayout/LayoutTests/platform/mac/fast/dom/HTMLTableElement/createCaption-expected.txt (104765 => 104766)
--- branches/subpixellayout/LayoutTests/platform/mac/fast/dom/HTMLTableElement/createCaption-expected.txt 2012-01-12 00:48:41 UTC (rev 104765)
+++ branches/subpixellayout/LayoutTests/platform/mac/fast/dom/HTMLTableElement/createCaption-expected.txt 2012-01-12 00:51:14 UTC (rev 104766)
@@ -31,10 +31,10 @@
text run at (0,18) width 584: "failure, the first table will have no caption, and the second table will have the caption Things."
RenderBlock {HR} at (0,156) size 784x2 [border: (1px inset #000000)]
RenderTable {TABLE} at (0,166) size 111x94 [border: (1px outset #808080)]
- RenderBlock {CAPTION} at (0,0) size 109x18
+ RenderBlock {CAPTION} at (0,0) size 111x18
RenderInline {B} at (0,0) size 43x18
- RenderText {#text} at (33,0) size 43x18
- text run at (33,0) width 43: "Fruity"
+ RenderText {#text} at (34,0) size 43x18
+ text run at (34,0) width 43: "Fruity"
RenderTableSection {TBODY} at (1,19) size 109x74
RenderTableRow {TR} at (0,2) size 109x22
RenderTableCell {TH} at (2,2) size 52x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
@@ -60,10 +60,10 @@
RenderBlock (anonymous) at (0,260) size 784x18
RenderBR {BR} at (0,0) size 0x18
RenderTable {TABLE} at (0,278) size 130x94 [border: (1px outset #808080)]
- RenderBlock {CAPTION} at (0,0) size 128x18
+ RenderBlock {CAPTION} at (0,0) size 130x18
RenderInline {B} at (0,0) size 75x18
- RenderText {#text} at (26,0) size 76x18
- text run at (26,0) width 76: "Vegetabley"
+ RenderText {#text} at (27,0) size 76x18
+ text run at (27,0) width 76: "Vegetabley"
RenderTableSection {TBODY} at (1,19) size 128x74
RenderTableRow {TR} at (0,2) size 128x22
RenderTableCell {TH} at (2,2) size 71x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
