Title: [123909] trunk
Revision
123909
Author
[email protected]
Date
2012-07-27 12:46:13 -0700 (Fri, 27 Jul 2012)

Log Message

Source/WebCore: flex-wrap: wrap not wrapping for % sized items in column flow
https://bugs.webkit.org/show_bug.cgi?id=92324

Patch by Tony Chang <[email protected]> on 2012-07-27
Reviewed by Ojan Vafai.

We were using trying to use the value of contentLogicalHeight() before having called computeLogicalHeight()
in a few places. Fix this in mainAxisContentExtent() rather than at the callers.

Test: css3/flexbox/percentage-heights.html

* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::mainAxisContentExtent):
(WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild): If we haven't called computeLogicalHeight, we try to compute
the height based on the fixed flexbox value. min/max don't matter here since percent values are only based on height/width.
* rendering/RenderFlexibleBox.h: Drop const because computeContentLogicalHeightUsing is not const. I can
try making computeContentLogicalHeightUsing const in a follow up change (might be non-trivial).

Source/WebKit2: Show the unavailable plug-in indicator for Java applets as well
https://bugs.webkit.org/show_bug.cgi?id=92521

Patch by Anders Carlsson <[email protected]> on 2012-07-27
Reviewed by Sam Weinig.

* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::unavailablePluginButtonClicked):
This can now be called on applet elements as well.

* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::createJavaAppletWidget):
Get the MIME type from the applet element.

LayoutTests: flex-wrap: wrap not wrapping for % sized items in column flow
https://bugs.webkit.org/show_bug.cgi?id=92324

Patch by Tony Chang <[email protected]> on 2012-07-27
Reviewed by Ojan Vafai.

Test cases for column flow with percentage heights. There are three
test cases for the three callers of mainAxisContentExtent() that were
broken by this.

* css3/flexbox/percentage-heights-expected.txt: Added.
* css3/flexbox/percentage-heights.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (123908 => 123909)


--- trunk/LayoutTests/ChangeLog	2012-07-27 19:38:36 UTC (rev 123908)
+++ trunk/LayoutTests/ChangeLog	2012-07-27 19:46:13 UTC (rev 123909)
@@ -1,3 +1,17 @@
+2012-07-27  Tony Chang  <[email protected]>
+
+        flex-wrap: wrap not wrapping for % sized items in column flow
+        https://bugs.webkit.org/show_bug.cgi?id=92324
+
+        Reviewed by Ojan Vafai.
+
+        Test cases for column flow with percentage heights. There are three
+        test cases for the three callers of mainAxisContentExtent() that were
+        broken by this.
+
+        * css3/flexbox/percentage-heights-expected.txt: Added.
+        * css3/flexbox/percentage-heights.html: Added.
+
 2012-07-27  Dan Bernstein  <[email protected]>
 
         Hit testing near a column break can return a result from an adjacent column when there is leading

Added: trunk/LayoutTests/css3/flexbox/percentage-heights-expected.txt (0 => 123909)


--- trunk/LayoutTests/css3/flexbox/percentage-heights-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/css3/flexbox/percentage-heights-expected.txt	2012-07-27 19:46:13 UTC (rev 123909)
@@ -0,0 +1,6 @@
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS

Added: trunk/LayoutTests/css3/flexbox/percentage-heights.html (0 => 123909)


