Title: [182080] tags/Safari-601.1.23.4/Source/WebKit2
- Revision
- 182080
- Author
- [email protected]
- Date
- 2015-03-27 14:10:06 -0700 (Fri, 27 Mar 2015)
Log Message
Merged r182045. rdar://problem/20233711
Modified Paths
Diff
Modified: tags/Safari-601.1.23.4/Source/WebKit2/ChangeLog (182079 => 182080)
--- tags/Safari-601.1.23.4/Source/WebKit2/ChangeLog 2015-03-27 21:08:26 UTC (rev 182079)
+++ tags/Safari-601.1.23.4/Source/WebKit2/ChangeLog 2015-03-27 21:10:06 UTC (rev 182080)
@@ -1,5 +1,20 @@
2015-03-27 Babak Shafiei <[email protected]>
+ Merge r182045.
+
+ 2015-03-26 Enrica Casucci <[email protected]>
+
+ OS X build fix after r182037.
+
+ Unreviewed.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _addFontPanelObserver]):
+ (-[WKView removeWindowObservers]):
+ (-[WKView observeValueForKeyPath:ofObject:change:context:]):
+
+2015-03-27 Babak Shafiei <[email protected]>
+
Merge r182044.
2015-03-26 Enrica Casucci <[email protected]>
Modified: tags/Safari-601.1.23.4/Source/WebKit2/UIProcess/API/mac/WKView.mm (182079 => 182080)
--- tags/Safari-601.1.23.4/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-27 21:08:26 UTC (rev 182079)
+++ tags/Safari-601.1.23.4/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-27 21:10:06 UTC (rev 182080)
@@ -2568,7 +2568,9 @@
- (void)_addFontPanelObserver
{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
[[NSFontPanel sharedFontPanel] addObserver:self forKeyPath:@"visible" options:0 context:keyValueObservingContext];
+#endif
}
- (void)removeWindowObservers
@@ -2590,9 +2592,9 @@
[[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidChangeScreenNotification object:window];
[[NSNotificationCenter defaultCenter] removeObserver:self name:@"_NSWindowDidChangeContentsHostedInLayerSurfaceNotification" object:window];
[[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidChangeOcclusionStateNotification object:window];
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
if (_data->_page->isEditable())
[[NSFontPanel sharedFontPanel] removeObserver:self forKeyPath:@"visible" context:keyValueObservingContext];
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
[window removeObserver:self forKeyPath:@"contentLayoutRect" context:keyValueObservingContext];
[window removeObserver:self forKeyPath:@"titlebarAppearsTransparent" context:keyValueObservingContext];
#endif
@@ -3775,6 +3777,7 @@
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
if (context != keyValueObservingContext) {
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
return;
@@ -3784,7 +3787,6 @@
[self updateFontPanelIfNeeded];
return;
}
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
if ([keyPath isEqualToString:@"contentLayoutRect"] || [keyPath isEqualToString:@"titlebarAppearsTransparent"])
[self _updateContentInsetsIfAutomatic];
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
