Title: [109850] tags/Safari-536.2.1/Source/WebCore
Diff
Modified: tags/Safari-536.2.1/Source/WebCore/ChangeLog (109849 => 109850)
--- tags/Safari-536.2.1/Source/WebCore/ChangeLog 2012-03-06 05:07:49 UTC (rev 109849)
+++ tags/Safari-536.2.1/Source/WebCore/ChangeLog 2012-03-06 05:09:33 UTC (rev 109850)
@@ -1,5 +1,28 @@
2011-03-05 Lucas Forschler <[email protected]>
+ Merge 109486
+
+ 2012-03-01 Anders Carlsson <[email protected]>
+
+ Crash when doing repeated double-tap-to-zoom gesture on apple startpage
+ https://bugs.webkit.org/show_bug.cgi?id=80081
+ <rdar://problem/10966391>
+
+ Reviewed by Sam Weinig.
+
+ Setting the contents scale on the tile cache layer was creating a WebTileCacheLayer presentation layer copy with a null _tileCache.
+
+ Implement -[WebTileCacheLayer actionForKey:] and have it always return nil so we'll avoid implicit animations, and thus creating presentation layers.
+
+ * platform/graphics/ca/mac/WebTileCacheLayer.mm:
+ (-[WebTileCacheLayer initWithLayer:]):
+ Implement this and assert that it's never reached. We should never create presentation layers since we don't animate this layer.
+
+ (-[WebTileCacheLayer actionForKey:]):
+ Implement this and always return nil.
+
+2011-03-05 Lucas Forschler <[email protected]>
+
Merge 109379
2012-03-01 Beth Dakin <[email protected]>
Modified: tags/Safari-536.2.1/Source/WebCore/platform/graphics/ca/mac/WebTileCacheLayer.mm (109849 => 109850)
--- tags/Safari-536.2.1/Source/WebCore/platform/graphics/ca/mac/WebTileCacheLayer.mm 2012-03-06 05:07:49 UTC (rev 109849)
+++ tags/Safari-536.2.1/Source/WebCore/platform/graphics/ca/mac/WebTileCacheLayer.mm 2012-03-06 05:09:33 UTC (rev 109850)
@@ -58,6 +58,22 @@
[super dealloc];
}
+- (id)initWithLayer:(id)layer
+{
+ UNUSED_PARAM(layer);
+
+ ASSERT_NOT_REACHED();
+ return nil;
+}
+
+- (id<CAAction>)actionForKey:(NSString *)key
+{
+ UNUSED_PARAM(key);
+
+ // Disable all animations.
+ return nil;
+}
+
- (void)setBounds:(CGRect)bounds
{
[super setBounds:bounds];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
