Title: [193954] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 193954
- Author
- matthew_han...@apple.com
- Date
- 2015-12-11 07:03:21 -0800 (Fri, 11 Dec 2015)
Log Message
Merge r193876. rdar://problem/23305376
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193953 => 193954)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-11 12:34:30 UTC (rev 193953)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-11 15:03:21 UTC (rev 193954)
@@ -1,3 +1,25 @@
+2015-12-10 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r193876. rdar://problem/23305376
+
+ 2015-12-09 Simon Fraser <simon.fra...@apple.com>
+
+ Adjust layer backing store format
+ https://bugs.webkit.org/show_bug.cgi?id=152097
+ rdar://problem/23305376
+
+ Reviewed by Tim Horton.
+
+ Call setBackingStoreFormat() on UIWebView tile grid layers, and on compositing
+ layers which can allocate backing store.
+
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+ (WebCore::setBackingStoreFormat):
+ (PlatformCALayerCocoa::commonInit):
+ * platform/ios/LegacyTileGridTile.mm:
+ (WebCore::setBackingStoreFormat):
+ (WebCore::LegacyTileGridTile::LegacyTileGridTile):
+
2015-12-09 Matthew Hanson <matthew_han...@apple.com>
Merge r192712. rdar://problem/23814340
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (193953 => 193954)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2015-12-11 12:34:30 UTC (rev 193953)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2015-12-11 15:03:21 UTC (rev 193954)
@@ -67,6 +67,16 @@
@end
#endif
+#if __has_include(<WebKitAdditions/LayerBackingStoreAdditions.mm>)
+#import <WebKitAdditions/LayerBackingStoreAdditions.mm>
+#else
+namespace WebCore {
+static void setBackingStoreFormat(CALayer *)
+{
+}
+} // namespace WebCore
+#endif
+
SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
SOFT_LINK_CLASS(AVFoundation, AVPlayerLayer)
@@ -298,6 +308,9 @@
else
[m_layer setDelegate:[WebActionDisablingCALayerDelegate shared]];
+ if (m_layerType == LayerTypeWebLayer || m_layerType == LayerTypeTiledBackingTileLayer)
+ setBackingStoreFormat(m_layer.get());
+
// So that the scrolling thread's performance logging code can find all the tiles, mark this as being a tile.
if (m_layerType == LayerTypeTiledBackingTileLayer)
[m_layer setValue:@YES forKey:@"isTile"];
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/ios/LegacyTileGridTile.mm (193953 => 193954)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2015-12-11 12:34:30 UTC (rev 193953)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2015-12-11 15:03:21 UTC (rev 193954)
@@ -38,8 +38,18 @@
#include <algorithm>
#include <functional>
+#if __has_include(<WebKitAdditions/LayerBackingStoreAdditions.mm>)
+#import <WebKitAdditions/LayerBackingStoreAdditions.mm>
+#else
namespace WebCore {
+static void setBackingStoreFormat(CALayer *)
+{
+}
+} // namespace WebCore
+#endif
+namespace WebCore {
+
#if LOG_TILING
static int totalTileCount;
#endif
@@ -60,6 +70,7 @@
m_tileLayer = adoptNS([[LegacyTileLayer alloc] init]);
}
LegacyTileLayer* layer = m_tileLayer.get();
+ setBackingStoreFormat(layer);
[layer setTileGrid:tileGrid];
[layer setOpaque:m_tileGrid->tileCache().tilesOpaque()];
[layer setEdgeAntialiasingMask:0];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
