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

Side by Side Diff: Source/core/rendering/CompositedLayerMapping.cpp

Issue 59613010: Fix propagation of clip-path and border-radius clipping to child layers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix for mac build Created 7 years, 1 month 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 | Annotate | Revision Log
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 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 457
458 updateScrollParent(scrollParent); 458 updateScrollParent(scrollParent);
459 updateClipParent(m_owningLayer->clipParent()); 459 updateClipParent(m_owningLayer->clipParent());
460 460
461 if (layerConfigChanged) 461 if (layerConfigChanged)
462 updateInternalHierarchy(); 462 updateInternalHierarchy();
463 463
464 if (updateMaskLayer(renderer->hasMask())) 464 if (updateMaskLayer(renderer->hasMask()))
465 m_graphicsLayer->setMaskLayer(m_maskLayer.get()); 465 m_graphicsLayer->setMaskLayer(m_maskLayer.get());
466 466
467 bool needsChildClippingMask = (renderer->style()->hasBorderRadius() || rende rer->style()->clipPath()) && isAcceleratedContents(renderer); 467 bool needsChildClippingMask = (renderer->style()->hasBorderRadius() || m_own ingLayer->hasComplexClippedAncestor()) && isAcceleratedContents(renderer);
468
468 if (updateClippingMaskLayers(needsChildClippingMask)) 469 if (updateClippingMaskLayers(needsChildClippingMask))
469 m_graphicsLayer->setContentsClippingMaskLayer(m_childClippingMaskLayer.g et()); 470 m_graphicsLayer->setContentsClippingMaskLayer(m_childClippingMaskLayer.g et());
470 471
471 if (m_owningLayer->reflectionInfo()) { 472 if (m_owningLayer->reflectionInfo()) {
472 if (m_owningLayer->reflectionInfo()->reflectionLayer()->hasCompositedLay erMapping()) { 473 if (m_owningLayer->reflectionInfo()->reflectionLayer()->hasCompositedLay erMapping()) {
473 GraphicsLayer* reflectionLayer = m_owningLayer->reflectionInfo()->re flectionLayer()->compositedLayerMapping()->mainGraphicsLayer(); 474 GraphicsLayer* reflectionLayer = m_owningLayer->reflectionInfo()->re flectionLayer()->compositedLayerMapping()->mainGraphicsLayer();
474 m_graphicsLayer->setReplicatedByLayer(reflectionLayer); 475 m_graphicsLayer->setReplicatedByLayer(reflectionLayer);
475 } 476 }
476 } else { 477 } else {
477 m_graphicsLayer->setReplicatedByLayer(0); 478 m_graphicsLayer->setReplicatedByLayer(0);
(...skipping 1528 matching lines...) Expand 10 before | Expand all | Expand 10 after
2006 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 2007 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
2007 name = "Scrolling Contents Layer"; 2008 name = "Scrolling Contents Layer";
2008 } else { 2009 } else {
2009 ASSERT_NOT_REACHED(); 2010 ASSERT_NOT_REACHED();
2010 } 2011 }
2011 2012
2012 return name; 2013 return name;
2013 } 2014 }
2014 2015
2015 } // namespace WebCore 2016 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/canvas/canvas-css-clip-path-nested-container-expected.html ('k') | Source/core/rendering/RenderLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698