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) 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 RenderObject::setSelectionState(state); | 72 RenderObject::setSelectionState(state); |
73 | 73 |
74 // FIXME: We should consider whether it is OK propagating to ancestor Render
Inlines. | 74 // FIXME: We should consider whether it is OK propagating to ancestor Render
Inlines. |
75 // This is a workaround for http://webkit.org/b/32123 | 75 // This is a workaround for http://webkit.org/b/32123 |
76 // The containing block can be null in case of an orphaned tree. | 76 // The containing block can be null in case of an orphaned tree. |
77 RenderBlock* containingBlock = this->containingBlock(); | 77 RenderBlock* containingBlock = this->containingBlock(); |
78 if (containingBlock && !containingBlock->isRenderView()) | 78 if (containingBlock && !containingBlock->isRenderView()) |
79 containingBlock->setSelectionState(state); | 79 containingBlock->setSelectionState(state); |
80 } | 80 } |
81 | 81 |
82 void RenderBoxModelObject::contentChanged(ContentChangeType changeType) | 82 void RenderBoxModelObject::contentChanged(ContentChangeType changeType, const In
tRect& dirtyRect) |
83 { | 83 { |
84 if (!hasLayer()) | 84 if (!hasLayer()) |
85 return; | 85 return; |
86 | 86 |
87 layer()->contentChanged(changeType); | 87 layer()->contentChanged(changeType, dirtyRect); |
88 } | 88 } |
89 | 89 |
90 bool RenderBoxModelObject::hasAcceleratedCompositing() const | 90 bool RenderBoxModelObject::hasAcceleratedCompositing() const |
91 { | 91 { |
92 return view()->compositor()->hasAcceleratedCompositing(); | 92 return view()->compositor()->hasAcceleratedCompositing(); |
93 } | 93 } |
94 | 94 |
95 RenderBoxModelObject::RenderBoxModelObject(ContainerNode* node) | 95 RenderBoxModelObject::RenderBoxModelObject(ContainerNode* node) |
96 : RenderLayerModelObject(node) | 96 : RenderLayerModelObject(node) |
97 { | 97 { |
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
655 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); | 655 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); |
656 for (RenderObject* child = startChild; child && child != endChild; ) { | 656 for (RenderObject* child = startChild; child && child != endChild; ) { |
657 // Save our next sibling as moveChildTo will clear it. | 657 // Save our next sibling as moveChildTo will clear it. |
658 RenderObject* nextSibling = child->nextSibling(); | 658 RenderObject* nextSibling = child->nextSibling(); |
659 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); | 659 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); |
660 child = nextSibling; | 660 child = nextSibling; |
661 } | 661 } |
662 } | 662 } |
663 | 663 |
664 } // namespace blink | 664 } // namespace blink |
OLD | NEW |