| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 RenderObject::setSelectionState(state); | 55 RenderObject::setSelectionState(state); |
| 56 | 56 |
| 57 // FIXME: We should consider whether it is OK propagating to ancestor Render
Inlines. | 57 // FIXME: We should consider whether it is OK propagating to ancestor Render
Inlines. |
| 58 // This is a workaround for http://webkit.org/b/32123 | 58 // This is a workaround for http://webkit.org/b/32123 |
| 59 // The containing block can be null in case of an orphaned tree. | 59 // The containing block can be null in case of an orphaned tree. |
| 60 RenderBlock* containingBlock = this->containingBlock(); | 60 RenderBlock* containingBlock = this->containingBlock(); |
| 61 if (containingBlock && !containingBlock->isRenderView()) | 61 if (containingBlock && !containingBlock->isRenderView()) |
| 62 containingBlock->setSelectionState(state); | 62 containingBlock->setSelectionState(state); |
| 63 } | 63 } |
| 64 | 64 |
| 65 bool RenderBoxModelObject::hasAcceleratedCompositing() const | |
| 66 { | |
| 67 // FIXME(sky): Remove | |
| 68 return false; | |
| 69 } | |
| 70 | |
| 71 RenderBoxModelObject::RenderBoxModelObject(ContainerNode* node) | 65 RenderBoxModelObject::RenderBoxModelObject(ContainerNode* node) |
| 72 : RenderLayerModelObject(node) | 66 : RenderLayerModelObject(node) |
| 73 { | 67 { |
| 74 } | 68 } |
| 75 | 69 |
| 76 RenderBoxModelObject::~RenderBoxModelObject() | 70 RenderBoxModelObject::~RenderBoxModelObject() |
| 77 { | 71 { |
| 78 } | 72 } |
| 79 | 73 |
| 80 bool RenderBoxModelObject::calculateHasBoxDecorations() const | 74 bool RenderBoxModelObject::calculateHasBoxDecorations() const |
| (...skipping 2397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2478 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); | 2472 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); |
| 2479 for (RenderObject* child = slowFirstChild(); child; ) { | 2473 for (RenderObject* child = slowFirstChild(); child; ) { |
| 2480 // Save our next sibling as moveChildTo will clear it. | 2474 // Save our next sibling as moveChildTo will clear it. |
| 2481 RenderObject* nextSibling = child->nextSibling(); | 2475 RenderObject* nextSibling = child->nextSibling(); |
| 2482 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); | 2476 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); |
| 2483 child = nextSibling; | 2477 child = nextSibling; |
| 2484 } | 2478 } |
| 2485 } | 2479 } |
| 2486 | 2480 |
| 2487 } // namespace blink | 2481 } // namespace blink |
| OLD | NEW |