Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179212 => 179213)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-27 21:37:11 UTC (rev 179212)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-27 21:59:02 UTC (rev 179213)
@@ -1,5 +1,38 @@
2015-01-27 Lucas Forschler <[email protected]>
+ Merge r177526
+
+ 2014-12-18 Chris Dumez <[email protected]>
+
+ [WK2] Stop using WKPreferencesPrivate API to toggle FeatureCounter support
+ https://bugs.webkit.org/show_bug.cgi?id=139794
+ <rdar://problem/19266254>
+
+ Reviewed by Anders Carlsson.
+
+ Stop using WKPreferencesPrivate API to toggle FeatureCounter support
+ and use WKWebViewConfigurationPrivate API instead. FeatureCounter is
+ not meant to change state after the view has been created.
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetFeatureCounterEnabled): Deleted.
+ (WKPreferencesGetFeatureCounterEnabled): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _featureCounterEnabled]): Deleted.
+ (-[WKPreferences _setFeatureCounterEnabled:]): Deleted.
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _featureCounterEnabled]):
+ (-[WKWebViewConfiguration _setFeatureCounterEnabled:]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+
+2015-01-27 Lucas Forschler <[email protected]>
+
Merge r177455
2014-12-17 Chris Dumez <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (179212 => 179213)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-01-27 21:37:11 UTC (rev 179212)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-01-27 21:59:02 UTC (rev 179213)
@@ -589,16 +589,6 @@
return toImpl(preferencesRef)->shouldPrintBackgrounds();
}
-void WKPreferencesSetFeatureCounterEnabled(WKPreferencesRef preferencesRef, bool enabled)
-{
- toImpl(preferencesRef)->setFeatureCounterEnabled(enabled);
-}
-
-bool WKPreferencesGetFeatureCounterEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->featureCounterEnabled();
-}
-
void WKPreferencesSetWebArchiveDebugModeEnabled(WKPreferencesRef preferencesRef, bool enabled)
{
toImpl(preferencesRef)->setWebArchiveDebugModeEnabled(enabled);
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (179212 => 179213)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-01-27 21:37:11 UTC (rev 179212)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-01-27 21:59:02 UTC (rev 179213)
@@ -121,10 +121,6 @@
WK_EXPORT WKStringRef WKPreferencesCopyFTPDirectoryTemplatePath(WKPreferencesRef preferences);
// Defaults to false.
-WK_EXPORT void WKPreferencesSetFeatureCounterEnabled(WKPreferencesRef preferences, bool enabled);
-WK_EXPORT bool WKPreferencesGetFeatureCounterEnabled(WKPreferencesRef preferences);
-
-// Defaults to false.
WK_EXPORT void WKPreferencesSetWebArchiveDebugModeEnabled(WKPreferencesRef preferences, bool enabled);
WK_EXPORT bool WKPreferencesGetWebArchiveDebugModeEnabled(WKPreferencesRef preferences);
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (179212 => 179213)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2015-01-27 21:37:11 UTC (rev 179212)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2015-01-27 21:59:02 UTC (rev 179213)
@@ -113,16 +113,6 @@
_preferences->setTelephoneNumberParsingEnabled(telephoneNumberDetectionIsEnabled);
}
-- (BOOL)_featureCounterEnabled
-{
- return _preferences->featureCounterEnabled();
-}
-
-- (void)_setFeatureCounterEnabled:(BOOL)featureCounterEnabled
-{
- _preferences->setFeatureCounterEnabled(featureCounterEnabled);
-}
-
static WebCore::SecurityOrigin::StorageBlockingPolicy toStorageBlockingPolicy(_WKStorageBlockingPolicy policy)
{
switch (policy) {
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (179212 => 179213)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2015-01-27 21:37:11 UTC (rev 179212)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2015-01-27 21:59:02 UTC (rev 179213)
@@ -41,7 +41,6 @@
// FIXME: This property should not have the verb "is" in it.
@property (nonatomic, setter=_setTelephoneNumberDetectionIsEnabled:) BOOL _telephoneNumberDetectionIsEnabled;
-@property (nonatomic, setter=_setFeatureCounterEnabled:) BOOL _featureCounterEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@property (nonatomic, setter=_setStorageBlockingPolicy:) _WKStorageBlockingPolicy _storageBlockingPolicy;
@property (nonatomic, setter=_setCompositingBordersVisible:) BOOL _compositingBordersVisible;
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (179212 => 179213)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-01-27 21:37:11 UTC (rev 179212)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-01-27 21:59:02 UTC (rev 179213)
@@ -279,6 +279,7 @@
#if PLATFORM(IOS)
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsInlineKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::featureCounterEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _featureCounterEnabled]));
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackRequiresUserGestureKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
#endif
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (179212 => 179213)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-01-27 21:37:11 UTC (rev 179212)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-01-27 21:59:02 UTC (rev 179213)
@@ -77,6 +77,7 @@
RetainPtr<NSString> _groupIdentifier;
#if PLATFORM(IOS)
LazyInitialized<WKWebViewContentProviderRegistry> _contentProviderRegistry;
+ BOOL _featureCounterEnabled;
#endif
}
@@ -88,6 +89,7 @@
#if PLATFORM(IOS)
_mediaPlaybackRequiresUserAction = YES;
_mediaPlaybackAllowsAirPlay = YES;
+ _featureCounterEnabled = NO;
#endif
return self;
@@ -116,6 +118,7 @@
configuration->_suppressesIncrementalRendering = self->_suppressesIncrementalRendering;
#if PLATFORM(IOS)
configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
+ configuration->_featureCounterEnabled = self->_featureCounterEnabled;
configuration->_mediaPlaybackRequiresUserAction = self->_mediaPlaybackRequiresUserAction;
configuration->_mediaPlaybackAllowsAirPlay = self->_mediaPlaybackAllowsAirPlay;
configuration->_selectionGranularity = self->_selectionGranularity;
@@ -243,6 +246,18 @@
_groupIdentifier = groupIdentifier;
}
+#if PLATFORM(IOS)
+- (BOOL)_featureCounterEnabled
+{
+ return _featureCounterEnabled;
+}
+
+- (void)_setFeatureCounterEnabled:(BOOL)featureCounterEnabled
+{
+ _featureCounterEnabled = featureCounterEnabled;
+}
+#endif
+
@end
#endif // WK_API_ENABLED
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (179212 => 179213)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-01-27 21:37:11 UTC (rev 179212)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-01-27 21:59:02 UTC (rev 179213)
@@ -42,6 +42,10 @@
@property (nonatomic, weak, setter=_setAlternateWebViewForNavigationGestures:) WKWebView *_alternateWebViewForNavigationGestures;
+#if TARGET_OS_IPHONE
+@property (nonatomic, setter=_setFeatureCounterEnabled:) BOOL _featureCounterEnabled;
+#endif
+
@end
#endif
