Title: [183125] branches/safari-600.7-branch/Source/WebKit2
- Revision
- 183125
- Author
- [email protected]
- Date
- 2015-04-22 13:13:06 -0700 (Wed, 22 Apr 2015)
Log Message
Merge r174288. rdar://problem/20368461
Modified Paths
Diff
Modified: branches/safari-600.7-branch/Source/WebKit2/ChangeLog (183124 => 183125)
--- branches/safari-600.7-branch/Source/WebKit2/ChangeLog 2015-04-22 20:05:06 UTC (rev 183124)
+++ branches/safari-600.7-branch/Source/WebKit2/ChangeLog 2015-04-22 20:13:06 UTC (rev 183125)
@@ -1,3 +1,17 @@
+2015-04-22 Matthew Hanson <[email protected]>
+
+ Merge r174288. rdar://problem/20368461
+
+ 2014-10-03 Jer Noble <[email protected]>
+
+ Revert an accidental change introduced by r173318.
+
+ Rubber-stamped by Tim Horton.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::suspendPainting):
+ (WebKit::TiledCoreAnimationDrawingArea::resumePainting):
+
2015-04-17 Lucas Forschler <[email protected]>
Merge r182285
Modified: branches/safari-600.7-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (183124 => 183125)
--- branches/safari-600.7-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-04-22 20:05:06 UTC (rev 183124)
+++ branches/safari-600.7-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-04-22 20:13:06 UTC (rev 183125)
@@ -361,8 +361,8 @@
ASSERT(!m_isPaintingSuspended);
m_isPaintingSuspended = true;
-// [m_hostingLayer setValue:@YES forKey:@"NSCAViewRenderPaused"];
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"NSCAViewRenderDidPauseNotification" object:nil userInfo:[NSDictionary dictionaryWithObject:m_hostingLayer.get() forKey:@"layer"]];
+ [m_hostingLayer setValue:@YES forKey:@"NSCAViewRenderPaused"];
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"NSCAViewRenderDidPauseNotification" object:nil userInfo:[NSDictionary dictionaryWithObject:m_hostingLayer.get() forKey:@"layer"]];
}
void TiledCoreAnimationDrawingArea::resumePainting()
@@ -374,8 +374,8 @@
}
m_isPaintingSuspended = false;
-// [m_hostingLayer setValue:@NO forKey:@"NSCAViewRenderPaused"];
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"NSCAViewRenderDidResumeNotification" object:nil userInfo:[NSDictionary dictionaryWithObject:m_hostingLayer.get() forKey:@"layer"]];
+ [m_hostingLayer setValue:@NO forKey:@"NSCAViewRenderPaused"];
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"NSCAViewRenderDidResumeNotification" object:nil userInfo:[NSDictionary dictionaryWithObject:m_hostingLayer.get() forKey:@"layer"]];
}
void TiledCoreAnimationDrawingArea::setExposedRect(const FloatRect& exposedRect)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
