ChangeLog

2012-07-16  Beth Dakin  <bdakin@apple.com>

        https://bugs.webkit.org/show_bug.cgi?id=91299

        Paginated views should restrict available height to column height

        -and corresponding-

        <rdar://problem/11152108>

        Reviewed by NOBODY (OOPS!).

        Now that RenderViews can have columns, availableLogicalHeight needs to consider 

        that column height, much like how availableLogicalWidth already considers column 

        width.

        availableLogicalHeight is newly virtual, like the already-virtual 

        availableLogicalWidth.

        * rendering/RenderBox.h:

        (RenderBox):

        Check with the columnHeight.

        * rendering/RenderView.cpp:

        (WebCore):

        (WebCore::RenderView::availableLogicalHeight):

        * rendering/RenderView.h:

        setPagination now takes pageLength as an optional parameter. 

        * testing/InternalSettings.cpp:

        (WebCore::InternalSettings::setPagination):

        * testing/InternalSettings.h:

        (WebCore::InternalSettings::setPagination):

        (InternalSettings):

        * testing/InternalSettings.idl:

        * testing/Internals.cpp:

        (WebCore::Internals::setPagination):

        * testing/Internals.h:

        (WebCore::Internals::setPagination):

        (Internals):

        * testing/Internals.idl:

2012-07-16  Dana Jansens  <danakj@chromium.org>

        [chromium] Remove targetRenderSurface concept, give layers a renderTarget which is the layer whose coordinate space they draw into

122757

Source/WebCore/rendering/RenderBox.h

@@public:

    LayoutUnit computePercentageLogicalHeight(const Length& height);

356 // Block flows subclass availableWidth to handle multi column layout (shrinking the width available to children when laying out.)

356 // Block flows subclass availableWidth/Height to handle multi column layout (shrinking the width/height available to children when laying out.)

357357 virtual LayoutUnit availableLogicalWidth() const { return contentLogicalWidth(); }

358 LayoutUnit availableLogicalHeight() const;

358 virtual LayoutUnit availableLogicalHeight() const;

    LayoutUnit availableLogicalHeightUsing(const Length&) const;

    // There are a few cases where we need to refer specifically to the available physical width and available physical height.

122757

Source/WebCore/rendering/RenderView.cpp

@@void RenderView::computePreferredLogical

    RenderBlock::computePreferredLogicalWidths();

}

LayoutUnit RenderView::availableLogicalHeight() const

{

    // If we have columns, then the available logical height is reduced to the column height.

    if (hasColumns())

        return columnInfo()->columnHeight();

    return RenderBlock::availableLogicalHeight();

}

bool RenderView::isChildAllowed(RenderObject* child, RenderStyle*) const

{

    return child->isBox();

122757

Source/WebCore/rendering/RenderView.h

@@public:

    // it only exists to make computePreferredLogicalWidths public.

    virtual void computePreferredLogicalWidths() OVERRIDE;

66 virtual LayoutUnit availableLogicalHeight() const OVERRIDE;

67

    // The same as the FrameView's layoutHeight/layoutWidth but with null check guards.

    int viewHeight() const;

    int viewWidth() const;

122757

Source/WebCore/testing/InternalSettings.cpp

@@bool InternalSettings::shouldDisplayTrac

#endif

}

523 void InternalSettings::setPagination(const String& mode, int gap, ExceptionCode& ec)

523void InternalSettings::setPagination(const String& mode, int gap, int pageLength, ExceptionCode& ec)