--- trunk/LayoutTests/css3/flexbox/percentage-heights.html	                        (rev 0)
+++ trunk/LayoutTests/css3/flexbox/percentage-heights.html	2012-07-27 19:46:13 UTC (rev 123909)
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html>
+<style>
+.flexbox {
+    display: -webkit-flex;
+    background-color: #aaa;
+    position: relative;
+}
+.flexbox :nth-child(1) {
+    background-color: blue;
+}
+.flexbox :nth-child(2) {
+    background-color: green;
+}
+.flexbox :nth-child(3) {
+    background-color: red;
+}
+
+.flexbox > div {
+    width: 40%;
+    height: 40%;
+}
+.column {
+    -webkit-flex-flow: column wrap;
+    width: 100px;
+    height: 100px;
+    -webkit-align-content: flex-start;
+}
+</style>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+</script>
+<script src=""
+<body _onload_="checkLayout('.flexbox')">
+
+<div class="flexbox column">
+    <div data-expected-height="40" data-offset-x="0" data-offset-y="0"></div>
+    <div data-expected-height="40" data-offset-x="0" data-offset-y="40"></div>
+    <div data-expected-height="40" data-offset-x="40" data-offset-y="0"></div>
+</div>
+
+<div class="flexbox column">
+    <div data-expected-height="40" data-offset-x="0" data-offset-y="0" style="margin-bottom: 10%"></div>
+    <div data-expected-height="40" data-offset-x="40" data-offset-y="0" style="margin-bottom: 20%"></div>
+    <div data-expected-height="40" data-offset-x="40" data-offset-y="60"></div>
+</div>
+
+<div class="flexbox column">
+    <div data-expected-height="20" data-offset-x="0" data-offset-y="0" style="-webkit-flex: 1; min-height: 0; max-height: 20%"></div>
+    <div data-expected-height="40" data-offset-x="0" data-offset-y="20"></div>
+    <div data-expected-height="40" data-offset-x="0" data-offset-y="60"></div>
+</div>
+
+<div class="flexbox column" style="-webkit-writing-mode: vertical-rl">
+    <div data-expected-width="40" data-offset-x="60" data-offset-y="0"></div>
+    <div data-expected-width="40" data-offset-x="20" data-offset-y="0"></div>
+    <div data-expected-width="40" data-offset-x="60" data-offset-y="40"></div>
+</div>
+
+<div class="flexbox column" style="-webkit-writing-mode: vertical-rl">
+    <div data-expected-width="40" data-offset-x="60" data-offset-y="0" style="margin-bottom: 10%"></div>
+    <div data-expected-width="40" data-offset-x="20" data-offset-y="0" style="margin-bottom: 20%"></div>
+    <div data-expected-width="40" data-offset-x="60" data-offset-y="60"></div>
+</div>
+
+<div class="flexbox column" style="-webkit-writing-mode: vertical-rl">
+    <div data-expected-width="20" data-offset-x="80" data-offset-y="0" style="-webkit-flex: 1; min-width: 0; max-width: 20%"></div>
+    <div data-expected-width="40" data-offset-x="40" data-offset-y="0"></div>
+    <div data-expected-width="40" data-offset-x="0" data-offset-y="0"></div>
+</div>
+
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (123908 => 123909)


--- trunk/Source/WebCore/ChangeLog	2012-07-27 19:38:36 UTC (rev 123908)
+++ trunk/Source/WebCore/ChangeLog	2012-07-27 19:46:13 UTC (rev 123909)
@@ -1,3 +1,22 @@
+2012-07-27  Tony Chang  <[email protected]>
+
+        flex-wrap: wrap not wrapping for % sized items in column flow
+        https://bugs.webkit.org/show_bug.cgi?id=92324
+
+        Reviewed by Ojan Vafai.
+
+        We were using trying to use the value of contentLogicalHeight() before having called computeLogicalHeight()
+        in a few places. Fix this in mainAxisContentExtent() rather than at the callers.
+
+        Test: css3/flexbox/percentage-heights.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::mainAxisContentExtent):
+        (WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild): If we haven't called computeLogicalHeight, we try to compute
+        the height based on the fixed flexbox value. min/max don't matter here since percent values are only based on height/width.
+        * rendering/RenderFlexibleBox.h: Drop const because computeContentLogicalHeightUsing is not const. I can
+        try making computeContentLogicalHeightUsing const in a follow up change (might be non-trivial).
+
 2012-07-27  Min Qin  <[email protected]>
 
         Add an overlay play button to media controls on android
@@ -139,6 +158,26 @@
         The current number of frames is used in a dynamically created identifier. Again we replace 'top' by 
         window.parent.
 
