third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.h - Issue 1427843009: Fix crash about mask layers

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.h

Issue 1427843009: Fix crash about mask layers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Real fix of the issue in Patch Set 2 Created 5 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

« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp » ('j') | no next file with comments »

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 232 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
243 PaintLayerCompositor* compositor() const { return m_owningLayer.compositor() ; }	243 PaintLayerCompositor* compositor() const { return m_owningLayer.compositor() ; }

244	244

245 void updateInternalHierarchy();	245 void updateInternalHierarchy();

246 void updatePaintingPhases();	246 void updatePaintingPhases();

247 bool updateClippingLayers(bool needsAncestorClip, bool needsDescendantClip);	247 bool updateClippingLayers(bool needsAncestorClip, bool needsDescendantClip);

248 bool updateChildTransformLayer(bool needsChildTransformLayer);	248 bool updateChildTransformLayer(bool needsChildTransformLayer);

249 bool updateOverflowControlsLayers(bool needsHorizontalScrollbarLayer, bool n eedsVerticalScrollbarLayer, bool needsScrollCornerLayer, bool needsAncestorClip) ;	249 bool updateOverflowControlsLayers(bool needsHorizontalScrollbarLayer, bool n eedsVerticalScrollbarLayer, bool needsScrollCornerLayer, bool needsAncestorClip) ;

250 bool updateForegroundLayer(bool needsForegroundLayer);	250 bool updateForegroundLayer(bool needsForegroundLayer);

251 bool updateBackgroundLayer(bool needsBackgroundLayer);	251 bool updateBackgroundLayer(bool needsBackgroundLayer);

252 bool updateMaskLayer(bool needsMaskLayer);	252 bool updateMaskLayer(bool needsMaskLayer);

253 bool updateClippingMaskLayers(bool needsChildClippingMaskLayer);	253 void updateChildClippingMaskLayer(bool needsChildClippingMaskLayer);

254 bool requiresHorizontalScrollbarLayer() const { return m_owningLayer.scrolla bleArea() && m_owningLayer.scrollableArea()->horizontalScrollbar(); }	254 bool requiresHorizontalScrollbarLayer() const { return m_owningLayer.scrolla bleArea() && m_owningLayer.scrollableArea()->horizontalScrollbar(); }

255 bool requiresVerticalScrollbarLayer() const { return m_owningLayer.scrollabl eArea() && m_owningLayer.scrollableArea()->verticalScrollbar(); }	255 bool requiresVerticalScrollbarLayer() const { return m_owningLayer.scrollabl eArea() && m_owningLayer.scrollableArea()->verticalScrollbar(); }

256 bool requiresScrollCornerLayer() const { return m_owningLayer.scrollableArea () && !m_owningLayer.scrollableArea()->scrollCornerAndResizerRect().isEmpty(); }	256 bool requiresScrollCornerLayer() const { return m_owningLayer.scrollableArea () && !m_owningLayer.scrollableArea()->scrollCornerAndResizerRect().isEmpty(); }

257 bool updateScrollingLayers(bool scrollingLayers);	257 bool updateScrollingLayers(bool scrollingLayers);

258 void updateScrollParent(PaintLayer*);	258 void updateScrollParent(PaintLayer*);

259 void updateClipParent(PaintLayer* scrollParent);	259 void updateClipParent(PaintLayer* scrollParent);

260 bool updateSquashingLayers(bool needsSquashingLayers);	260 bool updateSquashingLayers(bool needsSquashingLayers);

261 void updateDrawsContent();	261 void updateDrawsContent();

262 void updateChildrenTransform();	262 void updateChildrenTransform();

263 void updateCompositedBounds();	263 void updateCompositedBounds();

(...skipping 178 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
442 unsigned m_scrollingContentsAreEmpty : 1;	442 unsigned m_scrollingContentsAreEmpty : 1;

443	443

444 mutable IntRect m_previousPaintInterestRect;	444 mutable IntRect m_previousPaintInterestRect;

445	445

446 friend class CompositedLayerMappingTest;	446 friend class CompositedLayerMappingTest;

447 };	447 };

448	448

449 } // namespace blink	449 } // namespace blink

450	450

451 #endif // CompositedLayerMapping_h	451 #endif // CompositedLayerMapping_h

OLD	NEW