| 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 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 if (paintingControl != PaintDefaultBehavior) | 87 if (paintingControl != PaintDefaultBehavior) |
| 88 m_graphicsLayer->paint(nullptr, disabledMode); | 88 m_graphicsLayer->paint(nullptr, disabledMode); |
| 89 | 89 |
| 90 paintController.paintArtifact().appendToWebDisplayItemList( | 90 paintController.paintArtifact().appendToWebDisplayItemList( |
| 91 webDisplayItemList); | 91 webDisplayItemList); |
| 92 | 92 |
| 93 if (!RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) { | 93 if (!RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) { |
| 94 // TODO(ccameron): This color space should come from the GraphicsLayer. | 94 // TODO(ccameron): This color space should come from the GraphicsLayer. |
| 95 // https://crbug.com/667411 | 95 // https://crbug.com/667411 |
| 96 webDisplayItemList->setImpliedColorSpace(gfx::ColorSpace::FromSkColorSpace( | 96 webDisplayItemList->setImpliedColorSpace(gfx::ColorSpace::FromSkColorSpace( |
| 97 ImageDecoder::globalTargetColorSpace())); | 97 ColorBehavior::globalTargetColorSpace())); |
| 98 } | 98 } |
| 99 paintController.setDisplayItemConstructionIsDisabled(false); | 99 paintController.setDisplayItemConstructionIsDisabled(false); |
| 100 paintController.setSubsequenceCachingIsDisabled(false); | 100 paintController.setSubsequenceCachingIsDisabled(false); |
| 101 } | 101 } |
| 102 | 102 |
| 103 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const { | 103 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const { |
| 104 return m_graphicsLayer->getPaintController().approximateUnsharedMemoryUsage(); | 104 return m_graphicsLayer->getPaintController().approximateUnsharedMemoryUsage(); |
| 105 } | 105 } |
| 106 | 106 |
| 107 } // namespace blink | 107 } // namespace blink |
| OLD | NEW |