| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 #include "core/paint/PaintLayerStackingNodeIterator.h" | 57 #include "core/paint/PaintLayerStackingNodeIterator.h" |
| 58 #include "core/paint/PaintTiming.h" | 58 #include "core/paint/PaintTiming.h" |
| 59 #include "core/paint/ScrollableAreaPainter.h" | 59 #include "core/paint/ScrollableAreaPainter.h" |
| 60 #include "core/paint/TransformRecorder.h" | 60 #include "core/paint/TransformRecorder.h" |
| 61 #include "core/plugins/PluginView.h" | 61 #include "core/plugins/PluginView.h" |
| 62 #include "platform/LengthFunctions.h" | 62 #include "platform/LengthFunctions.h" |
| 63 #include "platform/RuntimeEnabledFeatures.h" | 63 #include "platform/RuntimeEnabledFeatures.h" |
| 64 #include "platform/fonts/FontCache.h" | 64 #include "platform/fonts/FontCache.h" |
| 65 #include "platform/geometry/TransformState.h" | 65 #include "platform/geometry/TransformState.h" |
| 66 #include "platform/graphics/BitmapImage.h" | 66 #include "platform/graphics/BitmapImage.h" |
| 67 #include "platform/graphics/CompositorFilterOperations.h" |
| 67 #include "platform/graphics/CompositorMutableProperties.h" | 68 #include "platform/graphics/CompositorMutableProperties.h" |
| 68 #include "platform/graphics/GraphicsContext.h" | 69 #include "platform/graphics/GraphicsContext.h" |
| 69 #include "platform/graphics/paint/ClipDisplayItem.h" | 70 #include "platform/graphics/paint/ClipDisplayItem.h" |
| 70 #include "platform/graphics/paint/CullRect.h" | 71 #include "platform/graphics/paint/CullRect.h" |
| 71 #include "platform/graphics/paint/DrawingRecorder.h" | 72 #include "platform/graphics/paint/DrawingRecorder.h" |
| 72 #include "platform/graphics/paint/PaintController.h" | 73 #include "platform/graphics/paint/PaintController.h" |
| 73 #include "platform/graphics/paint/SkPictureBuilder.h" | 74 #include "platform/graphics/paint/SkPictureBuilder.h" |
| 74 #include "platform/graphics/paint/TransformDisplayItem.h" | 75 #include "platform/graphics/paint/TransformDisplayItem.h" |
| 75 #include "wtf/CurrentTime.h" | 76 #include "wtf/CurrentTime.h" |
| 76 #include "wtf/text/StringBuilder.h" | 77 #include "wtf/text/StringBuilder.h" |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 if (m_owningLayer.hasTransformRelatedProperty()) { | 268 if (m_owningLayer.hasTransformRelatedProperty()) { |
| 268 style.applyTransform(t, LayoutSize(toLayoutBox(layoutObject())->pixelSna
ppedSize()), ComputedStyle::ExcludeTransformOrigin, ComputedStyle::IncludeMotion
Path, ComputedStyle::IncludeIndependentTransformProperties); | 269 style.applyTransform(t, LayoutSize(toLayoutBox(layoutObject())->pixelSna
ppedSize()), ComputedStyle::ExcludeTransformOrigin, ComputedStyle::IncludeMotion
Path, ComputedStyle::IncludeIndependentTransformProperties); |
| 269 makeMatrixRenderable(t, compositor()->hasAcceleratedCompositing()); | 270 makeMatrixRenderable(t, compositor()->hasAcceleratedCompositing()); |
| 270 } | 271 } |
| 271 | 272 |
| 272 m_graphicsLayer->setTransform(t); | 273 m_graphicsLayer->setTransform(t); |
| 273 } | 274 } |
| 274 | 275 |
| 275 void CompositedLayerMapping::updateFilters(const ComputedStyle& style) | 276 void CompositedLayerMapping::updateFilters(const ComputedStyle& style) |
| 276 { | 277 { |
| 277 m_graphicsLayer->setFilters(owningLayer().computeFilterOperations(style)); | 278 m_graphicsLayer->setFilters(owningLayer().createCompositorFilterOperationsFo
rFilter(style)); |
| 278 } | 279 } |
| 279 | 280 |
| 280 void CompositedLayerMapping::updateBackdropFilters(const ComputedStyle& style) | 281 void CompositedLayerMapping::updateBackdropFilters(const ComputedStyle& style) |
| 281 { | 282 { |
| 282 m_graphicsLayer->setBackdropFilters(owningLayer().computeBackdropFilterOpera
tions(style)); | 283 m_graphicsLayer->setBackdropFilters(owningLayer().createCompositorFilterOper
ationsForBackdropFilter(style)); |
| 283 } | 284 } |
| 284 | 285 |
| 285 void CompositedLayerMapping::updateLayerBlendMode(const ComputedStyle& style) | 286 void CompositedLayerMapping::updateLayerBlendMode(const ComputedStyle& style) |
| 286 { | 287 { |
| 287 setBlendMode(style.blendMode()); | 288 setBlendMode(style.blendMode()); |
| 288 } | 289 } |
| 289 | 290 |
| 290 void CompositedLayerMapping::updateIsRootForIsolatedGroup() | 291 void CompositedLayerMapping::updateIsRootForIsolatedGroup() |
| 291 { | 292 { |
| 292 bool isolate = m_owningLayer.shouldIsolateCompositedDescendants(); | 293 bool isolate = m_owningLayer.shouldIsolateCompositedDescendants(); |
| (...skipping 2404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2697 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2698 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2698 name = "Scrolling Contents Layer"; | 2699 name = "Scrolling Contents Layer"; |
| 2699 } else { | 2700 } else { |
| 2700 ASSERT_NOT_REACHED(); | 2701 ASSERT_NOT_REACHED(); |
| 2701 } | 2702 } |
| 2702 | 2703 |
| 2703 return name; | 2704 return name; |
| 2704 } | 2705 } |
| 2705 | 2706 |
| 2706 } // namespace blink | 2707 } // namespace blink |
| OLD | NEW |