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

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

Issue 9232034: 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/912/
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 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 3168 matching lines...) Expand 10 before | Expand all | Expand 10 after
3179 while (cb != rootBlock) { 3179 while (cb != rootBlock) {
3180 logicalRight += cb->logicalLeft(); 3180 logicalRight += cb->logicalLeft();
3181 cb = cb->containingBlock(); 3181 cb = cb->containingBlock();
3182 } 3182 }
3183 } 3183 }
3184 return logicalRight; 3184 return logicalRight;
3185 } 3185 }
3186 3186
3187 void RenderBlock::insertPositionedObject(RenderBox* o) 3187 void RenderBlock::insertPositionedObject(RenderBox* o)
3188 { 3188 {
3189 ASSERT(!isAnonymousBlock());
3190
3189 if (o->isRenderFlowThread()) 3191 if (o->isRenderFlowThread())
3190 return; 3192 return;
3191 3193
3192 // Create the list of special objects if we don't aleady have one 3194 // Create the list of special objects if we don't aleady have one
3193 if (!m_positionedObjects) 3195 if (!m_positionedObjects)
3194 m_positionedObjects = adoptPtr(new PositionedObjectsListHashSet); 3196 m_positionedObjects = adoptPtr(new PositionedObjectsListHashSet);
3195 3197
3196 m_positionedObjects->add(o); 3198 m_positionedObjects->add(o);
3197 } 3199 }
3198 3200
(...skipping 3734 matching lines...) Expand 10 before | Expand all | Expand 10 after
6933 } 6935 }
6934 6936
6935 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject) 6937 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject)
6936 { 6938 {
6937 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x( ), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); 6939 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x( ), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY());
6938 } 6940 }
6939 6941
6940 #endif 6942 #endif
6941 6943
6942 } // namespace WebCore 6944 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698