{

    if (!page()) {

        ec = INVALID_ACCESS_ERR;

@@void InternalSettings::setPagination(con

    }

    pagination.gap = gap;

547 pagination.pageLength = pageLength;

    page()->setPagination(pagination);

}

122757

Source/WebCore/testing/InternalSettings.h

@@public:

    void setJavaScriptProfilingEnabled(bool enabled, ExceptionCode&);

    Vector<String> userPreferredLanguages() const;

    void setUserPreferredLanguages(const Vector<String>&);

127 void setPagination(const String& mode, int gap, ExceptionCode&);

127 void setPagination(const String& mode, int gap, ExceptionCode& ec) { setPagination(mode, gap, 0, ec); }

128 void setPagination(const String& mode, int gap, int pageLength, ExceptionCode&);

    void allowRoundingHacks() const;

    void setShouldDisplayTrackKind(const String& kind, bool enabled, ExceptionCode&);

    bool shouldDisplayTrackKind(const String& kind, ExceptionCode&);

122757

Source/WebCore/testing/InternalSettings.idl

@@module window {

        void setWindowFocusRestricted(in boolean restricted) raises(DOMException);

        void setDialogElementEnabled(in boolean enabled) raises(DOMException);

69 void setPagination(in DOMString mode, in long gap) raises(DOMException);

69 void setPagination(in DOMString mode, in long gap, in [Optional] long pageLength) raises(DOMException);

        sequence<String> userPreferredLanguages();

        void setUserPreferredLanguages(in sequence<String> languages);

        void allowRoundingHacks();

122757

Source/WebCore/testing/Internals.cpp

@@void Internals::setScrollViewPosition(Do

    frameView->setConstrainsScrollingToContentEdge(constrainsScrollingToContentEdgeOldValue);

}

631 void Internals::setPagination(Document*, const String& mode, int gap, ExceptionCode& ec)

631void Internals::setPagination(Document*, const String& mode, int gap, int pageLength, ExceptionCode& ec)

632632{

633 settings()->setPagination(mode, gap, ec);

633 settings()->setPagination(mode, gap, pageLength, ec);

}

String Internals::configurationForViewport(Document*, float devicePixelRatio, int deviceWidth, int deviceHeight, int availableWidth, int availableHeight, ExceptionCode& ec)

122757

Source/WebCore/testing/Internals.h

@@public:

    String markerDescriptionForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);

    void setScrollViewPosition(Document*, long x, long y, ExceptionCode&);

118 void setPagination(Document*, const String& mode, int gap, ExceptionCode&);

118 void setPagination(Document* document, const String& mode, int gap, ExceptionCode& ec) { setPagination(document, mode, gap, 0, ec); }

119 void setPagination(Document*, const String& mode, int gap, int pageLength, ExceptionCode&);

    String configurationForViewport(Document*, float devicePixelRatio, int deviceWidth, int deviceHeight, int availableWidth, int availableHeight, ExceptionCode&);

    bool wasLastChangeUserEdit(Element* textField, ExceptionCode&);

122757

Source/WebCore/testing/Internals.idl

@@module window {

        void setScrollViewPosition(in Document document, in long x, in long y) raises(DOMException);

89 void setPagination(in Document document, in DOMString mode, in long gap) raises(DOMException);

89 void setPagination(in Document document, in DOMString mode, in long gap, in [Optional] long pageLength) raises(DOMException);

        DOMString configurationForViewport(in Document document,

                                           in float devicePixelRatio,

122757

LayoutTests/ChangeLog

2012-07-16  Beth Dakin  <bdakin@apple.com>

        https://bugs.webkit.org/show_bug.cgi?id=91299

        Paginated views should restrict available height to column height

        -and corresponding-

        <rdar://problem/11152108>

        Reviewed by NOBODY (OOPS!).

        New test.

        * fast/multicol/resources/big-green.png: Added.

        * fast/multicol/shrink-to-column-height-for-pagination.html: Added.

        * platform/mac/fast/multicol/shrink-to-column-height-for-pagination-expected.png: Added.

        * platform/mac/fast/multicol/shrink-to-column-height-for-pagination-expected.txt: Added.

2012-07-16  Florin Malita  <fmalita@chromium.org>

        SVGAnimationElement::currentValuesForValuesAnimation crash

122757

LayoutTests/fast/multicol/shrink-to-column-height-for-pagination.html

<html style="-webkit-writing-mode: vertical-rl;">

<head>

    <script>

        if (window.internals)

            internals.setPagination(document, "RightToLeftPaginated", 0, 400);

    </script>

</head>

<body style="width:100%; height:100%;">

    <div style="width:100%; height:100%;">

        <img src="resources/big-green.png" style="width:100%; height:100%; max-width:100%; max-height:100%;"/>

    </div>

</body>

</html>

0

LayoutTests/platform/mac/fast/multicol/shrink-to-column-height-for-pagination-expected.txt

layer at (0,0) size 800x600

  RenderView at (0,0) size 400x600

layer at (-400,0) size 800x600 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600

  RenderBlock {HTML} at (0,0) size 800x600

    RenderBody {BODY} at (8,8) size 400x600

      RenderBlock {DIV} at (0,0) size 400x600

        RenderImage {IMG} at (392,0) size 400x600

        RenderText {#text} at (0,0) size 0x0

scrolled to -385,0

0

LayoutTests/fast/multicol/resources/big-green.png

LayoutTests/platform/mac/fast/multicol/shrink-to-column-height-for-pagination-expected.png

87a3b37d05d9dcf0180d6763bcebc146