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 22 matching lines...) Expand all Loading... |
33 #include "core/frame/FrameView.h" | 33 #include "core/frame/FrameView.h" |
34 #include "core/frame/LocalFrame.h" | 34 #include "core/frame/LocalFrame.h" |
35 #include "core/frame/PinchViewport.h" | 35 #include "core/frame/PinchViewport.h" |
36 #include "core/frame/Settings.h" | 36 #include "core/frame/Settings.h" |
37 #include "core/html/HTMLElement.h" | 37 #include "core/html/HTMLElement.h" |
38 #include "core/html/HTMLFrameElementBase.h" | 38 #include "core/html/HTMLFrameElementBase.h" |
39 #include "core/html/HTMLFrameOwnerElement.h" | 39 #include "core/html/HTMLFrameOwnerElement.h" |
40 #include "core/layout/HitTestResult.h" | 40 #include "core/layout/HitTestResult.h" |
41 #include "core/layout/Layer.h" | 41 #include "core/layout/Layer.h" |
42 #include "core/layout/LayoutGeometryMap.h" | 42 #include "core/layout/LayoutGeometryMap.h" |
| 43 #include "core/layout/LayoutListBox.h" |
| 44 #include "core/layout/LayoutListMarker.h" |
43 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" | 45 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" |
44 #include "core/layout/LayoutScrollbarPart.h" | 46 #include "core/layout/LayoutScrollbarPart.h" |
45 #include "core/layout/LayoutTableCell.h" | 47 #include "core/layout/LayoutTableCell.h" |
46 #include "core/layout/PaintInfo.h" | 48 #include "core/layout/PaintInfo.h" |
47 #include "core/layout/compositing/LayerCompositor.h" | 49 #include "core/layout/compositing/LayerCompositor.h" |
48 #include "core/layout/style/ShadowList.h" | 50 #include "core/layout/style/ShadowList.h" |
49 #include "core/page/AutoscrollController.h" | 51 #include "core/page/AutoscrollController.h" |
50 #include "core/page/EventHandler.h" | 52 #include "core/page/EventHandler.h" |
51 #include "core/page/Page.h" | 53 #include "core/page/Page.h" |
52 #include "core/paint/BackgroundImageGeometry.h" | 54 #include "core/paint/BackgroundImageGeometry.h" |
53 #include "core/paint/BoxPainter.h" | 55 #include "core/paint/BoxPainter.h" |
54 #include "core/rendering/RenderDeprecatedFlexibleBox.h" | 56 #include "core/rendering/RenderDeprecatedFlexibleBox.h" |
55 #include "core/rendering/RenderFlexibleBox.h" | 57 #include "core/rendering/RenderFlexibleBox.h" |
56 #include "core/rendering/RenderGrid.h" | 58 #include "core/rendering/RenderGrid.h" |
57 #include "core/rendering/RenderInline.h" | 59 #include "core/rendering/RenderInline.h" |
58 #include "core/rendering/RenderListBox.h" | |
59 #include "core/rendering/RenderListMarker.h" | |
60 #include "core/rendering/RenderView.h" | 60 #include "core/rendering/RenderView.h" |
61 #include "platform/LengthFunctions.h" | 61 #include "platform/LengthFunctions.h" |
62 #include "platform/geometry/FloatQuad.h" | 62 #include "platform/geometry/FloatQuad.h" |
63 #include "platform/geometry/FloatRoundedRect.h" | 63 #include "platform/geometry/FloatRoundedRect.h" |
64 #include "platform/geometry/TransformState.h" | 64 #include "platform/geometry/TransformState.h" |
65 #include "platform/graphics/paint/DisplayItemList.h" | 65 #include "platform/graphics/paint/DisplayItemList.h" |
66 #include <algorithm> | 66 #include <algorithm> |
67 #include <math.h> | 67 #include <math.h> |
68 | 68 |
69 namespace blink { | 69 namespace blink { |
(...skipping 1851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1921 continue; | 1921 continue; |
1922 | 1922 |
1923 RenderBox* listItem = toRenderBox(child); | 1923 RenderBox* listItem = toRenderBox(child); |
1924 for (LayoutObject* itemChild = listItem->slowFirstChild(); itemChild; it
emChild = itemChild->nextSibling()) { | 1924 for (LayoutObject* itemChild = listItem->slowFirstChild(); itemChild; it
emChild = itemChild->nextSibling()) { |
1925 if (!itemChild->isListMarker()) | 1925 if (!itemChild->isListMarker()) |
1926 continue; | 1926 continue; |
1927 RenderBox* itemMarker = toRenderBox(itemChild); | 1927 RenderBox* itemMarker = toRenderBox(itemChild); |
1928 // Make sure to compute the autosized width. | 1928 // Make sure to compute the autosized width. |
1929 if (itemMarker->needsLayout()) | 1929 if (itemMarker->needsLayout()) |
1930 itemMarker->layout(); | 1930 itemMarker->layout(); |
1931 maxWidth = std::max<float>(maxWidth, toRenderListMarker(itemMarker)-
>logicalWidth().toFloat()); | 1931 maxWidth = std::max<float>(maxWidth, toLayoutListMarker(itemMarker)-
>logicalWidth().toFloat()); |
1932 break; | 1932 break; |
1933 } | 1933 } |
1934 } | 1934 } |
1935 return maxWidth; | 1935 return maxWidth; |
1936 } | 1936 } |
1937 | 1937 |
1938 void RenderBox::computeLogicalWidth(LogicalExtentComputedValues& computedValues)
const | 1938 void RenderBox::computeLogicalWidth(LogicalExtentComputedValues& computedValues)
const |
1939 { | 1939 { |
1940 computedValues.m_extent = logicalWidth(); | 1940 computedValues.m_extent = logicalWidth(); |
1941 computedValues.m_position = logicalLeft(); | 1941 computedValues.m_position = logicalLeft(); |
(...skipping 2681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4623 } | 4623 } |
4624 | 4624 |
4625 void RenderBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c
onst | 4625 void RenderBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c
onst |
4626 { | 4626 { |
4627 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList); | 4627 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList); |
4628 if (LayerScrollableArea* area = scrollableArea()) | 4628 if (LayerScrollableArea* area = scrollableArea()) |
4629 displayItemList->invalidate(area->displayItemClient()); | 4629 displayItemList->invalidate(area->displayItemClient()); |
4630 } | 4630 } |
4631 | 4631 |
4632 } // namespace blink | 4632 } // namespace blink |
OLD | NEW |