Changeset 123909 in webkit

Timestamp:

Jul 27, 2012 12:46:13 PM (12 years ago)

Author:

commit-queue@webkit.org

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 <​tony@chromium.org> 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 <​andersca@apple.com> 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 <​tony@chromium.org> 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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/percentage-heights-expected.txt (added)
• LayoutTests/css3/flexbox/percentage-heights.html (added)
• Source/WebCore/ChangeLog (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (2 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-27  Tony Chang  <tony@chromium.org>
+
+        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  <mitz@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-27  Tony Chang  <tony@chromium.org>
+
+        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  <qinmin@chromium.org>
 
@@ -119 +138 @@
         (WebCore::RootInlineBox::isFirstAfterPageBreak): Added this accessor.
         (WebCore::RootInlineBox::setIsFirstAfterPageBreak): Ditto.
+
+2012-07-27  John J. Barton  <johnjbarton@johnjbarton.com>
+
+        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  John J. Barton  <johnjbarton@johnjbarton.com>

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -397 +397 @@
 }
 
-LayoutUnit RenderFlexibleBox::mainAxisContentExtent() const
-{
-    return isHorizontalFlow() ? contentWidth() : contentHeight();
+LayoutUnit RenderFlexibleBox::mainAxisContentExtent()
+{
+    if (isColumnFlow())
+        return std::max(LayoutUnit(0), computeContentLogicalHeightUsing(MainOrPreferredSize, style()->logicalHeight()));
+    return contentLogicalWidth();
 }
 
@@ -591 +593 @@
 }
 
-LayoutUnit RenderFlexibleBox::preferredMainAxisContentExtentForChild(RenderBox* child) const
+LayoutUnit RenderFlexibleBox::preferredMainAxisContentExtentForChild(RenderBox* child)
 {
     Length flexBasis = flexBasisForChild(child);

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -84 +84 @@
     LayoutUnit mainAxisExtent() const;
     LayoutUnit crossAxisContentExtent() const;
-    LayoutUnit mainAxisContentExtent() const;
+    LayoutUnit mainAxisContentExtent();
     WritingMode transformedWritingMode() const;
     LayoutUnit flowAwareBorderStart() const;
@@ -106 +106 @@
     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>&);

trunk/Source/WebKit2/ChangeLog

@@ -13 +13 @@
         (WebKit::WebFrameLoaderClient::createJavaAppletWidget):
         Get the MIME type from the applet element.
+
+2012-07-27  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [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  Gyuyoung Kim  <gyuyoung.kim@samsung.com>