OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008 Apple 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 11 matching lines...) Expand all Loading... |
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 */ | 27 */ |
28 | 28 |
29 #include "config.h" | 29 #include "config.h" |
30 #include "core/rendering/RenderLineBoxList.h" | 30 #include "core/rendering/RenderLineBoxList.h" |
31 | 31 |
| 32 #include "core/paint/InlinePainter.h" |
32 #include "core/rendering/HitTestResult.h" | 33 #include "core/rendering/HitTestResult.h" |
33 #include "core/rendering/InlineTextBox.h" | 34 #include "core/rendering/InlineTextBox.h" |
34 #include "core/rendering/PaintInfo.h" | 35 #include "core/rendering/PaintInfo.h" |
35 #include "core/rendering/RenderInline.h" | 36 #include "core/rendering/RenderInline.h" |
36 #include "core/rendering/RenderView.h" | 37 #include "core/rendering/RenderView.h" |
37 #include "core/rendering/RootInlineBox.h" | 38 #include "core/rendering/RootInlineBox.h" |
38 | 39 |
39 namespace blink { | 40 namespace blink { |
40 | 41 |
41 #if ENABLE(ASSERT) | 42 #if ENABLE(ASSERT) |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 if (lineIntersectsDirtyRect(renderer, curr, info, paintOffset)) { | 220 if (lineIntersectsDirtyRect(renderer, curr, info, paintOffset)) { |
220 RootInlineBox& root = curr->root(); | 221 RootInlineBox& root = curr->root(); |
221 curr->paint(info, paintOffset, root.lineTop(), root.lineBottom()); | 222 curr->paint(info, paintOffset, root.lineTop(), root.lineBottom()); |
222 } | 223 } |
223 } | 224 } |
224 | 225 |
225 if (info.phase == PaintPhaseOutline || info.phase == PaintPhaseSelfOutline |
| info.phase == PaintPhaseChildOutlines) { | 226 if (info.phase == PaintPhaseOutline || info.phase == PaintPhaseSelfOutline |
| info.phase == PaintPhaseChildOutlines) { |
226 ListHashSet<RenderInline*>::iterator end = info.outlineObjects()->end(); | 227 ListHashSet<RenderInline*>::iterator end = info.outlineObjects()->end(); |
227 for (ListHashSet<RenderInline*>::iterator it = info.outlineObjects()->be
gin(); it != end; ++it) { | 228 for (ListHashSet<RenderInline*>::iterator it = info.outlineObjects()->be
gin(); it != end; ++it) { |
228 RenderInline* flow = *it; | 229 RenderInline* flow = *it; |
229 flow->paintOutline(info, paintOffset); | 230 InlinePainter(*flow).paintOutline(info, paintOffset); |
230 } | 231 } |
231 info.outlineObjects()->clear(); | 232 info.outlineObjects()->clear(); |
232 } | 233 } |
233 } | 234 } |
234 | 235 |
235 bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestReq
uest& request, HitTestResult& result, const HitTestLocation& locationInContainer
, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction) const | 236 bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestReq
uest& request, HitTestResult& result, const HitTestLocation& locationInContainer
, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction) const |
236 { | 237 { |
237 if (hitTestAction != HitTestForeground) | 238 if (hitTestAction != HitTestForeground) |
238 return false; | 239 return false; |
239 | 240 |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 ASSERT(child->prevLineBox() == prev); | 367 ASSERT(child->prevLineBox() == prev); |
367 prev = child; | 368 prev = child; |
368 } | 369 } |
369 ASSERT(prev == m_lastLineBox); | 370 ASSERT(prev == m_lastLineBox); |
370 #endif | 371 #endif |
371 } | 372 } |
372 | 373 |
373 #endif | 374 #endif |
374 | 375 |
375 } | 376 } |
OLD | NEW |