Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp

Issue 1361413004: Fix directly composited image path for CSS image-orientation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1845 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 1856
1857 LayoutImage* imageLayoutObject = toLayoutImage(layoutObject); 1857 LayoutImage* imageLayoutObject = toLayoutImage(layoutObject);
1858 if (ImageResource* cachedImage = imageLayoutObject->cachedImage()) { 1858 if (ImageResource* cachedImage = imageLayoutObject->cachedImage()) {
1859 if (!cachedImage->hasImage()) 1859 if (!cachedImage->hasImage())
1860 return false; 1860 return false;
1861 1861
1862 Image* image = cachedImage->imageForLayoutObject(imageLayoutObject); 1862 Image* image = cachedImage->imageForLayoutObject(imageLayoutObject);
1863 if (!image->isBitmapImage()) 1863 if (!image->isBitmapImage())
1864 return false; 1864 return false;
1865 1865
1866 // FIXME: We should be able to handle bitmap images using direct composi ting 1866 return true;
Noel Gordon 2015/09/25 00:12:19 Very cool, and I can see why layout tests are pass
1867 // no matter what image-orientation value. See crbug.com/502267
1868 if (imageLayoutObject->style()->respectImageOrientation() != RespectImag eOrientation)
1869 return true;
1870 } 1867 }
1871 1868
1872 return false; 1869 return false;
1873 } 1870 }
1874 1871
1875 void CompositedDeprecatedPaintLayerMapping::contentChanged(ContentChangeType cha ngeType) 1872 void CompositedDeprecatedPaintLayerMapping::contentChanged(ContentChangeType cha ngeType)
1876 { 1873 {
1877 if ((changeType == ImageChanged) && layoutObject()->isImage() && isDirectlyC ompositedImage()) { 1874 if ((changeType == ImageChanged) && layoutObject()->isImage() && isDirectlyC ompositedImage()) {
1878 updateImageContents(); 1875 updateImageContents();
1879 return; 1876 return;
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
2384 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { 2381 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
2385 name = "Scrolling Block Selection Layer"; 2382 name = "Scrolling Block Selection Layer";
2386 } else { 2383 } else {
2387 ASSERT_NOT_REACHED(); 2384 ASSERT_NOT_REACHED();
2388 } 2385 }
2389 2386
2390 return name; 2387 return name;
2391 } 2388 }
2392 2389
2393 } // namespace blink 2390 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698