ChangeLog

2013-02-07  Anton Vayvod  <avayvod@chromium.org>

        [Text Autosizing] Refactor isAutosizingCluster.

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

        Refactoring to create more flexible version of isAutosizingCluster since there're more types

        of autosizing cluster now: narrower than the parent cluster, wider than the parent cluster

        and the one that doesn't depend on the parent cluster.

        Reviewed by NOBODY (OOPS!).

        Refactoring, no test changes.

        * rendering/TextAutosizer.cpp:

        (WebCore::TextAutosizer::isNarrowDescendant):

            Separate check for the container to be of the narrow-descendant type. Was a part of

            isAutosizingCluster().

        (WebCore::TextAutosizer::isWiderDescendant):

            Separate check for the container to be of the wider-descendant type. Was a part of

            isAutosizingCluster().

        (WebCore::TextAutosizer::isIndependentDescendant):

            Separate check for the container to be autosized separately from the ancestor cluster.

            Checks for conditions independent of the aforementioned cluster.

        (WebCore::TextAutosizer::isAutosizingCluster):

            Handful method to check all separate conditions together.

        (WebCore::TextAutosizer::processSubtree):

        (WebCore::TextAutosizer::processCluster):

        (WebCore::TextAutosizer::processContainer):

        (WebCore::TextAutosizer::clusterShouldBeAutosized):

        (WebCore::TextAutosizer::measureDescendantTextWidth):

        (WebCore::TextAutosizer::findFirstTextLeafNotInCluster):

            The methods above were updated to use new functions/arguments.

        * rendering/TextAutosizer.h:

            Updated/added method definitions.

2013-02-06  Tom Sepez  <tsepez@chromium.org>

        document.referrer leakage with XSS Auditor page block

Source/WebCore/rendering/TextAutosizer.cpp

@@bool TextAutosizer::processSubtree(RenderObject* layoutRoot)

        container = container->containingBlock();

    RenderBlock* cluster = container;

122 while (cluster && !isAutosizingC~~lus~~ter(cluster))

122 while (cluster && (!isAutosizingContainer(cluster) || !isIndependentDescendant(cluster)))

        cluster = cluster->containingBlock();

    TextAutosizingClusterInfo clusterInfo(cluster);

@@bool TextAutosizer::isAutosizingContainer(const RenderObject* renderer)

    return true;

}

238 bool TextAutosizer::isAutosizingCluster(const RenderBlock* renderer, TextAutosizingClusterInfo* parentClusterInfo)

bool TextAutosizer::isNarrowDescendant(const RenderBlock* renderer, TextAutosizingClusterInfo* parentClusterInfo)

{

    // Autosizing containers that are significantly narrower than the |blockContainingAllText| of

    // their enclosing cluster need to be autosized separately and thus treated the same way as

    // autosizing clusters.

    // If however the container is only narrower by 200 CSS units or less, it's considered a part of

    // the enclosing cluster and this upper limit of 200 units is a

    float contentWidth = renderer->contentLogicalWidth();

    float clusterTextWidth = parentClusterInfo->blockContainingAllText->contentLogicalWidth();

    // The upper limit on how many pixels the difference between the renderer width

    // and its parent cluster width can exceed the current maximum difference by

    // before the object is considered to be a separate autosizing cluster.

    const float differenceFromMaxWidthDifference = 50;

    float widthDifference = clusterTextWidth - contentWidth;

    if (widthDifference - parentClusterInfo->maxAllowedDifferenceFromTextWidth > differenceFromMaxWidthDifference)

        return true;

    parentClusterInfo->maxAllowedDifferenceFromTextWidth = std::max(widthDifference, parentClusterInfo->maxAllowedDifferenceFromTextWidth);

    return false;

}

bool TextAutosizer::isWiderDescendant(const RenderBlock* renderer, const TextAutosizingClusterInfo* parentClusterInfo)

{

    // Autosizing containers that are wider than the |blockContainingAllText| of their enclosing

    // cluster are treated the same way as autosizing clusters to be autosized separately.

    float contentWidth = renderer->contentLogicalWidth();

    float clusterTextWidth = parentClusterInfo->blockContainingAllText->contentLogicalWidth();

    return contentWidth > clusterTextWidth;

}

bool TextAutosizer::isIndependentDescendant(const RenderBlock* renderer)

{

    // "Autosizing clusters" are special autosizing containers within which we

    // want to enforce a uniform text size multiplier, in the hopes of making

@@bool TextAutosizer::isAutosizingCluster(const RenderBlock* renderer, TextAutosiz

    // from the box's parent (we want to avoid having significantly different

    // width blocks within a cluster, since the narrower blocks would end up

    // larger than would otherwise be necessary).

    // Additionally, any containers that are wider or at least 200px narrower than

    // the |blockContainingAllText| of their enclosing cluster also become clusters,

    // since they need special treatment due to their width.

    ASSERT(isAutosizingContainer(renderer));

    if (parentClusterInfo->blockContainingAllText) {

        float contentWidth = renderer->contentLogicalWidth();

        float clusterTextWidth = parentClusterInfo->blockContainingAllText->contentLogicalWidth();

        if (contentWidth > clusterTextWidth)

            return true;

        // The upper limit on how many pixels the difference between the renderer width

        // and its parent cluster width can exceed the current maximum difference by

        // before the object is considered to be a separate autosizing cluster.

        const float differenceFromMaxWidthDifference = 50;

        float widthDifference = clusterTextWidth - contentWidth;

        if (widthDifference - parentClusterInfo->maxAllowedDifferenceFromTextWidth > differenceFromMaxWidthDifference)

            return true;

        parentClusterInfo->maxAllowedDifferenceFromTextWidth = std::max(widthDifference, parentClusterInfo->maxAllowedDifferenceFromTextWidth);

    }

    return renderer->isRenderView()

        || renderer->isFloating()

        || renderer->isOutOfFlowPositioned()

@@bool TextAutosizer::isAutosizingCluster(const RenderBlock* renderer, TextAutosiz

    // containers, and probably flexboxes...

}

295 bool TextAutosizer::isAutosizingCluster(const Render~~Obje~~ct* ~~obj~~ect)

304bool TextAutosizer::isAutosizingCluster(const RenderBlock* renderer, TextAutosizingClusterInfo* parentClusterInfo)

296305{

297 TextAutosizingClusterInfo emptyClusterInfo(0);

298 return isAutosizingContainer(object) && isAutosizingCluster(toRenderBlock(object), &emptyClusterInfo);

    return isNarrowDescendant(renderer, parentClusterInfo)

        || isWiderDescendant(renderer, parentClusterInfo)

        || isIndependentDescendant(renderer);

}

bool TextAutosizer::containerShouldBeAutosized(const RenderBlock* container)

@@const RenderObject* TextAutosizer::findFirstTextLeafNotInCluster(const RenderObj

    ++depth;

    const RenderObject* child = (direction == FirstToLast) ? parent->firstChild() : parent->lastChild();

    while (child) {

489 if (!isAutosizingC~~lus~~ter(child)) {

499 if (!isAutosizingContainer(child) || !isIndependentDescendant(toRenderBlock(child))) {

            const RenderObject* leaf = findFirstTextLeafNotInCluster(child, depth, direction);

            if (leaf)

                return leaf;

Source/WebCore/ChangeLog

Source/WebCore/rendering/TextAutosizer.cpp

Source/WebCore/rendering/TextAutosizer.h