Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderLineBoxList.cpp

Issue 21184: WebKit merge 40722:40785 (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 m_lastLineBox = 0; 137 m_lastLineBox = 0;
138 } 138 }
139 } 139 }
140 140
141 void RenderLineBoxList::dirtyLineBoxes() 141 void RenderLineBoxList::dirtyLineBoxes()
142 { 142 {
143 for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) 143 for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox())
144 curr->dirtyLineBoxes(); 144 curr->dirtyLineBoxes();
145 } 145 }
146 146
147 void RenderLineBoxList::paint(RenderBox* renderer, RenderObject::PaintInfo& pain tInfo, int tx, int ty) const 147 void RenderLineBoxList::paint(RenderBoxModelObject* renderer, RenderObject::Pain tInfo& paintInfo, int tx, int ty) const
148 { 148 {
149 // Only paint during the foreground/selection phases. 149 // Only paint during the foreground/selection phases.
150 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhase Selection && paintInfo.phase != PaintPhaseOutline 150 if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhase Selection && paintInfo.phase != PaintPhaseOutline
151 && paintInfo.phase != PaintPhaseSelfOutline && paintInfo.phase != PaintP haseChildOutlines && paintInfo.phase != PaintPhaseTextClip 151 && paintInfo.phase != PaintPhaseSelfOutline && paintInfo.phase != PaintP haseChildOutlines && paintInfo.phase != PaintPhaseTextClip
152 && paintInfo.phase != PaintPhaseMask) 152 && paintInfo.phase != PaintPhaseMask)
153 return; 153 return;
154 154
155 ASSERT(renderer->isRenderBlock() || (renderer->isRenderInline() && renderer- >hasLayer())); // The only way an inline could paint like this is if it has a la yer. 155 ASSERT(renderer->isRenderBlock() || (renderer->isRenderInline() && renderer- >hasLayer())); // The only way an inline could paint like this is if it has a la yer.
156 156
157 // If we have no lines then we have no work to do. 157 // If we have no lines then we have no work to do.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 ListHashSet<RenderInline*>::iterator end = info.outlineObjects->end(); 207 ListHashSet<RenderInline*>::iterator end = info.outlineObjects->end();
208 for (ListHashSet<RenderInline*>::iterator it = info.outlineObjects->begi n(); it != end; ++it) { 208 for (ListHashSet<RenderInline*>::iterator it = info.outlineObjects->begi n(); it != end; ++it) {
209 RenderInline* flow = *it; 209 RenderInline* flow = *it;
210 flow->paintOutline(info.context, tx, ty); 210 flow->paintOutline(info.context, tx, ty);
211 } 211 }
212 info.outlineObjects->clear(); 212 info.outlineObjects->clear();
213 } 213 }
214 } 214 }
215 215
216 216
217 bool RenderLineBoxList::hitTest(RenderBox* renderer, const HitTestRequest& reque st, HitTestResult& result, int x, int y, int tx, int ty, HitTestAction hitTestAc tion) const 217 bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestReq uest& request, HitTestResult& result, int x, int y, int tx, int ty, HitTestActio n hitTestAction) const
218 { 218 {
219 if (hitTestAction != HitTestForeground) 219 if (hitTestAction != HitTestForeground)
220 return false; 220 return false;
221 221
222 ASSERT(renderer->isRenderBlock() || (renderer->isRenderInline() && renderer- >hasLayer())); // The only way an inline could hit test like this is if it has a layer. 222 ASSERT(renderer->isRenderBlock() || (renderer->isRenderInline() && renderer- >hasLayer())); // The only way an inline could hit test like this is if it has a layer.
223 223
224 // If we have no lines then we have no work to do. 224 // If we have no lines then we have no work to do.
225 if (!firstLineBox()) 225 if (!firstLineBox())
226 return false; 226 return false;
227 227
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 ASSERT(child->prevFlowBox() == prev); 324 ASSERT(child->prevFlowBox() == prev);
325 prev = child; 325 prev = child;
326 } 326 }
327 ASSERT(prev == m_lastLineBox); 327 ASSERT(prev == m_lastLineBox);
328 #endif 328 #endif
329 } 329 }
330 330
331 #endif 331 #endif
332 332
333 } 333 }
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderLineBoxList.h ('k') | third_party/WebKit/WebCore/rendering/RenderListBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698