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

Side by Side Diff: Source/WebCore/rendering/RenderInline.cpp

Issue 10447080: Merge 117865 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 6 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
« no previous file with comments | « Source/WebCore/rendering/RenderInline.h ('k') | Source/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1267 matching lines...) Expand 10 before | Expand all | Expand 10 after
1278 RenderText* currText = toRenderText(curr); 1278 RenderText* currText = toRenderText(curr);
1279 for (InlineTextBox* childText = currText->firstTextBox(); ch ildText; childText = childText->nextTextBox()) 1279 for (InlineTextBox* childText = currText->firstTextBox(); ch ildText; childText = childText->nextTextBox())
1280 childText->root()->markDirty(); 1280 childText->root()->markDirty();
1281 } 1281 }
1282 } 1282 }
1283 } 1283 }
1284 } else 1284 } else
1285 m_lineBoxes.dirtyLineBoxes(); 1285 m_lineBoxes.dirtyLineBoxes();
1286 } 1286 }
1287 1287
1288 void RenderInline::deleteLineBoxTree()
1289 {
1290 m_lineBoxes.deleteLineBoxTree(renderArena());
1291 }
1292
1288 InlineFlowBox* RenderInline::createInlineFlowBox() 1293 InlineFlowBox* RenderInline::createInlineFlowBox()
1289 { 1294 {
1290 return new (renderArena()) InlineFlowBox(this); 1295 return new (renderArena()) InlineFlowBox(this);
1291 } 1296 }
1292 1297
1293 InlineFlowBox* RenderInline::createAndAppendInlineFlowBox() 1298 InlineFlowBox* RenderInline::createAndAppendInlineFlowBox()
1294 { 1299 {
1295 setAlwaysCreateLineBoxes(); 1300 setAlwaysCreateLineBoxes();
1296 InlineFlowBox* flowBox = createInlineFlowBox(); 1301 InlineFlowBox* flowBox = createInlineFlowBox();
1297 m_lineBoxes.appendLineBox(flowBox); 1302 m_lineBoxes.appendLineBox(flowBox);
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
1584 FloatPoint absPos = container->localToAbsolute(); 1589 FloatPoint absPos = container->localToAbsolute();
1585 region.bounds.setX(absPos.x() + region.bounds.x()); 1590 region.bounds.setX(absPos.x() + region.bounds.x());
1586 region.bounds.setY(absPos.y() + region.bounds.y()); 1591 region.bounds.setY(absPos.y() + region.bounds.y());
1587 1592
1588 regions.append(region); 1593 regions.append(region);
1589 } 1594 }
1590 } 1595 }
1591 #endif 1596 #endif
1592 1597
1593 } // namespace WebCore 1598 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderInline.h ('k') | Source/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698