Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Issue 12326104: Merge 142866 (Closed)

Created:
7 years, 10 months ago by Peter Beverloo
Modified:
7 years, 10 months ago
Reviewers:
Peter Beverloo
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Visibility:
Public.

Description

Merge 142866 > [Text Autosizing] Process narrow descendants with the same multiplier for the font size. > https://bugs.webkit.org/show_bug.cgi?id=109573 > > Source/WebCore: > > Patch by Anton Vayvod <avayvod@chromium.org>; on 2013-02-14 > Reviewed by Julien Chaffraix. > > Combine narrow descendants of the same autosizing cluster into a group that is autosized > with the same multiplier. > > For example, on sites with a sidebar, sometimes the paragraphs next to the sidebar will have > a large margin individually applied (via a CSS selector), causing them all to individually > appear narrower than their enclosing blockContainingAllText. Rather than making each of > these paragraphs into a separate cluster, we want them all to share the same multiplier, as > if they were a single cluster. > > Test: fast/text-autosizing/narrow-descendants-combined.html > > * rendering/TextAutosizer.cpp: > (WebCore::TextAutosizer::processClusterInternal): > > Common implementation for processCluster() and processCompositeCluster that accepts the > text width and whether the cluster should be autosized as parameters instead of > calculating it inline. > > (WebCore::TextAutosizer::processCluster): > > Calculates the text width for a single cluster and whether it should be autosized, then > calls processClusterInternal() to apply the multiplier and process the cluster's > descendants. > > (WebCore::TextAutosizer::processCompositeCluster): > > Calculates the text width for a group of renderers and if the group should be autosized, > then calls processClusterInternal() repeatedly with the same multiplier to apply it and > process all the descendants of the group. > > (WebCore::TextAutosizer::clusterShouldBeAutosized): > > Calls the multiple renderers version to avoid code duplication. > > (WebCore::TextAutosizer::compositeClusterShouldBeAutosized): > > The multiple renderers version of clusterShouldBeAutosized. > > * rendering/TextAutosizer.h: > > Updated method declarations. > > LayoutTests: > > Test to verify that all narrow descendants of a cluster are autosized with the same > multiplier. > > Patch by Anton Vayvod <avayvod@chromium.org>; on 2013-02-14 > Reviewed by Julien Chaffraix. > > * fast/text-autosizing/narrow-descendants-combined-expected.html: Added. > * fast/text-autosizing/narrow-descendants-combined.html: Added. TBR=commit-queue@webkit.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=143930

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+40 lines, -16 lines) Patch
A + LayoutTests/fast/text-autosizing/narrow-descendants-combined.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/text-autosizing/narrow-descendants-combined-expected.html View 0 chunks +-1 lines, --1 lines 0 comments Download
M Source/WebCore/rendering/TextAutosizer.h View 2 chunks +3 lines, -0 lines 0 comments Download
M Source/WebCore/rendering/TextAutosizer.cpp View 4 chunks +39 lines, -18 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
Peter Beverloo
7 years, 10 months ago (2013-02-25 16:49:28 UTC) #1
Peter Beverloo
7 years, 10 months ago (2013-02-25 16:50:38 UTC) #2
Message was sent while issue was closed.
Committed patchset #1 manually as r143930.

Powered by Google App Engine
This is Rietveld 408576698