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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
50 #include "core/paint/DeprecatedPaintLayerPainter.h" | 50 #include "core/paint/DeprecatedPaintLayerPainter.h" |
51 #include "core/paint/DeprecatedPaintLayerStackingNodeIterator.h" | 51 #include "core/paint/DeprecatedPaintLayerStackingNodeIterator.h" |
52 #include "core/paint/ScrollableAreaPainter.h" | 52 #include "core/paint/ScrollableAreaPainter.h" |
53 #include "core/paint/TransformRecorder.h" | 53 #include "core/paint/TransformRecorder.h" |
54 #include "core/plugins/PluginView.h" | 54 #include "core/plugins/PluginView.h" |
55 #include "core/style/KeyframeList.h" | 55 #include "core/style/KeyframeList.h" |
56 #include "platform/LengthFunctions.h" | 56 #include "platform/LengthFunctions.h" |
57 #include "platform/RuntimeEnabledFeatures.h" | 57 #include "platform/RuntimeEnabledFeatures.h" |
58 #include "platform/fonts/FontCache.h" | 58 #include "platform/fonts/FontCache.h" |
59 #include "platform/geometry/TransformState.h" | 59 #include "platform/geometry/TransformState.h" |
60 #include "platform/graphics/BitmapImage.h" | |
60 #include "platform/graphics/GraphicsContext.h" | 61 #include "platform/graphics/GraphicsContext.h" |
61 #include "platform/graphics/paint/ClipDisplayItem.h" | 62 #include "platform/graphics/paint/ClipDisplayItem.h" |
62 #include "platform/graphics/paint/DisplayItemList.h" | 63 #include "platform/graphics/paint/DisplayItemList.h" |
63 #include "platform/graphics/paint/TransformDisplayItem.h" | 64 #include "platform/graphics/paint/TransformDisplayItem.h" |
64 #include "wtf/CurrentTime.h" | 65 #include "wtf/CurrentTime.h" |
65 #include "wtf/text/StringBuilder.h" | 66 #include "wtf/text/StringBuilder.h" |
66 | 67 |
67 namespace blink { | 68 namespace blink { |
68 | 69 |
69 using namespace HTMLNames; | 70 using namespace HTMLNames; |
(...skipping 1774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1844 LayoutObject* layoutObject = this->layoutObject(); | 1845 LayoutObject* layoutObject = this->layoutObject(); |
1845 if (m_owningLayer.hasBoxDecorationsOrBackground() || layoutObject->hasClip() || layoutObject->hasClipPath()) | 1846 if (m_owningLayer.hasBoxDecorationsOrBackground() || layoutObject->hasClip() || layoutObject->hasClipPath()) |
1846 return false; | 1847 return false; |
1847 | 1848 |
1848 LayoutImage* imageLayoutObject = toLayoutImage(layoutObject); | 1849 LayoutImage* imageLayoutObject = toLayoutImage(layoutObject); |
1849 if (ImageResource* cachedImage = imageLayoutObject->cachedImage()) { | 1850 if (ImageResource* cachedImage = imageLayoutObject->cachedImage()) { |
1850 if (!cachedImage->hasImage()) | 1851 if (!cachedImage->hasImage()) |
1851 return false; | 1852 return false; |
1852 | 1853 |
1853 Image* image = cachedImage->imageForLayoutObject(imageLayoutObject); | 1854 Image* image = cachedImage->imageForLayoutObject(imageLayoutObject); |
1854 return image->isBitmapImage(); | 1855 if (!image->isBitmapImage()) |
1856 return false; | |
1857 | |
1858 return imageLayoutObject->style()->respectImageOrientation() != RespectI mageOrientation | |
1859 || toBitmapImage(image)->size() == toBitmapImage(image)->sizeRespect ingOrientation(); | |
Noel Gordon
2015/06/12 16:21:04
The first part of the clause looks right to me. B
rwlbuis
2015/06/15 17:21:52
Done.
| |
1855 } | 1860 } |
1856 | 1861 |
1857 return false; | 1862 return false; |
1858 } | 1863 } |
1859 | 1864 |
1860 void CompositedDeprecatedPaintLayerMapping::contentChanged(ContentChangeType cha ngeType) | 1865 void CompositedDeprecatedPaintLayerMapping::contentChanged(ContentChangeType cha ngeType) |
1861 { | 1866 { |
1862 if ((changeType == ImageChanged) && layoutObject()->isImage() && isDirectlyC ompositedImage()) { | 1867 if ((changeType == ImageChanged) && layoutObject()->isImage() && isDirectlyC ompositedImage()) { |
1863 updateImageContents(); | 1868 updateImageContents(); |
1864 return; | 1869 return; |
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2343 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2348 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
2344 name = "Scrolling Block Selection Layer"; | 2349 name = "Scrolling Block Selection Layer"; |
2345 } else { | 2350 } else { |
2346 ASSERT_NOT_REACHED(); | 2351 ASSERT_NOT_REACHED(); |
2347 } | 2352 } |
2348 | 2353 |
2349 return name; | 2354 return name; |
2350 } | 2355 } |
2351 | 2356 |
2352 } // namespace blink | 2357 } // namespace blink |
OLD | NEW |