OLD | NEW |
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) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. |
7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 2211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2222 continue; | 2222 continue; |
2223 | 2223 |
2224 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisp
lay(style(), child->style()->display()); | 2224 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisp
lay(style(), child->style()->display()); |
2225 if (style()->specifiesColumns()) { | 2225 if (style()->specifiesColumns()) { |
2226 if (child->style()->specifiesColumns()) | 2226 if (child->style()->specifiesColumns()) |
2227 newStyle->inheritColumnPropertiesFrom(style()); | 2227 newStyle->inheritColumnPropertiesFrom(style()); |
2228 if (child->style()->columnSpan()) | 2228 if (child->style()->columnSpan()) |
2229 newStyle->setColumnSpan(ColumnSpanAll); | 2229 newStyle->setColumnSpan(ColumnSpanAll); |
2230 } | 2230 } |
2231 | 2231 |
2232 // Preserve the position style of anonymous block continuations as they
can have relative or sticky position when | 2232 // Preserve the position style of anonymous block continuations as they
can have relative position when |
2233 // they contain block descendants of relative or sticky positioned inlin
es. | 2233 // they contain block descendants of relative positioned inlines. |
2234 if (child->isInFlowPositioned() && toRenderBlock(child)->isAnonymousBloc
kContinuation()) | 2234 if (child->isRelPositioned() && toRenderBlock(child)->isAnonymousBlockCo
ntinuation()) |
2235 newStyle->setPosition(child->style()->position()); | 2235 newStyle->setPosition(child->style()->position()); |
2236 | 2236 |
2237 child->setStyle(newStyle.release()); | 2237 child->setStyle(newStyle.release()); |
2238 } | 2238 } |
2239 } | 2239 } |
2240 | 2240 |
2241 void RenderObject::updateFillImages(const FillLayer* oldLayers, const FillLayer*
newLayers) | 2241 void RenderObject::updateFillImages(const FillLayer* oldLayers, const FillLayer*
newLayers) |
2242 { | 2242 { |
2243 // Optimize the common case | 2243 // Optimize the common case |
2244 if (oldLayers && !oldLayers->next() && newLayers && !newLayers->next() && (o
ldLayers->image() == newLayers->image())) | 2244 if (oldLayers && !oldLayers->next() && newLayers && !newLayers->next() && (o
ldLayers->image() == newLayers->image())) |
(...skipping 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3431 { | 3431 { |
3432 if (object1) { | 3432 if (object1) { |
3433 const WebCore::RenderObject* root = object1; | 3433 const WebCore::RenderObject* root = object1; |
3434 while (root->parent()) | 3434 while (root->parent()) |
3435 root = root->parent(); | 3435 root = root->parent(); |
3436 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3436 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
3437 } | 3437 } |
3438 } | 3438 } |
3439 | 3439 |
3440 #endif | 3440 #endif |
OLD | NEW |