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

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

Issue 327323002: Start removing the double-negative !ASSERT_DISABLED (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderGeometryMap.cpp ('k') | Source/core/rendering/RenderLayer.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 * 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 RenderInline* RenderInline::createAnonymous(Document* document) 55 RenderInline* RenderInline::createAnonymous(Document* document)
56 { 56 {
57 RenderInline* renderer = new RenderInline(0); 57 RenderInline* renderer = new RenderInline(0);
58 renderer->setDocumentForAnonymous(document); 58 renderer->setDocumentForAnonymous(document);
59 return renderer; 59 return renderer;
60 } 60 }
61 61
62 void RenderInline::willBeDestroyed() 62 void RenderInline::willBeDestroyed()
63 { 63 {
64 #if !ASSERT_DISABLED 64 #if ASSERT_ENABLED
65 // Make sure we do not retain "this" in the continuation outline table map o f our containing blocks. 65 // Make sure we do not retain "this" in the continuation outline table map o f our containing blocks.
66 if (parent() && style()->visibility() == VISIBLE && hasOutline()) { 66 if (parent() && style()->visibility() == VISIBLE && hasOutline()) {
67 bool containingBlockPaintsContinuationOutline = continuation() || isInli neElementContinuation(); 67 bool containingBlockPaintsContinuationOutline = continuation() || isInli neElementContinuation();
68 if (containingBlockPaintsContinuationOutline) { 68 if (containingBlockPaintsContinuationOutline) {
69 if (RenderBlock* cb = containingBlock()) { 69 if (RenderBlock* cb = containingBlock()) {
70 if (RenderBlock* cbCb = cb->containingBlock()) 70 if (RenderBlock* cbCb = cb->containingBlock())
71 ASSERT(!cbCb->paintsContinuationOutline(this)); 71 ASSERT(!cbCb->paintsContinuationOutline(this));
72 } 72 }
73 } 73 }
74 } 74 }
(...skipping 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after
1566 container = this; 1566 container = this;
1567 1567
1568 FloatPoint absPos = container->localToAbsolute(); 1568 FloatPoint absPos = container->localToAbsolute();
1569 region.bounds.setX(absPos.x() + region.bounds.x()); 1569 region.bounds.setX(absPos.x() + region.bounds.x());
1570 region.bounds.setY(absPos.y() + region.bounds.y()); 1570 region.bounds.setY(absPos.y() + region.bounds.y());
1571 1571
1572 regions.append(region); 1572 regions.append(region);
1573 } 1573 }
1574 1574
1575 } // namespace WebCore 1575 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderGeometryMap.cpp ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698