Title: [169961] trunk/Source/WebKit2
- Revision
- 169961
- Author
- timothy_hor...@apple.com
- Date
- 2014-06-13 22:09:37 -0700 (Fri, 13 Jun 2014)
Log Message
Unreviewed; fix the build.
* Shared/mac/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::drawInContext):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169960 => 169961)
--- trunk/Source/WebKit2/ChangeLog 2014-06-14 02:59:00 UTC (rev 169960)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-14 05:09:37 UTC (rev 169961)
@@ -1,3 +1,10 @@
+2014-06-13 Tim Horton <timothy_hor...@apple.com>
+
+ Unreviewed; fix the build.
+
+ * Shared/mac/RemoteLayerBackingStore.mm:
+ (WebKit::RemoteLayerBackingStore::drawInContext):
+
2014-06-13 Martin Hock <mh...@apple.com>
Clean up layers in RemoteLayerTreeHost::clearLayers().
Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (169960 => 169961)
--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-06-14 02:59:00 UTC (rev 169960)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-06-14 05:09:37 UTC (rev 169961)
@@ -279,7 +279,7 @@
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 @@
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 @@
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:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
