Merge 139435

Source/WebCore/ChangeLog

Index: Source/WebCore/ChangeLog
===================================================================
--- Source/WebCore/ChangeLog	(revision 139473)
+++ Source/WebCore/ChangeLog	(working copy)
@@ -1,5 +1,22 @@
-2012-12-18  Anton Vayvod  <avayvod@chromium.org>
+2013-01-11  Anton Vayvod  <avayvod@chromium.org>
 
+        Text Autosizing - elements much narrower than its parent autosizing clusters should be autosized separately.
+        https://bugs.webkit.org/show_bug.cgi?id=105188
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Some blocks of text might be narrower than their parent clusters and should be autosized separately.
+        This helps with autosizing for the pages implementing the sidebars as a narrow blocks of text with wide margins and
+        the main content being positioned atop this margin (or vice versa).
+
+        * rendering/TextAutosizer.cpp:
+        (WebCore::TextAutosizer::isContainerAutosizingCluster):
+
+            Returns true if the container is more than 200 pixels narrower than its parent cluster's lowest common
+            ancestor of all the text nodes.
+
+2013-01-11  Andreas Kling  <akling@apple.com>
+
         Text Autosizing: containers wider than their enclosing clusters should be autosized as separate clusters
         https://bugs.webkit.org/show_bug.cgi?id=103627