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 2766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2777 } | 2777 } |
2778 for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) | 2778 for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) |
2779 curr->updateDragState(dragOn); | 2779 curr->updateDragState(dragOn); |
2780 } | 2780 } |
2781 | 2781 |
2782 CompositingState RenderObject::compositingState() const | 2782 CompositingState RenderObject::compositingState() const |
2783 { | 2783 { |
2784 return hasLayer() ? toRenderLayerModelObject(this)->layer()->compositingStat
e() : NotComposited; | 2784 return hasLayer() ? toRenderLayerModelObject(this)->layer()->compositingStat
e() : NotComposited; |
2785 } | 2785 } |
2786 | 2786 |
| 2787 CompositingReasons RenderObject::additionalCompositingReasons(CompositingTrigger
Flags) const |
| 2788 { |
| 2789 return CompositingReasonNone; |
| 2790 } |
| 2791 |
2787 bool RenderObject::acceleratedCompositingForOverflowScrollEnabled() const | 2792 bool RenderObject::acceleratedCompositingForOverflowScrollEnabled() const |
2788 { | 2793 { |
2789 const Settings* settings = document().settings(); | 2794 const Settings* settings = document().settings(); |
2790 return settings && settings->acceleratedCompositingForOverflowScrollEnabled(
); | 2795 return settings && settings->acceleratedCompositingForOverflowScrollEnabled(
); |
2791 } | 2796 } |
2792 | 2797 |
2793 // FIXME: This is a temporary flag and should be removed once accelerated | 2798 // FIXME: This is a temporary flag and should be removed once accelerated |
2794 // overflow scroll is ready (crbug.com/254111). | 2799 // overflow scroll is ready (crbug.com/254111). |
2795 bool RenderObject::compositorDrivenAcceleratedScrollingEnabled() const | 2800 bool RenderObject::compositorDrivenAcceleratedScrollingEnabled() const |
2796 { | 2801 { |
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3352 { | 3357 { |
3353 if (object1) { | 3358 if (object1) { |
3354 const WebCore::RenderObject* root = object1; | 3359 const WebCore::RenderObject* root = object1; |
3355 while (root->parent()) | 3360 while (root->parent()) |
3356 root = root->parent(); | 3361 root = root->parent(); |
3357 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3362 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
3358 } | 3363 } |
3359 } | 3364 } |
3360 | 3365 |
3361 #endif | 3366 #endif |
OLD | NEW |