| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 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 11 matching lines...) Expand all Loading... |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "platform/graphics/GraphicsLayer.h" | 26 #include "platform/graphics/GraphicsLayer.h" |
| 27 | 27 |
| 28 #include "SkImageFilter.h" | 28 #include "SkImageFilter.h" |
| 29 #include "SkMatrix44.h" | 29 #include "SkMatrix44.h" |
| 30 #include "base/trace_event/trace_event_argument.h" | 30 #include "base/trace_event/trace_event_argument.h" |
| 31 #include "cc/layers/layer.h" | 31 #include "cc/layers/layer.h" |
| 32 #include "platform/CompositorFactory.h" |
| 32 #include "platform/DragImage.h" | 33 #include "platform/DragImage.h" |
| 33 #include "platform/JSONValues.h" | 34 #include "platform/JSONValues.h" |
| 34 #include "platform/TraceEvent.h" | 35 #include "platform/TraceEvent.h" |
| 36 #include "platform/animation/WebFilterOperations.h" |
| 35 #include "platform/geometry/FloatRect.h" | 37 #include "platform/geometry/FloatRect.h" |
| 36 #include "platform/geometry/LayoutRect.h" | 38 #include "platform/geometry/LayoutRect.h" |
| 37 #include "platform/graphics/BitmapImage.h" | 39 #include "platform/graphics/BitmapImage.h" |
| 38 #include "platform/graphics/FirstPaintInvalidationTracking.h" | 40 #include "platform/graphics/FirstPaintInvalidationTracking.h" |
| 39 #include "platform/graphics/GraphicsContext.h" | 41 #include "platform/graphics/GraphicsContext.h" |
| 40 #include "platform/graphics/GraphicsLayerFactory.h" | 42 #include "platform/graphics/GraphicsLayerFactory.h" |
| 41 #include "platform/graphics/Image.h" | 43 #include "platform/graphics/Image.h" |
| 42 #include "platform/graphics/LinkHighlight.h" | 44 #include "platform/graphics/LinkHighlight.h" |
| 43 #include "platform/graphics/filters/SkiaImageFilterBuilder.h" | 45 #include "platform/graphics/filters/SkiaImageFilterBuilder.h" |
| 44 #include "platform/graphics/paint/DrawingRecorder.h" | 46 #include "platform/graphics/paint/DrawingRecorder.h" |
| 45 #include "platform/graphics/paint/PaintController.h" | 47 #include "platform/graphics/paint/PaintController.h" |
| 46 #include "platform/scroll/ScrollableArea.h" | 48 #include "platform/scroll/ScrollableArea.h" |
| 47 #include "platform/text/TextStream.h" | 49 #include "platform/text/TextStream.h" |
| 48 #include "public/platform/Platform.h" | 50 #include "public/platform/Platform.h" |
| 49 #include "public/platform/WebCompositorAnimation.h" | 51 #include "public/platform/WebCompositorAnimation.h" |
| 50 #include "public/platform/WebCompositorSupport.h" | 52 #include "public/platform/WebCompositorSupport.h" |
| 51 #include "public/platform/WebFilterOperations.h" | |
| 52 #include "public/platform/WebFloatPoint.h" | 53 #include "public/platform/WebFloatPoint.h" |
| 53 #include "public/platform/WebFloatRect.h" | 54 #include "public/platform/WebFloatRect.h" |
| 54 #include "public/platform/WebLayer.h" | 55 #include "public/platform/WebLayer.h" |
| 55 #include "public/platform/WebPoint.h" | 56 #include "public/platform/WebPoint.h" |
| 56 #include "public/platform/WebSize.h" | 57 #include "public/platform/WebSize.h" |
| 57 #include "wtf/CurrentTime.h" | 58 #include "wtf/CurrentTime.h" |
| 58 #include "wtf/HashMap.h" | 59 #include "wtf/HashMap.h" |
| 59 #include "wtf/HashSet.h" | 60 #include "wtf/HashSet.h" |
| 60 #include "wtf/MathExtras.h" | 61 #include "wtf/MathExtras.h" |
| 61 #include "wtf/text/StringUTF8Adaptor.h" | 62 #include "wtf/text/StringUTF8Adaptor.h" |
| (...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1134 } | 1135 } |
| 1135 | 1136 |
| 1136 WebLayer* GraphicsLayer::platformLayer() const | 1137 WebLayer* GraphicsLayer::platformLayer() const |
| 1137 { | 1138 { |
| 1138 return m_layer->layer(); | 1139 return m_layer->layer(); |
| 1139 } | 1140 } |
| 1140 | 1141 |
| 1141 void GraphicsLayer::setFilters(const FilterOperations& filters) | 1142 void GraphicsLayer::setFilters(const FilterOperations& filters) |
| 1142 { | 1143 { |
| 1143 SkiaImageFilterBuilder builder; | 1144 SkiaImageFilterBuilder builder; |
| 1144 OwnPtr<WebFilterOperations> webFilters = adoptPtr(Platform::current()->compo
sitorSupport()->createFilterOperations()); | 1145 OwnPtr<WebFilterOperations> webFilters = adoptPtr(CompositorFactory::current
().createFilterOperations()); |
| 1145 FilterOutsets outsets = filters.outsets(); | 1146 FilterOutsets outsets = filters.outsets(); |
| 1146 builder.setCropOffset(FloatSize(outsets.left(), outsets.top())); | 1147 builder.setCropOffset(FloatSize(outsets.left(), outsets.top())); |
| 1147 builder.buildFilterOperations(filters, webFilters.get()); | 1148 builder.buildFilterOperations(filters, webFilters.get()); |
| 1148 m_layer->layer()->setFilters(*webFilters); | 1149 m_layer->layer()->setFilters(*webFilters); |
| 1149 } | 1150 } |
| 1150 | 1151 |
| 1151 void GraphicsLayer::setBackdropFilters(const FilterOperations& filters) | 1152 void GraphicsLayer::setBackdropFilters(const FilterOperations& filters) |
| 1152 { | 1153 { |
| 1153 SkiaImageFilterBuilder builder; | 1154 SkiaImageFilterBuilder builder; |
| 1154 OwnPtr<WebFilterOperations> webFilters = adoptPtr(Platform::current()->compo
sitorSupport()->createFilterOperations()); | 1155 OwnPtr<WebFilterOperations> webFilters = adoptPtr(CompositorFactory::current
().createFilterOperations()); |
| 1155 FilterOutsets outsets = filters.outsets(); | 1156 FilterOutsets outsets = filters.outsets(); |
| 1156 builder.setCropOffset(FloatSize(outsets.left(), outsets.top())); | 1157 builder.setCropOffset(FloatSize(outsets.left(), outsets.top())); |
| 1157 builder.buildFilterOperations(filters, webFilters.get()); | 1158 builder.buildFilterOperations(filters, webFilters.get()); |
| 1158 m_layer->layer()->setBackgroundFilters(*webFilters); | 1159 m_layer->layer()->setBackgroundFilters(*webFilters); |
| 1159 } | 1160 } |
| 1160 | 1161 |
| 1161 void GraphicsLayer::setFilterQuality(SkFilterQuality filterQuality) | 1162 void GraphicsLayer::setFilterQuality(SkFilterQuality filterQuality) |
| 1162 { | 1163 { |
| 1163 if (m_imageLayer) | 1164 if (m_imageLayer) |
| 1164 m_imageLayer->setNearestNeighbor(filterQuality == kNone_SkFilterQuality)
; | 1165 m_imageLayer->setNearestNeighbor(filterQuality == kNone_SkFilterQuality)
; |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1264 { | 1265 { |
| 1265 if (!layer) { | 1266 if (!layer) { |
| 1266 fprintf(stderr, "Cannot showGraphicsLayerTree for (nil).\n"); | 1267 fprintf(stderr, "Cannot showGraphicsLayerTree for (nil).\n"); |
| 1267 return; | 1268 return; |
| 1268 } | 1269 } |
| 1269 | 1270 |
| 1270 String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo); | 1271 String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo); |
| 1271 fprintf(stderr, "%s\n", output.utf8().data()); | 1272 fprintf(stderr, "%s\n", output.utf8().data()); |
| 1272 } | 1273 } |
| 1273 #endif | 1274 #endif |
| OLD | NEW |