[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
tony at chromium.org
tony at chromium.org
Mon Feb 21 00:26:53 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 9503c2a5341feff977a43c95207d0499702b7aec
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 31 18:06:25 2011 +0000
2011-01-31 Tony Chang <tony at chromium.org>
Reviewed by Eric Seidel.
mac DRT should report RTL scroll offset relative to top right corner
https://bugs.webkit.org/show_bug.cgi?id=53324
Remove scroll offsets since these are at the origin.
* platform/mac/fast/block/basic/truncation-rtl-expected.txt:
* platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.txt:
* platform/mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt:
* platform/mac/fast/multicol/vertical-rl/float-paginate-complex-expected.txt:
2011-01-31 Tony Chang <tony at chromium.org>
Reviewed by Eric Seidel.
mac DRT should report RTL scroll offset relative to top right corner
https://bugs.webkit.org/show_bug.cgi?id=53324
* DumpRenderTree/mac/DumpRenderTree.mm:
(dumpFrameScrollPosition):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77138 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2c408ca..3e23344 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-31 Tony Chang <tony at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ mac DRT should report RTL scroll offset relative to top right corner
+ https://bugs.webkit.org/show_bug.cgi?id=53324
+
+ Remove scroll offsets since these are at the origin.
+
+ * platform/mac/fast/block/basic/truncation-rtl-expected.txt:
+ * platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.txt:
+ * platform/mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt:
+ * platform/mac/fast/multicol/vertical-rl/float-paginate-complex-expected.txt:
+
2011-01-31 Yury Semikhatsky <yurys at chromium.org>
Unreviewed. Mark some tests as having wrong image results on Mac.
diff --git a/LayoutTests/platform/mac/fast/block/basic/truncation-rtl-expected.txt b/LayoutTests/platform/mac/fast/block/basic/truncation-rtl-expected.txt
index 133a7e1..1ffd2a5 100644
--- a/LayoutTests/platform/mac/fast/block/basic/truncation-rtl-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/basic/truncation-rtl-expected.txt
@@ -28,4 +28,3 @@ layer at (0,0) size 800x222
text run at (51,91) width 950: "a, molestie at mi. Nulla blandit, mi et euismod imperdiet, augue arcu ornare felis, nec viverra lacus ligula ut metus. Proin ut leo ante, at consectetur sem."
text run at (617,109) width 4 RTL: "."
text run at (621,109) width 380: "Nullam non nunc ligula. Proin sed ante sem, id rutrum purus"
-scrolled to 210,0
diff --git a/LayoutTests/platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.txt b/LayoutTests/platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.txt
index f320b14..49793b4 100644
--- a/LayoutTests/platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.txt
+++ b/LayoutTests/platform/mac/fast/blockflow/Kusa-Makura-background-canvas-expected.txt
@@ -2912,4 +2912,3 @@ layer at (-4339,0) size 5139x585 backgroundClip at (0,0) size 5139x585 clip at (
text run at (1974,71) width 387: "\x{306B}\x{3001}\x{3059}\x{3079}\x{3066}\x{3092}\x{5FD8}\x{5374}\x{3057}\x{3066}\x{3050}\x{3063}\x{3059}\x{308A}\x{5BDD}\x{8FBC}\x{3080}\x{3088}\x{3046}\x{306A}\x{529F}\x{5FB3}\x{3067}\x{3042}"
text run at (1998,0) width 33: "\x{308B}\x{3002}"
RenderBR {BR} at (1998,33) size 18x0
-scrolled to 4339,0
diff --git a/LayoutTests/platform/mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt b/LayoutTests/platform/mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt
index 81300a3..179281a 100644
--- a/LayoutTests/platform/mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/vertical-rl/column-break-with-balancing-expected.txt
@@ -161,4 +161,3 @@ layer at (0,8) size 388x569
RenderText {#text} at (360,0) size 18x110
text run at (360,0) width 110: "This is some text."
RenderBR {BR} at (374,110) size 0x0
-scrolled to 8,0
diff --git a/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-paginate-complex-expected.txt b/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-paginate-complex-expected.txt
index d579a90..d08652c 100644
--- a/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-paginate-complex-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-paginate-complex-expected.txt
@@ -256,4 +256,3 @@ layer at (-47,8) size 404x1200 backgroundClip at (0,0) size 1680x1208 clip at (0
RenderText {#text} at (586,0) size 18x110
text run at (586,0) width 110: "This is some text."
RenderBR {BR} at (600,110) size 0x0
-scrolled to 895,0
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 35e3d09..656837d 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-31 Tony Chang <tony at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ mac DRT should report RTL scroll offset relative to top right corner
+ https://bugs.webkit.org/show_bug.cgi?id=53324
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (dumpFrameScrollPosition):
+
2011-01-31 Zoltan Horvath <zoltan at webkit.org>
Reviewed by Andreas Kling.
diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
index ed09cf6..bf3c27d 100644
--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -753,7 +753,10 @@ static void dumpHistoryItem(WebHistoryItem *item, int indent, BOOL current)
static void dumpFrameScrollPosition(WebFrame *f)
{
- NSPoint scrollPosition = [[[[f frameView] documentView] superview] bounds].origin;
+ WebScriptObject* scriptObject = [f windowObject];
+ NSPoint scrollPosition = NSMakePoint(
+ [[scriptObject valueForKey:@"pageXOffset"] floatValue],
+ [[scriptObject valueForKey:@"pageYOffset"] floatValue]);
if (ABS(scrollPosition.x) > 0.00000001 || ABS(scrollPosition.y) > 0.00000001) {
if ([f parentFrame] != nil)
printf("frame '%s' ", [[f name] UTF8String]);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list