[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 13:39:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 727d3af45c7c6cf8d3589d14524b1f625b07bc58
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 22 17:48:40 2010 +0000
Don't listen for some window notifications on all windows
https://bugs.webkit.org/show_bug.cgi?id=46277
Reviewed by John Sullivan.
Only listen for NSWindowDidBecomeKeyNotification and NSWindowDidResignKeyNotification notifications
on all windows; this matches old WebKit and fixes a crash where we would send notifications to views whose
underlying pages were invalid.
* UIProcess/API/mac/WKView.mm:
(-[WKView addWindowObserversForWindow:]):
(-[WKView removeWindowObservers]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68057 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8ffc948..1c97b0e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,20 @@
2010-09-22 Anders Carlsson <andersca at apple.com>
+ Reviewed by John Sullivan.
+
+ Don't listen for some window notifications on all windows
+ https://bugs.webkit.org/show_bug.cgi?id=46277
+
+ Only listen for NSWindowDidBecomeKeyNotification and NSWindowDidResignKeyNotification notifications
+ on all windows; this matches old WebKit and fixes a crash where we would send notifications to views whose
+ underlying pages were invalid.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView addWindowObserversForWindow:]):
+ (-[WKView removeWindowObservers]):
+
+2010-09-22 Anders Carlsson <andersca at apple.com>
+
Reviewed by Adam Roben.
Crash when running plug-in layout tests
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 0375bc3..45e6836 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -249,13 +249,13 @@ using namespace WebCore;
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidResignKey:)
name:NSWindowDidResignKeyNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidMiniaturize:)
- name:NSWindowDidMiniaturizeNotification object:nil];
+ name:NSWindowDidMiniaturizeNotification object:window];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidDeminiaturize:)
- name:NSWindowDidDeminiaturizeNotification object:nil];
+ name:NSWindowDidDeminiaturizeNotification object:window];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowFrameDidChange:)
- name:NSWindowDidMoveNotification object:nil];
+ name:NSWindowDidMoveNotification object:window];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowFrameDidChange:)
- name:NSWindowDidResizeNotification object:nil];
+ name:NSWindowDidResizeNotification object:window];
}
}
@@ -267,8 +267,10 @@ using namespace WebCore;
[[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidBecomeKeyNotification object:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidResignKeyNotification object:nil];
- [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidMiniaturizeNotification object:nil];
- [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidDeminiaturizeNotification object:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidMiniaturizeNotification object:window];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidDeminiaturizeNotification object:window];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidMoveNotification object:window];
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidResizeNotification object:window];
}
static bool isViewVisible(NSView *view)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list