| 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 1846 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1857     if (!image) | 1857     if (!image) | 
| 1858         return; | 1858         return; | 
| 1859 | 1859 | 
| 1860     // We have to wait until the image is fully loaded before setting it on the 
      layer. | 1860     // We have to wait until the image is fully loaded before setting it on the 
      layer. | 
| 1861     if (!cachedImage->isLoaded()) | 1861     if (!cachedImage->isLoaded()) | 
| 1862         return; | 1862         return; | 
| 1863 | 1863 | 
| 1864     // This is a no-op if the layer doesn't have an inner layer for the image. | 1864     // This is a no-op if the layer doesn't have an inner layer for the image. | 
| 1865     m_graphicsLayer->setContentsToImage(image); | 1865     m_graphicsLayer->setContentsToImage(image); | 
| 1866 | 1866 | 
|  | 1867     m_graphicsLayer->setFilterLevel(renderer()->style()->imageRendering() == Ima
      geRenderingPixelated ? SkPaint::kNone_FilterLevel : SkPaint::kLow_FilterLevel); | 
|  | 1868 | 
| 1867     // Prevent double-drawing: https://bugs.webkit.org/show_bug.cgi?id=58632 | 1869     // Prevent double-drawing: https://bugs.webkit.org/show_bug.cgi?id=58632 | 
| 1868     updateDrawsContent(); | 1870     updateDrawsContent(); | 
| 1869 | 1871 | 
| 1870     // Image animation is "lazy", in that it automatically stops unless someone 
      is drawing | 1872     // Image animation is "lazy", in that it automatically stops unless someone 
      is drawing | 
| 1871     // the image. So we have to kick the animation each time; this has the downs
      ide that the | 1873     // the image. So we have to kick the animation each time; this has the downs
      ide that the | 
| 1872     // image will keep animating, even if its layer is not visible. | 1874     // image will keep animating, even if its layer is not visible. | 
| 1873     image->startAnimation(); | 1875     image->startAnimation(); | 
| 1874 } | 1876 } | 
| 1875 | 1877 | 
| 1876 FloatPoint3D CompositedLayerMapping::computeTransformOrigin(const IntRect& borde
      rBox) const | 1878 FloatPoint3D CompositedLayerMapping::computeTransformOrigin(const IntRect& borde
      rBox) const | 
| (...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2316     } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2318     } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 
| 2317         name = "Scrolling Block Selection Layer"; | 2319         name = "Scrolling Block Selection Layer"; | 
| 2318     } else { | 2320     } else { | 
| 2319         ASSERT_NOT_REACHED(); | 2321         ASSERT_NOT_REACHED(); | 
| 2320     } | 2322     } | 
| 2321 | 2323 | 
| 2322     return name; | 2324     return name; | 
| 2323 } | 2325 } | 
| 2324 | 2326 | 
| 2325 } // namespace blink | 2327 } // namespace blink | 
| OLD | NEW | 
|---|