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

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

Issue 12558011: Merge 142760 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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
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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 gImageQualityController = 0; 324 gImageQualityController = 0;
325 } 325 }
326 } 326 }
327 } 327 }
328 328
329 void RenderBoxModelObject::willBeDestroyed() 329 void RenderBoxModelObject::willBeDestroyed()
330 { 330 {
331 // A continuation of this RenderObject should be destroyed at subclasses. 331 // A continuation of this RenderObject should be destroyed at subclasses.
332 ASSERT(!continuation()); 332 ASSERT(!continuation());
333 333
334 if (isPositioned()) {
335 if (RenderView* view = this->view()) {
336 if (FrameView* frameView = view->frameView()) {
337 if (style()->hasViewportConstrainedPosition())
338 frameView->removeViewportConstrainedObject(this);
339 }
340 }
341 }
342
343 // If this is a first-letter object with a remaining text fragment then the 334 // If this is a first-letter object with a remaining text fragment then the
344 // entry needs to be cleared from the map. 335 // entry needs to be cleared from the map.
345 if (firstLetterRemainingText()) 336 if (firstLetterRemainingText())
346 setFirstLetterRemainingText(0); 337 setFirstLetterRemainingText(0);
347 338
348 RenderLayerModelObject::willBeDestroyed(); 339 RenderLayerModelObject::willBeDestroyed();
349 } 340 }
350 341
351 void RenderBoxModelObject::updateFromStyle() 342 void RenderBoxModelObject::updateFromStyle()
352 { 343 {
(...skipping 2434 matching lines...) Expand 10 before | Expand all | Expand 10 after
2787 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); 2778 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
2788 for (RenderObject* child = startChild; child && child != endChild; ) { 2779 for (RenderObject* child = startChild; child && child != endChild; ) {
2789 // Save our next sibling as moveChildTo will clear it. 2780 // Save our next sibling as moveChildTo will clear it.
2790 RenderObject* nextSibling = child->nextSibling(); 2781 RenderObject* nextSibling = child->nextSibling();
2791 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); 2782 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
2792 child = nextSibling; 2783 child = nextSibling;
2793 } 2784 }
2794 } 2785 }
2795 2786
2796 } // namespace WebCore 2787 } // namespace WebCore
OLDNEW
« no previous file with comments | « ManualTests/scrolling-coordinator-viewport-constrained-crash.html ('k') | Source/WebCore/rendering/RenderLayerModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698