| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Apple Inc. All rights reserved. | 3 * Copyright (C) 2012 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Library General Public License for more details. | 13 * Library General Public License for more details. |
| 14 * | 14 * |
| 15 * You should have received a copy of the GNU Library General Public License | 15 * You should have received a copy of the GNU Library General Public License |
| 16 * along with this library; see the file COPYING.LIB. If not, write to | 16 * along with this library; see the file COPYING.LIB. If not, write to |
| 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 18 * Boston, MA 02110-1301, USA. | 18 * Boston, MA 02110-1301, USA. |
| 19 */ | 19 */ |
| 20 | 20 |
| 21 #include "config.h" | 21 #include "config.h" |
| 22 #include "core/rendering/TextAutosizer.h" |
| 22 | 23 |
| 23 #include "core/rendering/TextAutosizer.h" | 24 #include <algorithm> |
| 24 | 25 |
| 25 #include "core/dom/Document.h" | 26 #include "core/dom/Document.h" |
| 26 #include "core/html/HTMLElement.h" | 27 #include "core/html/HTMLElement.h" |
| 27 #include "core/inspector/InspectorInstrumentation.h" | 28 #include "core/inspector/InspectorInstrumentation.h" |
| 28 #include "core/page/Settings.h" | 29 #include "core/page/Settings.h" |
| 29 #include "core/platform/chromium/TraceEvent.h" | 30 #include "core/platform/chromium/TraceEvent.h" |
| 30 #include "core/platform/graphics/IntSize.h" | 31 #include "core/platform/graphics/IntSize.h" |
| 31 #include "core/rendering/RenderListItem.h" | 32 #include "core/rendering/RenderListItem.h" |
| 32 #include "core/rendering/RenderObject.h" | 33 #include "core/rendering/RenderObject.h" |
| 33 #include "core/rendering/RenderText.h" | 34 #include "core/rendering/RenderText.h" |
| 34 #include "core/rendering/RenderView.h" | 35 #include "core/rendering/RenderView.h" |
| 35 #include "core/rendering/style/RenderStyle.h" | 36 #include "core/rendering/style/RenderStyle.h" |
| 36 #include "core/rendering/style/StyleInheritedData.h" | 37 #include "core/rendering/style/StyleInheritedData.h" |
| 37 | 38 #include "wtf/StdLibExtras.h" |
| 38 #include <algorithm> | 39 #include "wtf/Vector.h" |
| 39 #include <wtf/StdLibExtras.h> | |
| 40 #include <wtf/Vector.h> | |
| 41 | 40 |
| 42 namespace WebCore { | 41 namespace WebCore { |
| 43 | 42 |
| 44 using namespace HTMLNames; | 43 using namespace HTMLNames; |
| 45 | 44 |
| 46 struct TextAutosizingWindowInfo { | 45 struct TextAutosizingWindowInfo { |
| 47 IntSize windowSize; | 46 IntSize windowSize; |
| 48 IntSize minLayoutSize; | 47 IntSize minLayoutSize; |
| 49 }; | 48 }; |
| 50 | 49 |
| (...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 if (i + 1 < clusterInfos.size()) { | 660 if (i + 1 < clusterInfos.size()) { |
| 662 float currentWidth = clusterInfos[i].root->contentLogicalWidth(); | 661 float currentWidth = clusterInfos[i].root->contentLogicalWidth(); |
| 663 float nextWidth = clusterInfos[i + 1].root->contentLogicalWidth(); | 662 float nextWidth = clusterInfos[i + 1].root->contentLogicalWidth(); |
| 664 if (currentWidth - nextWidth > maxWidthDifferenceWithinGroup) | 663 if (currentWidth - nextWidth > maxWidthDifferenceWithinGroup) |
| 665 groups.grow(groups.size() + 1); | 664 groups.grow(groups.size() + 1); |
| 666 } | 665 } |
| 667 } | 666 } |
| 668 } | 667 } |
| 669 | 668 |
| 670 } // namespace WebCore | 669 } // namespace WebCore |
| OLD | NEW |