From 0e1f3b12b0c3c8f0488f4845c4377212e7a9f49f Mon Sep 17 00:00:00 2001 From: Timothy Nikkel Date: Mon, 28 Sep 2009 20:40:24 -0500 Subject: [PATCH] Bug 518777. When drawing the canvas background color for drawWindow, adjust CanvasArea because it is relative to the frame itself. r=roc --HG-- rename : layout/base/tests/test_bug514127.html => layout/base/tests/test_bug518777.html extra : rebase_source : 252a78c5444513eac82b6ebc6ae202aef91bc5ce --- layout/base/nsPresShell.cpp | 3 +- layout/base/tests/Makefile.in | 1 + layout/base/tests/test_bug518777.html | 52 +++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 layout/base/tests/test_bug518777.html diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 3a5755947142..b4b0fdcb6852 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -5304,7 +5304,8 @@ PresShell::RenderDocument(const nsRect& aRect, PRUint32 aFlags, CanvasFrame* canvasFrame = do_QueryFrame(rootScrollableFrame->GetScrolledFrame()); if (canvasFrame) { - canvasArea = canvasFrame->CanvasArea(); + canvasArea = + canvasFrame->CanvasArea() + builder.ToReferenceFrame(canvasFrame); } } diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in index b1099a24586c..3e4a1a512980 100644 --- a/layout/base/tests/Makefile.in +++ b/layout/base/tests/Makefile.in @@ -81,6 +81,7 @@ _TEST_FILES = \ test_bug435293-skew.html \ test_bug495648.xul \ test_bug514127.html \ + test_bug518777.html \ test_scrolling.html \ $(NULL) # test_bug396024.html is currently disabled because it interacts badly with diff --git a/layout/base/tests/test_bug518777.html b/layout/base/tests/test_bug518777.html new file mode 100644 index 000000000000..02d6557d98ef --- /dev/null +++ b/layout/base/tests/test_bug518777.html @@ -0,0 +1,52 @@ + + + + + Test for Bug 518777 + + + + + +

Mozilla Bug 518777

+ + + + + +
+
+
+ +