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

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

Issue 10272008: Merge 113497 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 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/RenderBox.h ('k') | Source/WebCore/rendering/RenderTable.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 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 // We can reuse this block and make it the preBlock of the next continua tion. 419 // We can reuse this block and make it the preBlock of the next continua tion.
420 pre = block; 420 pre = block;
421 pre->removePositionedObjects(0); 421 pre->removePositionedObjects(0);
422 block = block->containingBlock(); 422 block = block->containingBlock();
423 } else { 423 } else {
424 // No anonymous block available for use. Make one. 424 // No anonymous block available for use. Make one.
425 pre = block->createAnonymousBlock(); 425 pre = block->createAnonymousBlock();
426 madeNewBeforeBlock = true; 426 madeNewBeforeBlock = true;
427 } 427 }
428 428
429 RenderBlock* post = block->createAnonymousBlockWithSameTypeAs(pre); 429 RenderBlock* post = toRenderBlock(pre->createAnonymousBoxWithSameTypeAs(bloc k));
430 430
431 RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nex tSibling(); 431 RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nex tSibling();
432 if (madeNewBeforeBlock) 432 if (madeNewBeforeBlock)
433 block->children()->insertChildNode(block, pre, boxFirst); 433 block->children()->insertChildNode(block, pre, boxFirst);
434 block->children()->insertChildNode(block, newBlockBox, boxFirst); 434 block->children()->insertChildNode(block, newBlockBox, boxFirst);
435 block->children()->insertChildNode(block, post, boxFirst); 435 block->children()->insertChildNode(block, post, boxFirst);
436 block->setChildrenInline(false); 436 block->setChildrenInline(false);
437 437
438 if (madeNewBeforeBlock) { 438 if (madeNewBeforeBlock) {
439 RenderObject* o = boxFirst; 439 RenderObject* o = boxFirst;
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1594 FloatPoint absPos = container->localToAbsolute(); 1594 FloatPoint absPos = container->localToAbsolute();
1595 region.bounds.setX(absPos.x() + region.bounds.x()); 1595 region.bounds.setX(absPos.x() + region.bounds.x());
1596 region.bounds.setY(absPos.y() + region.bounds.y()); 1596 region.bounds.setY(absPos.y() + region.bounds.y());
1597 1597
1598 regions.append(region); 1598 regions.append(region);
1599 } 1599 }
1600 } 1600 }
1601 #endif 1601 #endif
1602 1602
1603 } // namespace WebCore 1603 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBox.h ('k') | Source/WebCore/rendering/RenderTable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698