Title: [121926] trunk/Source/WebCore
- Revision
- 121926
- Author
- [email protected]
- Date
- 2012-07-05 16:14:29 -0700 (Thu, 05 Jul 2012)
Log Message
Add a utility method for hasOverflowClip() or hasClip()
https://bugs.webkit.org/show_bug.cgi?id=90635
Reviewed by Dean Jackson.
Add RenderObject::hasClipOrOverflowClip() as a convenience method
since we end up calling hasOverfFlowClip() || hasClip() a lot in the layer code.
No new tests; refactoring only.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
(WebCore::RenderLayer::calculateRects):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::enclosingNonStackingClippingLayer):
(WebCore::RenderLayerCompositor::clipsCompositingDescendants):
* rendering/RenderObject.h:
(WebCore::RenderObject::hasClipOrOverflowClip):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121925 => 121926)
--- trunk/Source/WebCore/ChangeLog 2012-07-05 22:55:51 UTC (rev 121925)
+++ trunk/Source/WebCore/ChangeLog 2012-07-05 23:14:29 UTC (rev 121926)
@@ -1,3 +1,24 @@
+2012-07-05 Simon Fraser <[email protected]>
+
+ Add a utility method for hasOverflowClip() or hasClip()
+ https://bugs.webkit.org/show_bug.cgi?id=90635
+
+ Reviewed by Dean Jackson.
+
+ Add RenderObject::hasClipOrOverflowClip() as a convenience method
+ since we end up calling hasOverfFlowClip() || hasClip() a lot in the layer code.
+
+ No new tests; refactoring only.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+ (WebCore::RenderLayer::calculateRects):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::enclosingNonStackingClippingLayer):
+ (WebCore::RenderLayerCompositor::clipsCompositingDescendants):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::hasClipOrOverflowClip):
+
2012-07-05 Yongjun Zhang <[email protected]>
Code refactoring: move mimeTypeFromUTITree to a separate file.
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (121925 => 121926)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-07-05 22:55:51 UTC (rev 121925)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-07-05 23:14:29 UTC (rev 121926)
@@ -3903,7 +3903,7 @@
clipRects.setOverflowClipRect(clipRects.posClipRect());
// Update the clip rects that will be passed to child layers.
- if (renderer()->hasOverflowClip() || renderer()->hasClip()) {
+ if (renderer()->hasClipOrOverflowClip()) {
// This layer establishes a clip of some kind.
// This offset cannot use convertToLayerCoords, because sometimes our rootLayer may be across
@@ -3990,7 +3990,7 @@
layerBounds = LayoutRect(offset, size());
// Update the clip rects that will be passed to child layers.
- if (renderer()->hasOverflowClip() || renderer()->hasClip()) {
+ if (renderer()->hasClipOrOverflowClip()) {
// This layer establishes a clip of some kind.
if (renderer()->hasOverflowClip()) {
foregroundRect.intersect(toRenderBox(renderer())->overflowClipRect(offset, region, relevancy));
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (121925 => 121926)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-07-05 22:55:51 UTC (rev 121925)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-07-05 23:14:29 UTC (rev 121926)
@@ -637,7 +637,7 @@
if (curr->isStackingContext())
return 0;
- if (curr->renderer()->hasOverflowClip() || curr->renderer()->hasClip())
+ if (curr->renderer()->hasClipOrOverflowClip())
return curr;
}
return 0;
@@ -1610,8 +1610,7 @@
// into the hierarchy between this layer and its children in the z-order hierarchy.
bool RenderLayerCompositor::clipsCompositingDescendants(const RenderLayer* layer) const
{
- return layer->hasCompositingDescendant() &&
- (layer->renderer()->hasOverflowClip() || layer->renderer()->hasClip());
+ return layer->hasCompositingDescendant() && layer->renderer()->hasClipOrOverflowClip();
}
// Return true if there is an ancestor layer that is fixed positioned to the view.
Modified: trunk/Source/WebCore/rendering/RenderObject.h (121925 => 121926)
--- trunk/Source/WebCore/rendering/RenderObject.h 2012-07-05 22:55:51 UTC (rev 121925)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2012-07-05 23:14:29 UTC (rev 121926)
@@ -541,6 +541,7 @@
bool hasClip() const { return isOutOfFlowPositioned() && style()->hasClip(); }
bool hasOverflowClip() const { return m_bitfields.hasOverflowClip(); }
+ bool hasClipOrOverflowClip() const { return hasClip() || hasOverflowClip(); }
bool hasTransform() const { return m_bitfields.hasTransform(); }
bool hasMask() const { return style() && style()->hasMask(); }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
