Unreviewed; fix the build.

* Shared/mac/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::drawInContext):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@169961 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 466ed64865bba89585002b203b52ac79d43c6703..0406c0b31a1b696a8c9c20bd2dae213c9cf8afbb 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-13  Tim Horton  <timothy_horton@apple.com>
+
+        Unreviewed; fix the build.
+
+        * Shared/mac/RemoteLayerBackingStore.mm:
+        (WebKit::RemoteLayerBackingStore::drawInContext):
+
 2014-06-13  Martin Hock  <mhock@apple.com>
 
         Clean up layers in RemoteLayerTreeHost::clearLayers().

diff --git a/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm b/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
index eb74ab7e51ef3d3c42e324d77303a25890e328e0..2543f1509327b6fb48cad5ee1abbc917c620d6cc 100644 (file)
--- a/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
+++ b/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
@@ -279,7 +279,7 @@ void RemoteLayerBackingStore::drawInContext(GraphicsContext& context, CGImageRef
     IntRect dirtyBounds = m_dirtyRegion.bounds();
 
     Vector<IntRect> dirtyRects = m_dirtyRegion.rects();
-    if (dirtyRects.size() > webLayerMaxRectsToPaint || m_dirtyRegion.totalArea() > webLayerWastedSpaceThreshold * dirtyBounds.width() * dirtyBounds.height()) {
+    if (dirtyRects.size() > PlatformCALayer::webLayerMaxRectsToPaint || m_dirtyRegion.totalArea() > PlatformCALayer::webLayerWastedSpaceThreshold * dirtyBounds.width() * dirtyBounds.height()) {
         dirtyRects.clear();
         dirtyRects.append(dirtyBounds);
     }
@@ -293,7 +293,7 @@ void RemoteLayerBackingStore::drawInContext(GraphicsContext& context, CGImageRef
         m_paintingRects.append(scaledRect);
     }
 
-    CGRect cgPaintingRects[webLayerMaxRectsToPaint];
+    CGRect cgPaintingRects[PlatformCALayer::webLayerMaxRectsToPaint];
     for (size_t i = 0, dirtyRectCount = m_paintingRects.size(); i < dirtyRectCount; ++i) {
         FloatRect scaledPaintingRect = m_paintingRects[i];
         scaledPaintingRect.scale(m_scale);
@@ -324,7 +324,7 @@ void RemoteLayerBackingStore::drawInContext(GraphicsContext& context, CGImageRef
         m_layer->owner()->platformCALayerPaintContents(m_layer, context, dirtyBounds);
         break;
     case PlatformCALayer::LayerTypeWebLayer:
-        drawLayerContents(cgContext, m_layer, m_paintingRects);
+        PlatformCALayer::drawLayerContents(cgContext, m_layer, m_paintingRects);
         break;
     case PlatformCALayer::LayerTypeLayer:
     case PlatformCALayer::LayerTypeTransformLayer: