[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
hamaji at chromium.org
hamaji at chromium.org
Thu Dec 3 13:36:34 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 5b6206c9216b804d27e933805540a05ba62684da
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 14 00:07:03 2009 +0000
2009-11-13 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
WebCore::externalRepresentation should update layout before getting render object
https://bugs.webkit.org/show_bug.cgi?id=31459
Before this change, the render tree output for this test was wrong.
Note that #FF0000 (red) becomes #008000 (green) now.
* platform/mac/svg/custom/gradient-stop-style-change-expected.txt:
2009-11-13 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
WebCore::externalRepresentation should update layout before getting render object
https://bugs.webkit.org/show_bug.cgi?id=31459
* rendering/RenderTreeAsText.cpp:
(WebCore::externalRepresentation):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50976 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2b16d68..5f1a28e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-13 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ WebCore::externalRepresentation should update layout before getting render object
+ https://bugs.webkit.org/show_bug.cgi?id=31459
+
+ Before this change, the render tree output for this test was wrong.
+ Note that #FF0000 (red) becomes #008000 (green) now.
+
+ * platform/mac/svg/custom/gradient-stop-style-change-expected.txt:
+
2009-11-04 Adam Roben <aroben at apple.com>
Test that delegates can modify global objects in isolated worlds
diff --git a/LayoutTests/platform/mac/svg/custom/gradient-stop-style-change-expected.txt b/LayoutTests/platform/mac/svg/custom/gradient-stop-style-change-expected.txt
index 00b8a0b..f89afb1 100644
--- a/LayoutTests/platform/mac/svg/custom/gradient-stop-style-change-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/gradient-stop-style-change-expected.txt
@@ -1,4 +1,4 @@
-KRenderingPaintServer {id="test" [type=LINEAR-GRADIENT] [stops=[(0.00,#FF0000)]] [start=(0,0)] [end=(1,0)]}
+KRenderingPaintServer {id="test" [type=LINEAR-GRADIENT] [stops=[(0.00,#008000)]] [start=(0,0)] [end=(1,0)]}
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 34c167b..40faf60 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-13 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ WebCore::externalRepresentation should update layout before getting render object
+ https://bugs.webkit.org/show_bug.cgi?id=31459
+
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::externalRepresentation):
+
2009-11-13 Adam Roben <aroben at apple.com>
Tell FrameLoaderClient when window objects in isolated worlds are
diff --git a/WebCore/rendering/RenderTreeAsText.cpp b/WebCore/rendering/RenderTreeAsText.cpp
index af0d825..d4684e7 100644
--- a/WebCore/rendering/RenderTreeAsText.cpp
+++ b/WebCore/rendering/RenderTreeAsText.cpp
@@ -541,6 +541,8 @@ static void writeSelection(TextStream& ts, const RenderObject* o)
String externalRepresentation(Frame* frame)
{
+ frame->document()->updateLayout();
+
RenderObject* o = frame->contentRenderer();
if (!o)
return String();
@@ -549,8 +551,6 @@ String externalRepresentation(Frame* frame)
#if ENABLE(SVG)
writeRenderResources(ts, o->document());
#endif
- if (o->view()->frameView())
- o->view()->frameView()->layout();
if (o->hasLayer()) {
RenderLayer* l = toRenderBox(o)->layer();
writeLayers(ts, l, l, IntRect(l->x(), l->y(), l->width(), l->height()));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list