| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. |
| 3 * | 3 * |
| 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 5 * | 5 * |
| 6 * Other contributors: | 6 * Other contributors: |
| 7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
| 9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
| 10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 #include "core/page/EventHandler.h" | 60 #include "core/page/EventHandler.h" |
| 61 #include "core/page/FocusController.h" | 61 #include "core/page/FocusController.h" |
| 62 #include "core/page/Frame.h" | 62 #include "core/page/Frame.h" |
| 63 #include "core/page/FrameView.h" | 63 #include "core/page/FrameView.h" |
| 64 #include "core/page/Page.h" | 64 #include "core/page/Page.h" |
| 65 #include "core/page/Settings.h" | 65 #include "core/page/Settings.h" |
| 66 #include "core/page/UseCounter.h" | 66 #include "core/page/UseCounter.h" |
| 67 #include "core/page/animation/AnimationController.h" | 67 #include "core/page/animation/AnimationController.h" |
| 68 #include "core/page/scrolling/ScrollingCoordinator.h" | 68 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 69 #include "core/platform/HistogramSupport.h" | 69 #include "core/platform/HistogramSupport.h" |
| 70 #include "core/platform/Partitions.h" |
| 70 #include "core/platform/PlatformGestureEvent.h" | 71 #include "core/platform/PlatformGestureEvent.h" |
| 71 #include "core/platform/PlatformMouseEvent.h" | 72 #include "core/platform/PlatformMouseEvent.h" |
| 72 #include "core/platform/ScrollAnimator.h" | 73 #include "core/platform/ScrollAnimator.h" |
| 73 #include "core/platform/Scrollbar.h" | 74 #include "core/platform/Scrollbar.h" |
| 74 #include "core/platform/ScrollbarTheme.h" | 75 #include "core/platform/ScrollbarTheme.h" |
| 75 #include "core/platform/chromium/TraceEvent.h" | 76 #include "core/platform/chromium/TraceEvent.h" |
| 76 #include "core/platform/graphics/FloatPoint3D.h" | 77 #include "core/platform/graphics/FloatPoint3D.h" |
| 77 #include "core/platform/graphics/FloatRect.h" | 78 #include "core/platform/graphics/FloatRect.h" |
| 78 #include "core/platform/graphics/GraphicsContextStateSaver.h" | 79 #include "core/platform/graphics/GraphicsContextStateSaver.h" |
| 79 #include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h" | 80 #include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h" |
| 80 #include "core/platform/graphics/filters/custom/CustomFilterOperation.h" | 81 #include "core/platform/graphics/filters/custom/CustomFilterOperation.h" |
| 81 #include "core/platform/graphics/filters/custom/CustomFilterValidatedProgram.h" | 82 #include "core/platform/graphics/filters/custom/CustomFilterValidatedProgram.h" |
| 82 #include "core/platform/graphics/filters/custom/ValidatedCustomFilterOperation.h
" | 83 #include "core/platform/graphics/filters/custom/ValidatedCustomFilterOperation.h
" |
| 83 #include "core/platform/graphics/transforms/ScaleTransformOperation.h" | 84 #include "core/platform/graphics/transforms/ScaleTransformOperation.h" |
| 84 #include "core/platform/graphics/transforms/TransformationMatrix.h" | 85 #include "core/platform/graphics/transforms/TransformationMatrix.h" |
| 85 #include "core/platform/graphics/transforms/TranslateTransformOperation.h" | 86 #include "core/platform/graphics/transforms/TranslateTransformOperation.h" |
| 86 #include "core/rendering/ColumnInfo.h" | 87 #include "core/rendering/ColumnInfo.h" |
| 87 #include "core/rendering/FilterEffectRenderer.h" | 88 #include "core/rendering/FilterEffectRenderer.h" |
| 88 #include "core/rendering/HitTestRequest.h" | 89 #include "core/rendering/HitTestRequest.h" |
| 89 #include "core/rendering/HitTestResult.h" | 90 #include "core/rendering/HitTestResult.h" |
| 90 #include "core/rendering/HitTestingTransformState.h" | 91 #include "core/rendering/HitTestingTransformState.h" |
| 91 #include "core/rendering/OverlapTestRequestClient.h" | 92 #include "core/rendering/OverlapTestRequestClient.h" |
| 92 #include "core/rendering/RenderArena.h" | |
| 93 #include "core/rendering/RenderFlowThread.h" | 93 #include "core/rendering/RenderFlowThread.h" |
| 94 #include "core/rendering/RenderGeometryMap.h" | 94 #include "core/rendering/RenderGeometryMap.h" |
| 95 #include "core/rendering/RenderInline.h" | 95 #include "core/rendering/RenderInline.h" |
| 96 #include "core/rendering/RenderLayerBacking.h" | 96 #include "core/rendering/RenderLayerBacking.h" |
| 97 #include "core/rendering/RenderLayerCompositor.h" | 97 #include "core/rendering/RenderLayerCompositor.h" |
| 98 #include "core/rendering/RenderMarquee.h" | 98 #include "core/rendering/RenderMarquee.h" |
| 99 #include "core/rendering/RenderReplica.h" | 99 #include "core/rendering/RenderReplica.h" |
| 100 #include "core/rendering/RenderScrollbar.h" | 100 #include "core/rendering/RenderScrollbar.h" |
| 101 #include "core/rendering/RenderScrollbarPart.h" | 101 #include "core/rendering/RenderScrollbarPart.h" |
| 102 #include "core/rendering/RenderTreeAsText.h" | 102 #include "core/rendering/RenderTreeAsText.h" |
| (...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1620 LayoutRect clipRect = paintingExtent(rootLayer, paintDirtyRect, paintBeh
avior); | 1620 LayoutRect clipRect = paintingExtent(rootLayer, paintDirtyRect, paintBeh
avior); |
| 1621 context->clip(clipRect); | 1621 context->clip(clipRect); |
| 1622 context->beginTransparencyLayer(renderer()->opacity()); | 1622 context->beginTransparencyLayer(renderer()->opacity()); |
| 1623 #ifdef REVEAL_TRANSPARENCY_LAYERS | 1623 #ifdef REVEAL_TRANSPARENCY_LAYERS |
| 1624 context->setFillColor(Color(0.0f, 0.0f, 0.5f, 0.2f)); | 1624 context->setFillColor(Color(0.0f, 0.0f, 0.5f, 0.2f)); |
| 1625 context->fillRect(clipRect); | 1625 context->fillRect(clipRect); |
| 1626 #endif | 1626 #endif |
| 1627 } | 1627 } |
| 1628 } | 1628 } |
| 1629 | 1629 |
| 1630 void* RenderLayer::operator new(size_t sz, RenderArena* renderArena) | 1630 #if ENABLE(PARTITION_ALLOC) |
| 1631 void* RenderLayer::operator new(size_t sz) |
| 1631 { | 1632 { |
| 1632 return renderArena->allocate(sz); | 1633 return partitionAlloc(Partitions::getRenderingPartition(), sz); |
| 1633 } | 1634 } |
| 1634 | 1635 |
| 1635 void RenderLayer::operator delete(void* ptr, size_t sz) | 1636 void RenderLayer::operator delete(void* ptr) |
| 1636 { | 1637 { |
| 1637 // Stash size where destroy can find it. | 1638 partitionFree(ptr); |
| 1638 *(size_t *)ptr = sz; | |
| 1639 } | 1639 } |
| 1640 #endif |
| 1640 | 1641 |
| 1641 void RenderLayer::destroy(RenderArena* renderArena) | 1642 void RenderLayer::destroy() |
| 1642 { | 1643 { |
| 1643 delete this; | 1644 delete this; |
| 1644 | |
| 1645 // Recover the size left there for us by operator delete and free the memory
. | |
| 1646 renderArena->free(*(size_t *)this, this); | |
| 1647 } | 1645 } |
| 1648 | 1646 |
| 1649 void RenderLayer::addChild(RenderLayer* child, RenderLayer* beforeChild) | 1647 void RenderLayer::addChild(RenderLayer* child, RenderLayer* beforeChild) |
| 1650 { | 1648 { |
| 1651 RenderLayer* prevSibling = beforeChild ? beforeChild->previousSibling() : la
stChild(); | 1649 RenderLayer* prevSibling = beforeChild ? beforeChild->previousSibling() : la
stChild(); |
| 1652 if (prevSibling) { | 1650 if (prevSibling) { |
| 1653 child->setPreviousSibling(prevSibling); | 1651 child->setPreviousSibling(prevSibling); |
| 1654 prevSibling->setNextSibling(child); | 1652 prevSibling->setNextSibling(child); |
| 1655 ASSERT(prevSibling != child); | 1653 ASSERT(prevSibling != child); |
| 1656 } else | 1654 } else |
| (...skipping 4740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6397 } | 6395 } |
| 6398 } | 6396 } |
| 6399 | 6397 |
| 6400 void showLayerTree(const WebCore::RenderObject* renderer) | 6398 void showLayerTree(const WebCore::RenderObject* renderer) |
| 6401 { | 6399 { |
| 6402 if (!renderer) | 6400 if (!renderer) |
| 6403 return; | 6401 return; |
| 6404 showLayerTree(renderer->enclosingLayer()); | 6402 showLayerTree(renderer->enclosingLayer()); |
| 6405 } | 6403 } |
| 6406 #endif | 6404 #endif |
| OLD | NEW |