Title: [152261] branches/safari-537-branch/Source/WebKit2
- Revision
- 152261
- Author
- [email protected]
- Date
- 2013-07-01 14:13:49 -0700 (Mon, 01 Jul 2013)
Log Message
Merged r152187. <rdar://problem/14250167>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (152260 => 152261)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-01 21:12:21 UTC (rev 152260)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-01 21:13:49 UTC (rev 152261)
@@ -1,5 +1,22 @@
2013-07-01 Lucas Forschler <[email protected]>
+ Merge r152187
+
+ 2013-06-28 Gavin Barraclough <[email protected]>
+
+ Stale occlusion state after moving page back into window
+ https://bugs.webkit.org/show_bug.cgi?id=118202
+
+ Reviewed by Anders Carlsson.
+
+ We need to update the occlusion state when the page goes back into the window.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView viewDidMoveToWindow]):
+ - update occlusion state.
+
+2013-07-01 Lucas Forschler <[email protected]>
+
Merge r152182
2013-06-28 Anders Carlsson <[email protected]>
Modified: branches/safari-537-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (152260 => 152261)
--- branches/safari-537-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2013-07-01 21:12:21 UTC (rev 152260)
+++ branches/safari-537-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2013-07-01 21:13:49 UTC (rev 152261)
@@ -1980,6 +1980,10 @@
// update the active state first and then make it visible. If the view is about to be hidden, we hide it first and then
// update the active state.
if ([self window]) {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ if (_data->_windowOcclusionDetectionEnabled)
+ [self _setIsWindowOccluded:([[self window] occlusionState] & NSWindowOcclusionStateVisible) != NSWindowOcclusionStateVisible];
+#endif
_data->_windowHasValidBackingStore = NO;
[self doWindowDidChangeScreen];
[self _updateWindowVisibility];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
