[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hyatt at apple.com
hyatt at apple.com
Wed Dec 22 13:49:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7c593709fe1b337347ce9ebf8a9c71a42e672ffc
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 27 22:58:34 2010 +0000
https://bugs.webkit.org/show_bug.cgi?id=46665
Reviewed by Sam Weinig.
Patch RenderView's layout and computeLogicalWidth/Height methods to be block-flow-aware.
Added fast/root-lr-basic.html
WebCore:
* rendering/RenderView.cpp:
(WebCore::RenderView::computeLogicalHeight):
(WebCore::RenderView::computeLogicalWidth):
(WebCore::RenderView::layout):
* rendering/RenderView.h:
(WebCore::RenderView::viewLogicalWidth):
(WebCore::RenderView::viewLogicalHeight):
LayoutTests:
* fast/blockflow/root-lr-basic.html: Added.
* platform/mac/fast/blockflow: Added.
* platform/mac/fast/blockflow/root-lr-basic-expected.checksum: Added.
* platform/mac/fast/blockflow/root-lr-basic-expected.png: Added.
* platform/mac/fast/blockflow/root-lr-basic-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8a67d64..3c691c4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-27 David Hyatt <hyatt at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ https://bugs.webkit.org/show_bug.cgi?id=46665
+
+ Patch RenderView's layout and computeLogicalWidth/Height methods to be block-flow-aware.
+
+ Added fast/root-lr-basic.html
+
+ * fast/blockflow/root-lr-basic.html: Added.
+ * platform/mac/fast/blockflow: Added.
+ * platform/mac/fast/blockflow/root-lr-basic-expected.checksum: Added.
+ * platform/mac/fast/blockflow/root-lr-basic-expected.png: Added.
+ * platform/mac/fast/blockflow/root-lr-basic-expected.txt: Added.
+
2010-09-27 Zhenyao Mo <zmo at google.com>
Unreviewed, add fast/canvas/webgl/object-deletion-behaviour.html to test_expectations.txt (failing on Win/Linux).
diff --git a/LayoutTests/fast/blockflow/root-lr-basic.html b/LayoutTests/fast/blockflow/root-lr-basic.html
new file mode 100644
index 0000000..940c949
--- /dev/null
+++ b/LayoutTests/fast/blockflow/root-lr-basic.html
@@ -0,0 +1,2 @@
+<!doctype html>
+<html style="overflow:hidden; -webkit-block-flow:lr; -webkit-logical-height:100px; border:2px solid black"></html>
diff --git a/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.checksum b/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.checksum
new file mode 100644
index 0000000..6223b88
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.checksum
@@ -0,0 +1 @@
+e59dc64091d36ac993d887ff3bfd61ef
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.png b/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.png
new file mode 100644
index 0000000..569906f
Binary files /dev/null and b/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.txt b/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.txt
new file mode 100644
index 0000000..c345480
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.txt
@@ -0,0 +1,5 @@
+layer at (0,0) size 800x1180
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 590x1180
+ RenderBlock {HTML} at (0,0) size 104x600 [border: (2px solid #000000)]
+ RenderBody {BODY} at (10,600) size 580x580
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 825af0f..1c318a1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-27 David Hyatt <hyatt at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ https://bugs.webkit.org/show_bug.cgi?id=46665
+
+ Patch RenderView's layout and computeLogicalWidth/Height methods to be block-flow-aware.
+
+ Added fast/root-lr-basic.html
+
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::computeLogicalHeight):
+ (WebCore::RenderView::computeLogicalWidth):
+ (WebCore::RenderView::layout):
+ * rendering/RenderView.h:
+ (WebCore::RenderView::viewLogicalWidth):
+ (WebCore::RenderView::viewLogicalHeight):
+
2010-09-24 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp
index 12a5e7e..4da680c 100644
--- a/WebCore/rendering/RenderView.cpp
+++ b/WebCore/rendering/RenderView.cpp
@@ -75,15 +75,13 @@ RenderView::~RenderView()
void RenderView::computeLogicalHeight()
{
if (!printing() && m_frameView)
- setHeight(viewHeight());
+ setLogicalHeight(viewLogicalHeight());
}
void RenderView::computeLogicalWidth()
{
if (!printing() && m_frameView)
- setWidth(viewWidth());
- m_marginLeft = 0;
- m_marginRight = 0;
+ setLogicalWidth(viewLogicalWidth());
}
void RenderView::computePreferredLogicalWidths()
@@ -108,7 +106,7 @@ void RenderView::layout()
if (relayoutChildren) {
setChildNeedsLayout(true, false);
for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
- if (child->style()->height().isPercent() || child->style()->minHeight().isPercent() || child->style()->maxHeight().isPercent())
+ if (child->style()->logicalHeight().isPercent() || child->style()->logicalMinHeight().isPercent() || child->style()->logicalMaxHeight().isPercent())
child->setChildNeedsLayout(true, false);
}
}
diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h
index b91a533..ff70e86 100644
--- a/WebCore/rendering/RenderView.h
+++ b/WebCore/rendering/RenderView.h
@@ -54,6 +54,8 @@ public:
// The same as the FrameView's layoutHeight/layoutWidth but with null check guards.
int viewHeight() const;
int viewWidth() const;
+ int viewLogicalWidth() const { return style()->isVerticalBlockFlow() ? viewWidth() : viewHeight(); }
+ int viewLogicalHeight() const { return style()->isVerticalBlockFlow() ? viewHeight() : viewWidth(); }
float zoomFactor() const;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list