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

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

Issue 6598044: Merge 79734 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 9 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/RenderBlock.h ('k') | Source/WebCore/rendering/RenderInline.cpp » ('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 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 2550 matching lines...) Expand 10 before | Expand all | Expand 10 after
2561 ContinuationOutlineTableMap* table = continuationOutlineTable(); 2561 ContinuationOutlineTableMap* table = continuationOutlineTable();
2562 ListHashSet<RenderInline*>* continuations = table->get(this); 2562 ListHashSet<RenderInline*>* continuations = table->get(this);
2563 if (!continuations) { 2563 if (!continuations) {
2564 continuations = new ListHashSet<RenderInline*>; 2564 continuations = new ListHashSet<RenderInline*>;
2565 table->set(this, continuations); 2565 table->set(this, continuations);
2566 } 2566 }
2567 2567
2568 continuations->add(flow); 2568 continuations->add(flow);
2569 } 2569 }
2570 2570
2571 bool RenderBlock::paintsContinuationOutline(RenderInline* flow)
2572 {
2573 ContinuationOutlineTableMap* table = continuationOutlineTable();
2574 if (table->isEmpty())
2575 return false;
2576
2577 ListHashSet<RenderInline*>* continuations = table->get(this);
2578 if (!continuations)
2579 return false;
2580
2581 return continuations->contains(flow);
2582 }
2583
2571 void RenderBlock::paintContinuationOutlines(PaintInfo& info, int tx, int ty) 2584 void RenderBlock::paintContinuationOutlines(PaintInfo& info, int tx, int ty)
2572 { 2585 {
2573 ContinuationOutlineTableMap* table = continuationOutlineTable(); 2586 ContinuationOutlineTableMap* table = continuationOutlineTable();
2574 if (table->isEmpty()) 2587 if (table->isEmpty())
2575 return; 2588 return;
2576 2589
2577 ListHashSet<RenderInline*>* continuations = table->get(this); 2590 ListHashSet<RenderInline*>* continuations = table->get(this);
2578 if (!continuations) 2591 if (!continuations)
2579 return; 2592 return;
2580 2593
(...skipping 3508 matching lines...) Expand 10 before | Expand all | Expand 10 after
6089 else if (isAnonymous()) 6102 else if (isAnonymous())
6090 return "RenderBlock (generated)"; 6103 return "RenderBlock (generated)";
6091 if (isRelPositioned()) 6104 if (isRelPositioned())
6092 return "RenderBlock (relative positioned)"; 6105 return "RenderBlock (relative positioned)";
6093 if (isRunIn()) 6106 if (isRunIn())
6094 return "RenderBlock (run-in)"; 6107 return "RenderBlock (run-in)";
6095 return "RenderBlock"; 6108 return "RenderBlock";
6096 } 6109 }
6097 6110
6098 } // namespace WebCore 6111 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.h ('k') | Source/WebCore/rendering/RenderInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698