| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "core/page/scrolling/ScrollingCoordinator.h" | 42 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 43 #include "core/plugins/PluginView.h" | 43 #include "core/plugins/PluginView.h" |
| 44 #include "core/rendering/FilterEffectRenderer.h" | 44 #include "core/rendering/FilterEffectRenderer.h" |
| 45 #include "core/rendering/RenderApplet.h" | 45 #include "core/rendering/RenderApplet.h" |
| 46 #include "core/rendering/RenderEmbeddedObject.h" | 46 #include "core/rendering/RenderEmbeddedObject.h" |
| 47 #include "core/rendering/RenderIFrame.h" | 47 #include "core/rendering/RenderIFrame.h" |
| 48 #include "core/rendering/RenderImage.h" | 48 #include "core/rendering/RenderImage.h" |
| 49 #include "core/rendering/RenderLayerStackingNodeIterator.h" | 49 #include "core/rendering/RenderLayerStackingNodeIterator.h" |
| 50 #include "core/rendering/RenderVideo.h" | 50 #include "core/rendering/RenderVideo.h" |
| 51 #include "core/rendering/RenderView.h" | 51 #include "core/rendering/RenderView.h" |
| 52 #include "core/rendering/compositing/GraphicsLayerUpdater.h" |
| 52 #include "core/rendering/compositing/RenderLayerCompositor.h" | 53 #include "core/rendering/compositing/RenderLayerCompositor.h" |
| 53 #include "core/rendering/style/KeyframeList.h" | 54 #include "core/rendering/style/KeyframeList.h" |
| 54 #include "platform/LengthFunctions.h" | 55 #include "platform/LengthFunctions.h" |
| 55 #include "platform/fonts/FontCache.h" | 56 #include "platform/fonts/FontCache.h" |
| 56 #include "platform/graphics/GraphicsContext.h" | 57 #include "platform/graphics/GraphicsContext.h" |
| 57 #include "wtf/CurrentTime.h" | 58 #include "wtf/CurrentTime.h" |
| 58 #include "wtf/text/StringBuilder.h" | 59 #include "wtf/text/StringBuilder.h" |
| 59 | 60 |
| 60 using namespace std; | 61 using namespace std; |
| 61 | 62 |
| (...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 } else if (renderer->isVideo()) { | 529 } else if (renderer->isVideo()) { |
| 529 HTMLMediaElement* mediaElement = toHTMLMediaElement(renderer->node()); | 530 HTMLMediaElement* mediaElement = toHTMLMediaElement(renderer->node()); |
| 530 m_graphicsLayer->setContentsToPlatformLayer(mediaElement->platformLayer(
)); | 531 m_graphicsLayer->setContentsToPlatformLayer(mediaElement->platformLayer(
)); |
| 531 } else if (isAcceleratedCanvas(renderer)) { | 532 } else if (isAcceleratedCanvas(renderer)) { |
| 532 HTMLCanvasElement* canvas = toHTMLCanvasElement(renderer->node()); | 533 HTMLCanvasElement* canvas = toHTMLCanvasElement(renderer->node()); |
| 533 if (CanvasRenderingContext* context = canvas->renderingContext()) | 534 if (CanvasRenderingContext* context = canvas->renderingContext()) |
| 534 m_graphicsLayer->setContentsToPlatformLayer(context->platformLayer()
); | 535 m_graphicsLayer->setContentsToPlatformLayer(context->platformLayer()
); |
| 535 layerConfigChanged = true; | 536 layerConfigChanged = true; |
| 536 } | 537 } |
| 537 if (renderer->isRenderPart()) | 538 if (renderer->isRenderPart()) |
| 538 layerConfigChanged = RenderLayerCompositor::parentFrameContentLayers(toR
enderPart(renderer)); | 539 layerConfigChanged = GraphicsLayerUpdater::parentFrameContentLayers(toRe
nderPart(renderer)); |
| 539 | 540 |
| 540 return layerConfigChanged; | 541 return layerConfigChanged; |
| 541 } | 542 } |
| 542 | 543 |
| 543 static IntRect clipBox(RenderBox* renderer) | 544 static IntRect clipBox(RenderBox* renderer) |
| 544 { | 545 { |
| 545 LayoutRect result = PaintInfo::infiniteRect(); | 546 LayoutRect result = PaintInfo::infiniteRect(); |
| 546 if (renderer->hasOverflowClip()) | 547 if (renderer->hasOverflowClip()) |
| 547 result = renderer->overflowClipRect(LayoutPoint()); | 548 result = renderer->overflowClipRect(LayoutPoint()); |
| 548 | 549 |
| (...skipping 1614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2163 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2164 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2164 name = "Scrolling Contents Layer"; | 2165 name = "Scrolling Contents Layer"; |
| 2165 } else { | 2166 } else { |
| 2166 ASSERT_NOT_REACHED(); | 2167 ASSERT_NOT_REACHED(); |
| 2167 } | 2168 } |
| 2168 | 2169 |
| 2169 return name; | 2170 return name; |
| 2170 } | 2171 } |
| 2171 | 2172 |
| 2172 } // namespace WebCore | 2173 } // namespace WebCore |
| OLD | NEW |