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

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

Issue 9263001: Merge 104183 - Source/WebCore: Crash due to reparenting of relpositioned object under anonymous b... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 11 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
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, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 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 3198 matching lines...) Expand 10 before | Expand all | Expand 10 after
3209 while (cb != rootBlock) { 3209 while (cb != rootBlock) {
3210 logicalRight += cb->logicalLeft(); 3210 logicalRight += cb->logicalLeft();
3211 cb = cb->containingBlock(); 3211 cb = cb->containingBlock();
3212 } 3212 }
3213 } 3213 }
3214 return logicalRight; 3214 return logicalRight;
3215 } 3215 }
3216 3216
3217 void RenderBlock::insertPositionedObject(RenderBox* o) 3217 void RenderBlock::insertPositionedObject(RenderBox* o)
3218 { 3218 {
3219 ASSERT(!isAnonymousBlock());
3220
3219 if (o->isRenderFlowThread()) 3221 if (o->isRenderFlowThread())
3220 return; 3222 return;
3221 3223
3222 // Create the list of special objects if we don't aleady have one 3224 // Create the list of special objects if we don't aleady have one
3223 if (!m_positionedObjects) 3225 if (!m_positionedObjects)
3224 m_positionedObjects = adoptPtr(new PositionedObjectsListHashSet); 3226 m_positionedObjects = adoptPtr(new PositionedObjectsListHashSet);
3225 3227
3226 m_positionedObjects->add(o); 3228 m_positionedObjects->add(o);
3227 } 3229 }
3228 3230
(...skipping 3832 matching lines...) Expand 10 before | Expand all | Expand 10 after
7061 } 7063 }
7062 7064
7063 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject) 7065 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject)
7064 { 7066 {
7065 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x( ), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); 7067 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x( ), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY());
7066 } 7068 }
7067 7069
7068 #endif 7070 #endif
7069 7071
7070 } // namespace WebCore 7072 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698