| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND |
| 14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| 16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE | 16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE |
| 17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
| 18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | 18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
| 19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | 19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
| 20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
| 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
| 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH |
| 23 * DAMAGE. | 23 * DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "platform/graphics/ContentLayerDelegate.h" | 26 #include "platform/graphics/ContentLayerDelegate.h" |
| 27 | 27 |
| 28 #include "platform/RuntimeEnabledFeatures.h" | |
| 29 #include "platform/geometry/IntRect.h" | 28 #include "platform/geometry/IntRect.h" |
| 30 #include "platform/graphics/GraphicsContext.h" | 29 #include "platform/graphics/GraphicsContext.h" |
| 31 #include "platform/graphics/GraphicsLayer.h" | 30 #include "platform/graphics/GraphicsLayer.h" |
| 32 #include "platform/graphics/paint/PaintController.h" | 31 #include "platform/graphics/paint/PaintController.h" |
| 33 #include "platform/image-decoders/ImageDecoder.h" | 32 #include "platform/image-decoders/ImageDecoder.h" |
| 34 #include "platform/tracing/TraceEvent.h" | 33 #include "platform/tracing/TraceEvent.h" |
| 35 #include "platform/tracing/TracedValue.h" | 34 #include "platform/tracing/TracedValue.h" |
| 36 #include "public/platform/WebDisplayItemList.h" | 35 #include "public/platform/WebDisplayItemList.h" |
| 37 #include "public/platform/WebRect.h" | 36 #include "public/platform/WebRect.h" |
| 38 #include "third_party/skia/include/core/SkPicture.h" | 37 #include "third_party/skia/include/core/SkPicture.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 // Anything other than PaintDefaultBehavior is for testing. In non-testing | 82 // Anything other than PaintDefaultBehavior is for testing. In non-testing |
| 84 // scenarios, it is an error to call GraphicsLayer::paint. Actual painting | 83 // scenarios, it is an error to call GraphicsLayer::paint. Actual painting |
| 85 // occurs in FrameView::synchronizedPaint; this method merely copies the | 84 // occurs in FrameView::synchronizedPaint; this method merely copies the |
| 86 // painted output to the WebDisplayItemList. | 85 // painted output to the WebDisplayItemList. |
| 87 if (paintingControl != PaintDefaultBehavior) | 86 if (paintingControl != PaintDefaultBehavior) |
| 88 m_graphicsLayer->paint(nullptr, disabledMode); | 87 m_graphicsLayer->paint(nullptr, disabledMode); |
| 89 | 88 |
| 90 paintController.paintArtifact().appendToWebDisplayItemList( | 89 paintController.paintArtifact().appendToWebDisplayItemList( |
| 91 webDisplayItemList); | 90 webDisplayItemList); |
| 92 | 91 |
| 93 if (!RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) { | 92 if (m_graphicsLayer->colorBehavior().isTransformToTargetColorSpace()) { |
| 94 // TODO(ccameron): This color space should come from the GraphicsLayer. | |
| 95 // https://crbug.com/667411 | |
| 96 webDisplayItemList->setImpliedColorSpace(gfx::ColorSpace::FromSkColorSpace( | 93 webDisplayItemList->setImpliedColorSpace(gfx::ColorSpace::FromSkColorSpace( |
| 97 ColorBehavior::globalTargetColorSpace())); | 94 m_graphicsLayer->colorBehavior().targetColorSpace())); |
| 98 } | 95 } |
| 99 paintController.setDisplayItemConstructionIsDisabled(false); | 96 paintController.setDisplayItemConstructionIsDisabled(false); |
| 100 paintController.setSubsequenceCachingIsDisabled(false); | 97 paintController.setSubsequenceCachingIsDisabled(false); |
| 101 } | 98 } |
| 102 | 99 |
| 103 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const { | 100 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const { |
| 104 return m_graphicsLayer->getPaintController().approximateUnsharedMemoryUsage(); | 101 return m_graphicsLayer->getPaintController().approximateUnsharedMemoryUsage(); |
| 105 } | 102 } |
| 106 | 103 |
| 107 } // namespace blink | 104 } // namespace blink |
| OLD | NEW |