Diff
Modified: trunk/Source/WebCore/page/Settings.h (197040 => 197041)
--- trunk/Source/WebCore/page/Settings.h 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebCore/page/Settings.h 2016-02-24 20:31:40 UTC (rev 197041)
@@ -287,6 +287,10 @@
WEBCORE_EXPORT static float defaultMinimumZoomFontSize();
#endif
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/SettingsGettersAndSetters.h>
+#endif
+
private:
explicit Settings(Page*);
@@ -381,6 +385,10 @@
static bool gLowPowerVideoAudioBufferSizeEnabled;
static bool gResourceLoadStatisticsEnabledEnabled;
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/SettingsMembers.h>
+#endif
};
} // namespace WebCore
Modified: trunk/Source/WebKit2/ChangeLog (197040 => 197041)
--- trunk/Source/WebKit2/ChangeLog 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-24 20:31:40 UTC (rev 197041)
@@ -1,3 +1,19 @@
+2016-02-24 Anders Carlsson <ander...@apple.com>
+
+ Add more WebKitAdditions extension points
+ https://bugs.webkit.org/show_bug.cgi?id=154648
+ rdar://problem/24820040
+
+ Reviewed by Beth Dakin.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration copyWithZone:]):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2016-02-24 Ryosuke Niwa <rn...@webkit.org>
Move FocusNavigationScope into FocusController.cpp
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (197040 => 197041)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-02-24 20:31:40 UTC (rev 197041)
@@ -26,6 +26,14 @@
#ifndef WebPreferencesDefinitions_h
#define WebPreferencesDefinitions_h
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WebPreferencesDefinitionsAdditions.h>
+#endif
+
+#if !defined(FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE)
+#define FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro)
+#endif
+
#if PLATFORM(GTK)
#define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED true
#else
@@ -216,6 +224,8 @@
macro(AntialiasedFontDilationEnabled, antialiasedFontDilationEnabled, Bool, bool, false) \
macro(HTTPEquivEnabled, httpEquivEnabled, Bool, bool, true) \
macro(MockCaptureDevicesEnabled, mockCaptureDevicesEnabled, Bool, bool, false) \
+ FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro) \
+ \
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
macro(IncrementalRenderingSuppressionTimeout, incrementalRenderingSuppressionTimeout, Double, double, 5) \
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (197040 => 197041)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-02-24 20:31:40 UTC (rev 197041)
@@ -410,6 +410,10 @@
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsAirPlayForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsAirPlayForMediaPlayback]));
#endif
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewInitialization.mm>
+#endif
+
#if PLATFORM(IOS)
CGRect bounds = self.bounds;
_scrollView = adoptNS([[WKScrollView alloc] initWithFrame:bounds]);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (197040 => 197041)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-02-24 20:31:40 UTC (rev 197041)
@@ -112,6 +112,10 @@
BOOL _serviceControlsEnabled;
BOOL _imageControlsEnabled;
#endif
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewConfigurationIvars.mm>
+#endif
}
- (instancetype)init
@@ -252,6 +256,10 @@
configuration->_allowsAirPlayForMediaPlayback = self->_allowsAirPlayForMediaPlayback;
#endif
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewConfigurationCopy.mm>
+#endif
+
return configuration;
}
@@ -573,6 +581,10 @@
}
#endif // PLATFORM(MAC)
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewConfigurationPrivateMethods.mm>
+#endif
+
@end
@implementation WKWebViewConfiguration (WKDeprecated)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (197040 => 197041)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-02-24 20:31:40 UTC (rev 197041)
@@ -3007,6 +3007,10 @@
settings.setShouldDispatchJavaScriptWindowOnErrorEvents(true);
+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/WebPagePreferences.cpp>
+#endif
+
#if PLATFORM(IOS)
settings.setUseImageDocumentForSubframePDF(true);
#endif
