| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 | 28 |
| 29 #include <math.h> | 29 #include <math.h> |
| 30 #include <algorithm> | 30 #include <algorithm> |
| 31 #include "HTMLNames.h" | 31 #include "HTMLNames.h" |
| 32 #include "core/dom/Document.h" | 32 #include "core/dom/Document.h" |
| 33 #include "core/dom/WebCoreMemoryInstrumentation.h" | 33 #include "core/dom/WebCoreMemoryInstrumentation.h" |
| 34 #include "core/editing/htmlediting.h" | 34 #include "core/editing/htmlediting.h" |
| 35 #include "core/html/HTMLElement.h" | 35 #include "core/html/HTMLElement.h" |
| 36 #include "core/html/HTMLFrameOwnerElement.h" | 36 #include "core/html/HTMLFrameOwnerElement.h" |
| 37 #include "core/html/HTMLHtmlElement.h" | 37 #include "core/html/HTMLHtmlElement.h" |
| 38 #include "core/html/HTMLTextAreaElement.h" |
| 38 #include "core/page/Frame.h" | 39 #include "core/page/Frame.h" |
| 39 #include "core/page/FrameView.h" | 40 #include "core/page/FrameView.h" |
| 40 #include "core/page/Page.h" | 41 #include "core/page/Page.h" |
| 41 #include "core/platform/graphics/FloatQuad.h" | 42 #include "core/platform/graphics/FloatQuad.h" |
| 42 #include "core/platform/graphics/GraphicsContextStateSaver.h" | 43 #include "core/platform/graphics/GraphicsContextStateSaver.h" |
| 43 #include "core/platform/graphics/transforms/TransformState.h" | 44 #include "core/platform/graphics/transforms/TransformState.h" |
| 44 #include "core/rendering/HitTestResult.h" | 45 #include "core/rendering/HitTestResult.h" |
| 45 #include "core/rendering/PaintInfo.h" | 46 #include "core/rendering/PaintInfo.h" |
| 46 #include "core/rendering/RenderBoxRegionInfo.h" | 47 #include "core/rendering/RenderBoxRegionInfo.h" |
| 47 #include "core/rendering/RenderFlexibleBox.h" | 48 #include "core/rendering/RenderFlexibleBox.h" |
| (...skipping 2226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2274 // that don't stretch their kids lay out their children at their intrinsic w
idths. | 2275 // that don't stretch their kids lay out their children at their intrinsic w
idths. |
| 2275 // FIXME: Think about block-flow here. | 2276 // FIXME: Think about block-flow here. |
| 2276 // https://bugs.webkit.org/show_bug.cgi?id=46473 | 2277 // https://bugs.webkit.org/show_bug.cgi?id=46473 |
| 2277 if (parent()->isDeprecatedFlexibleBox() && (parent()->style()->boxOrient() =
= HORIZONTAL || parent()->style()->boxAlign() != BSTRETCH)) | 2278 if (parent()->isDeprecatedFlexibleBox() && (parent()->style()->boxOrient() =
= HORIZONTAL || parent()->style()->boxAlign() != BSTRETCH)) |
| 2278 return true; | 2279 return true; |
| 2279 | 2280 |
| 2280 // Button, input, select, textarea, and legend treat width value of 'auto' a
s 'intrinsic' unless it's in a | 2281 // Button, input, select, textarea, and legend treat width value of 'auto' a
s 'intrinsic' unless it's in a |
| 2281 // stretching column flexbox. | 2282 // stretching column flexbox. |
| 2282 // FIXME: Think about block-flow here. | 2283 // FIXME: Think about block-flow here. |
| 2283 // https://bugs.webkit.org/show_bug.cgi?id=46473 | 2284 // https://bugs.webkit.org/show_bug.cgi?id=46473 |
| 2284 if (logicalWidth.type() == Auto && !isStretchingColumnFlexItem(this) && node
() && (node()->hasTagName(inputTag) || node()->hasTagName(selectTag) || node()->
hasTagName(buttonTag) || node()->hasTagName(textareaTag) || node()->hasTagName(l
egendTag))) | 2285 if (logicalWidth.type() == Auto && !isStretchingColumnFlexItem(this) && node
() && (node()->hasTagName(inputTag) |
| 2286 || node()->hasTagName(selectTag) || node()->hasTagName(buttonTag) || isH
TMLTextAreaElement(node()) || node()->hasTagName(legendTag))) |
| 2285 return true; | 2287 return true; |
| 2286 | 2288 |
| 2287 if (isHorizontalWritingMode() != containingBlock()->isHorizontalWritingMode(
)) | 2289 if (isHorizontalWritingMode() != containingBlock()->isHorizontalWritingMode(
)) |
| 2288 return true; | 2290 return true; |
| 2289 | 2291 |
| 2290 return false; | 2292 return false; |
| 2291 } | 2293 } |
| 2292 | 2294 |
| 2293 void RenderBox::computeInlineDirectionMargins(RenderBlock* containingBlock, Layo
utUnit containerWidth, LayoutUnit childWidth, LayoutUnit& marginStart, LayoutUni
t& marginEnd) const | 2295 void RenderBox::computeInlineDirectionMargins(RenderBlock* containingBlock, Layo
utUnit containerWidth, LayoutUnit childWidth, LayoutUnit& marginStart, LayoutUni
t& marginEnd) const |
| 2294 { | 2296 { |
| (...skipping 2352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4647 | 4649 |
| 4648 void RenderBox::reportStaticMembersMemoryUsage(MemoryInstrumentation* memoryInst
rumentation) | 4650 void RenderBox::reportStaticMembersMemoryUsage(MemoryInstrumentation* memoryInst
rumentation) |
| 4649 { | 4651 { |
| 4650 memoryInstrumentation->addRootObject(gOverrideHeightMap, WebCoreMemoryTypes:
:RenderingStructures); | 4652 memoryInstrumentation->addRootObject(gOverrideHeightMap, WebCoreMemoryTypes:
:RenderingStructures); |
| 4651 memoryInstrumentation->addRootObject(gOverrideWidthMap, WebCoreMemoryTypes::
RenderingStructures); | 4653 memoryInstrumentation->addRootObject(gOverrideWidthMap, WebCoreMemoryTypes::
RenderingStructures); |
| 4652 memoryInstrumentation->addRootObject(gOverrideContainingBlockLogicalHeightMa
p, WebCoreMemoryTypes::RenderingStructures); | 4654 memoryInstrumentation->addRootObject(gOverrideContainingBlockLogicalHeightMa
p, WebCoreMemoryTypes::RenderingStructures); |
| 4653 memoryInstrumentation->addRootObject(gOverrideContainingBlockLogicalWidthMap
, WebCoreMemoryTypes::RenderingStructures); | 4655 memoryInstrumentation->addRootObject(gOverrideContainingBlockLogicalWidthMap
, WebCoreMemoryTypes::RenderingStructures); |
| 4654 } | 4656 } |
| 4655 | 4657 |
| 4656 } // namespace WebCore | 4658 } // namespace WebCore |
| OLD | NEW |