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 1756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1767 RenderObjectChildList* childlist = parent()->virtualChildren(); | 1767 RenderObjectChildList* childlist = parent()->virtualChildren(); |
1768 childlist->insertChildNode(parent(), block, this); | 1768 childlist->insertChildNode(parent(), block, this); |
1769 block->children()->appendChildNode(block, childlist->removeChildNode
(parent(), this)); | 1769 block->children()->appendChildNode(block, childlist->removeChildNode
(parent(), this)); |
1770 } | 1770 } |
1771 } | 1771 } |
1772 } | 1772 } |
1773 | 1773 |
1774 void RenderObject::setAnimatableStyle(PassRefPtr<RenderStyle> style) | 1774 void RenderObject::setAnimatableStyle(PassRefPtr<RenderStyle> style) |
1775 { | 1775 { |
1776 if (!isText() && style && !RuntimeEnabledFeatures::webAnimationsCSSEnabled()
) { | 1776 if (!isText() && style && !RuntimeEnabledFeatures::webAnimationsCSSEnabled()
) { |
1777 setStyle(animation().updateAnimations(this, style.get())); | 1777 setStyle(animation().updateAnimations(*this, *style)); |
1778 return; | 1778 return; |
1779 } | 1779 } |
1780 setStyle(style); | 1780 setStyle(style); |
1781 } | 1781 } |
1782 | 1782 |
1783 StyleDifference RenderObject::adjustStyleDifference(StyleDifference diff, unsign
ed contextSensitiveProperties) const | 1783 StyleDifference RenderObject::adjustStyleDifference(StyleDifference diff, unsign
ed contextSensitiveProperties) const |
1784 { | 1784 { |
1785 // If transform changed, and the layer does not paint into its own separate
backing, then we need to do a layout. | 1785 // If transform changed, and the layer does not paint into its own separate
backing, then we need to do a layout. |
1786 // FIXME: The comment above is what the code does, but it is technically not
following spec. This means we will | 1786 // FIXME: The comment above is what the code does, but it is technically not
following spec. This means we will |
1787 // not to layout for 3d transforms, but we should be invoking a simplified r
elayout. Is it possible we are avoiding | 1787 // not to layout for 3d transforms, but we should be invoking a simplified r
elayout. Is it possible we are avoiding |
(...skipping 1597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3385 { | 3385 { |
3386 if (object1) { | 3386 if (object1) { |
3387 const WebCore::RenderObject* root = object1; | 3387 const WebCore::RenderObject* root = object1; |
3388 while (root->parent()) | 3388 while (root->parent()) |
3389 root = root->parent(); | 3389 root = root->parent(); |
3390 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3390 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
3391 } | 3391 } |
3392 } | 3392 } |
3393 | 3393 |
3394 #endif | 3394 #endif |
OLD | NEW |