Title: [182045] trunk/Source/WebKit2
- Revision
- 182045
- Author
- [email protected]
- Date
- 2015-03-26 17:13:59 -0700 (Thu, 26 Mar 2015)
Log Message
OS X build fix after r182037.
Unreviewed.
* UIProcess/API/mac/WKView.mm:
(-[WKView _addFontPanelObserver]):
(-[WKView removeWindowObservers]):
(-[WKView observeValueForKeyPath:ofObject:change:context:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182044 => 182045)
--- trunk/Source/WebKit2/ChangeLog 2015-03-27 00:08:26 UTC (rev 182044)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-27 00:13:59 UTC (rev 182045)
@@ -1,5 +1,16 @@
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-26 Enrica Casucci <[email protected]>
+
iOS build fix after r182037.
Unreviewed.
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (182044 => 182045)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-27 00:08:26 UTC (rev 182044)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-27 00:13:59 UTC (rev 182045)
@@ -2619,7 +2619,9 @@
- (void)_addFontPanelObserver
{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
[[NSFontPanel sharedFontPanel] addObserver:self forKeyPath:@"visible" options:0 context:keyValueObservingContext];
+#endif
}
- (void)removeWindowObservers
@@ -2638,9 +2640,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
@@ -3850,6 +3852,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;
@@ -3859,7 +3862,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
