OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 15 matching lines...) Loading... | |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "core/rendering/RenderBlockFlow.h" | 32 #include "core/rendering/RenderBlockFlow.h" |
33 | 33 |
34 #include "core/accessibility/AXObjectCache.h" | 34 #include "core/accessibility/AXObjectCache.h" |
35 #include "core/frame/FrameView.h" | 35 #include "core/frame/FrameView.h" |
36 #include "core/frame/LocalFrame.h" | |
37 #include "core/frame/Settings.h" | |
36 #include "core/rendering/HitTestLocation.h" | 38 #include "core/rendering/HitTestLocation.h" |
37 #include "core/rendering/RenderFlowThread.h" | 39 #include "core/rendering/RenderFlowThread.h" |
38 #include "core/rendering/RenderLayer.h" | 40 #include "core/rendering/RenderLayer.h" |
39 #include "core/rendering/RenderMultiColumnFlowThread.h" | 41 #include "core/rendering/RenderMultiColumnFlowThread.h" |
40 #include "core/rendering/RenderPagedFlowThread.h" | 42 #include "core/rendering/RenderPagedFlowThread.h" |
41 #include "core/rendering/RenderText.h" | 43 #include "core/rendering/RenderText.h" |
42 #include "core/rendering/RenderView.h" | 44 #include "core/rendering/RenderView.h" |
43 #include "core/rendering/TextAutosizer.h" | 45 #include "core/rendering/TextAutosizer.h" |
44 #include "core/rendering/line/LineWidth.h" | 46 #include "core/rendering/line/LineWidth.h" |
45 #include "core/rendering/svg/SVGTextRunRenderingContext.h" | 47 #include "core/rendering/svg/SVGTextRunRenderingContext.h" |
(...skipping 1730 matching lines...) Loading... | |
1776 RenderBlock::computeOverflow(oldClientAfterEdge, recomputeFloats); | 1778 RenderBlock::computeOverflow(oldClientAfterEdge, recomputeFloats); |
1777 if (!hasColumns() && (recomputeFloats || createsBlockFormattingContext() || hasSelfPaintingLayer())) | 1779 if (!hasColumns() && (recomputeFloats || createsBlockFormattingContext() || hasSelfPaintingLayer())) |
1778 addOverflowFromFloats(); | 1780 addOverflowFromFloats(); |
1779 } | 1781 } |
1780 | 1782 |
1781 RootInlineBox* RenderBlockFlow::createAndAppendRootInlineBox() | 1783 RootInlineBox* RenderBlockFlow::createAndAppendRootInlineBox() |
1782 { | 1784 { |
1783 RootInlineBox* rootBox = createRootInlineBox(); | 1785 RootInlineBox* rootBox = createRootInlineBox(); |
1784 m_lineBoxes.appendLineBox(rootBox); | 1786 m_lineBoxes.appendLineBox(rootBox); |
1785 | 1787 |
1786 if (UNLIKELY(AXObjectCache::accessibilityEnabled()) && m_lineBoxes.firstLine Box() == rootBox) { | 1788 Settings* settings = frame()->settings(); |
1789 if (UNLIKELY(settings && settings->accessibilityEnabled()) && m_lineBoxes.fi rstLineBox() == rootBox) { | |
abarth-chromium
2014/08/23 05:59:11
This is sad. We're adding a ton more branches to
aboxhall
2014/08/27 15:26:33
I don't follow.
dmazzoni
2014/08/27 16:17:15
I think Adam is saying that this function (createA
| |
1787 if (AXObjectCache* cache = document().existingAXObjectCache()) | 1790 if (AXObjectCache* cache = document().existingAXObjectCache()) |
1788 cache->recomputeIsIgnored(this); | 1791 cache->recomputeIsIgnored(this); |
1789 } | 1792 } |
1790 | 1793 |
1791 return rootBox; | 1794 return rootBox; |
1792 } | 1795 } |
1793 | 1796 |
1794 void RenderBlockFlow::deleteLineBoxTree() | 1797 void RenderBlockFlow::deleteLineBoxTree() |
1795 { | 1798 { |
1796 if (containsFloats()) | 1799 if (containsFloats()) |
(...skipping 1128 matching lines...) Loading... | |
2925 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() | 2928 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() |
2926 { | 2929 { |
2927 if (m_rareData) | 2930 if (m_rareData) |
2928 return *m_rareData; | 2931 return *m_rareData; |
2929 | 2932 |
2930 m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this)); | 2933 m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this)); |
2931 return *m_rareData; | 2934 return *m_rareData; |
2932 } | 2935 } |
2933 | 2936 |
2934 } // namespace blink | 2937 } // namespace blink |
OLD | NEW |