Changeset 42850 in webkit

Timestamp:

Apr 24, 2009 4:05:21 PM (15 years ago)

Author:

mitz@apple.com

Message:

• address Hyatt's review comments on the last patch

• rendering/RenderLayer.cpp: (WebCore::performOverlapTests): (WebCore::RenderLayer::paintLayer):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-04-24  Dan Bernstein  <mitz@apple.com>
+
+        - address Hyatt's review comments on the last patch
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::performOverlapTests):
+        (WebCore::RenderLayer::paintLayer):
+
 2009-04-24  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/rendering/RenderLayer.cpp

@@ -1912 +1912 @@
 }
 
-void
-RenderLayer::paintLayer(RenderLayer* rootLayer, GraphicsContext* p,
+static void performOverlapTests(RenderObject::OverlapTestRequestMap& overlapTestRequests, const IntRect& layerBounds)
+{
+    Vector<OverlapTestRequestClient*> overlappedRequestClients;
+    RenderObject::OverlapTestRequestMap::iterator end = overlapTestRequests.end();
+    for (RenderObject::OverlapTestRequestMap::iterator it = overlapTestRequests.begin(); it != end; ++it) {
+        if (!layerBounds.intersects(it->second))
+            continue;
+
+        it->first->setOverlapTestResult(true);
+        overlappedRequestClients.append(it->first);
+    }
+    for (size_t i = 0; i < overlappedRequestClients.size(); ++i)
+        overlapTestRequests.remove(overlappedRequestClients[i]);
+}
+
+void RenderLayer::paintLayer(RenderLayer* rootLayer, GraphicsContext* p,
                         const IntRect& paintDirtyRect, bool haveTransparency, PaintRestriction paintRestriction,
                         RenderObject* paintingRoot, RenderObject::OverlapTestRequestMap* overlapTestRequests,
@@ -2014 +2028 @@
         paintingRootForRenderer = paintingRoot;
 
-    if (overlapTestRequests) {
-         Vector<OverlapTestRequestClient*> overlappedRequestClients;
-        RenderObject::OverlapTestRequestMap::iterator end = overlapTestRequests->end();
-        for (RenderObject::OverlapTestRequestMap::iterator it = overlapTestRequests->begin(); it != end; ++it) {
-            if (!layerBounds.intersects(it->second))
-                continue;
-
-            it->first->setOverlapTestResult(true);
-            overlappedRequestClients.append(it->first);
-        }
-        for (size_t i = 0; i < overlappedRequestClients.size(); ++i)
-            overlapTestRequests->remove(overlappedRequestClients[i]);
-    }
+    if (overlapTestRequests)
+        performOverlapTests(*overlapTestRequests, layerBounds);
 
     // We want to paint our layer, but only if we intersect the damage rect.