+2012-07-27  John J. Barton  <[email protected]>
+
+        Web Inspector: Allow front_end to be loaded into an iframe
+        https://bugs.webkit.org/show_bug.cgi?id=92437
+
+        Reviewed by Pavel Feldman.
+
+        This change only affects 'embedders' of the inspector/front_end. No change of function for WebKit ports.
+
+        * inspector/front-end/ExtensionAPI.js: 
+        Replace window.top with window.parent two places. When WebInspector is loaded as the main window content, 
+        then extension iframes have window.top === window.parent; when WebInspector is loaded as an iframe, then
+        extensions are iframes in iframes and we need to use a relative address window.parent.
+        (injectedExtensionAPI.ExtensionViewImpl.dispatchShowEvent):
+        (injectedExtensionAPI.ExtensionViewImpl):
+        (injectedExtensionAPI.ExtensionServerClient):
+        WebKit/chromium/scripts/generate_devtools_extension_api.py:
+        The current number of frames is used in a dynamically created identifier. Again we replace 'top' by 
+        window.parent.
+
 2012-07-27  Vivek Galatage  <[email protected]>
 
         Web Inspector: InspectorPageAgent should ascertain document to be non-null in updateViewMetrics()

Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (123908 => 123909)


--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp	2012-07-27 19:38:36 UTC (rev 123908)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp	2012-07-27 19:46:13 UTC (rev 123909)
@@ -396,9 +396,11 @@
     return isHorizontalFlow() ? contentHeight() : contentWidth();
 }
 
-LayoutUnit RenderFlexibleBox::mainAxisContentExtent() const
+LayoutUnit RenderFlexibleBox::mainAxisContentExtent()
 {
-    return isHorizontalFlow() ? contentWidth() : contentHeight();
+    if (isColumnFlow())
+        return std::max(LayoutUnit(0), computeContentLogicalHeightUsing(MainOrPreferredSize, style()->logicalHeight()));
+    return contentLogicalWidth();
 }
 
 WritingMode RenderFlexibleBox::transformedWritingMode() const
@@ -590,7 +592,7 @@
     return isHorizontalFlow() ? child->verticalScrollbarWidth() : child->horizontalScrollbarHeight();
 }
 
-LayoutUnit RenderFlexibleBox::preferredMainAxisContentExtentForChild(RenderBox* child) const
+LayoutUnit RenderFlexibleBox::preferredMainAxisContentExtentForChild(RenderBox* child)
 {
     Length flexBasis = flexBasisForChild(child);
     if (flexBasis.isAuto()) {

Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.h (123908 => 123909)


--- trunk/Source/WebCore/rendering/RenderFlexibleBox.h	2012-07-27 19:38:36 UTC (rev 123908)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.h	2012-07-27 19:46:13 UTC (rev 123909)
@@ -83,7 +83,7 @@
     LayoutUnit crossAxisExtent() const;
     LayoutUnit mainAxisExtent() const;
     LayoutUnit crossAxisContentExtent() const;
-    LayoutUnit mainAxisContentExtent() const;
+    LayoutUnit mainAxisContentExtent();
     WritingMode transformedWritingMode() const;
     LayoutUnit flowAwareBorderStart() const;
     LayoutUnit flowAwareBorderEnd() const;
@@ -105,7 +105,7 @@
     void adjustAlignmentForChild(RenderBox* child, LayoutUnit);
     LayoutUnit mainAxisBorderAndPaddingExtentForChild(RenderBox* child) const;
     LayoutUnit mainAxisScrollbarExtentForChild(RenderBox* child) const;
-    LayoutUnit preferredMainAxisContentExtentForChild(RenderBox* child) const;
+    LayoutUnit preferredMainAxisContentExtentForChild(RenderBox* child);
 
     void layoutFlexItems(OrderIterator&, WTF::Vector<LineContext>&);
     LayoutUnit autoMarginOffsetInMainAxis(const OrderedFlexItemList&, LayoutUnit& availableFreeSpace);

Modified: trunk/Source/WebKit2/ChangeLog (123908 => 123909)


--- trunk/Source/WebKit2/ChangeLog	2012-07-27 19:38:36 UTC (rev 123908)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-27 19:46:13 UTC (rev 123909)
@@ -25,6 +25,18 @@
         * Shared/WebEventConversion.cpp:
         (WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):
 
+2012-07-27  Gyuyoung Kim  <[email protected]>
+
+        [WK2] Fix build warning in WebEventConversion.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=92517
+
+        Reviewed by Darin Adler.
+
+        There is a build warning related to comparison between signed and unsigned integer expressions.
+
+        * Shared/WebEventConversion.cpp:
+        (WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):
+
 2012-07-27  Christophe Dumez  <[email protected]>
 
         [EFL][WK2] Add download client for Ewk_Context
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to