Diff
Modified: trunk/LayoutTests/ChangeLog (183220 => 183221)
--- trunk/LayoutTests/ChangeLog 2015-04-23 22:40:19 UTC (rev 183220)
+++ trunk/LayoutTests/ChangeLog 2015-04-23 22:43:38 UTC (rev 183221)
@@ -1,3 +1,14 @@
+2015-04-23 Jer Noble <[email protected]>
+
+ [Mac] Disable QTKit by default on future OS X.
+ https://bugs.webkit.org/show_bug.cgi?id=144082
+
+ Reviewed by Darin Adler.
+
+ Add a required BANDWIDTH field to the alternate playlist.
+
+ * http/tests/media/resources/hls/playlist-with-cookie.m3u8:
+
2015-04-23 Tim Horton <[email protected]>
Make the linter stop complaining by fixing the order of fields in TestExpectations
Modified: trunk/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8 (183220 => 183221)
--- trunk/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8 2015-04-23 22:40:19 UTC (rev 183220)
+++ trunk/LayoutTests/http/tests/media/resources/hls/playlist-with-cookie.m3u8 2015-04-23 22:43:38 UTC (rev 183221)
@@ -1,5 +1,5 @@
#EXTM3U
-#EXT-X-STREAM-INF:PROGRAM-ID=1
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=34000
sub-playlist-with-cookie.php
Modified: trunk/Source/WebCore/ChangeLog (183220 => 183221)
--- trunk/Source/WebCore/ChangeLog 2015-04-23 22:40:19 UTC (rev 183220)
+++ trunk/Source/WebCore/ChangeLog 2015-04-23 22:43:38 UTC (rev 183221)
@@ -1,3 +1,14 @@
+2015-04-23 Jer Noble <[email protected]>
+
+ [Mac] Disable QTKit by default on future OS X.
+ https://bugs.webkit.org/show_bug.cgi?id=144082
+
+ Reviewed by Darin Adler.
+
+ Settings::gQTKitEnabled defaults to false.
+
+ * page/Settings.cpp:
+
2015-04-23 Daniel Bates <[email protected]>
Clean up: Use references instead of pointers in more SVG files
Modified: trunk/Source/WebCore/page/Settings.cpp (183220 => 183221)
--- trunk/Source/WebCore/page/Settings.cpp 2015-04-23 22:40:19 UTC (rev 183220)
+++ trunk/Source/WebCore/page/Settings.cpp 2015-04-23 22:43:38 UTC (rev 183221)
@@ -74,8 +74,12 @@
#endif
#if PLATFORM(COCOA)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
bool Settings::gQTKitEnabled = true;
+#else
+bool Settings::gQTKitEnabled = false;
#endif
+#endif
bool Settings::gMockScrollbarsEnabled = false;
bool Settings::gUsesOverlayScrollbars = false;
Modified: trunk/Source/WebCore/page/Settings.h (183220 => 183221)
--- trunk/Source/WebCore/page/Settings.h 2015-04-23 22:40:19 UTC (rev 183220)
+++ trunk/Source/WebCore/page/Settings.h 2015-04-23 22:43:38 UTC (rev 183221)
@@ -205,6 +205,8 @@
#if PLATFORM(COCOA)
WEBCORE_EXPORT static void setQTKitEnabled(bool flag);
static bool isQTKitEnabled() { return gQTKitEnabled; }
+#else
+ static bool isQTKitEnabled() { return false; }
#endif
static const unsigned defaultMaximumHTMLParserDOMTreeDepth = 512;
Modified: trunk/Source/WebKit/mac/ChangeLog (183220 => 183221)
--- trunk/Source/WebKit/mac/ChangeLog 2015-04-23 22:40:19 UTC (rev 183220)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-23 22:43:38 UTC (rev 183221)
@@ -1,3 +1,15 @@
+2015-04-23 Jer Noble <[email protected]>
+
+ [Mac] Disable QTKit by default on future OS X.
+ https://bugs.webkit.org/show_bug.cgi?id=144082
+
+ Reviewed by Darin Adler.
+
+ Default WebKitQTKitEnabledPreferenceKey to NO.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+
2015-04-23 Andreas Kling <[email protected]>
There should only be one way to get the system memory size.
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (183220 => 183221)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-04-23 22:40:19 UTC (rev 183220)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-04-23 22:43:38 UTC (rev 183221)
@@ -45,6 +45,7 @@
#import <WebCore/NetworkStorageSession.h>
#import <WebCore/PlatformCookieJar.h>
#import <WebCore/ResourceHandle.h>
+#import <WebCore/Settings.h>
#import <WebCore/TextEncodingRegistry.h>
#import <runtime/InitializeThreading.h>
#import <wtf/MainThread.h>
@@ -567,7 +568,7 @@
#endif
[NSNumber numberWithLongLong:ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
[NSNumber numberWithLongLong:ApplicationCacheStorage::noQuota()], WebKitApplicationCacheDefaultOriginQuota,
- [NSNumber numberWithBool:YES], WebKitQTKitEnabledPreferenceKey,
+ [NSNumber numberWithBool:Settings::isQTKitEnabled()], WebKitQTKitEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitHiddenPageDOMTimerThrottlingEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitHiddenPageCSSAnimationSuspensionEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey,
Modified: trunk/Source/WebKit2/ChangeLog (183220 => 183221)
--- trunk/Source/WebKit2/ChangeLog 2015-04-23 22:40:19 UTC (rev 183220)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-23 22:43:38 UTC (rev 183221)
@@ -1,5 +1,16 @@
2015-04-23 Jer Noble <[email protected]>
+ [Mac] Disable QTKit by default on future OS X.
+ https://bugs.webkit.org/show_bug.cgi?id=144082
+
+ Reviewed by Darin Adler.
+
+ QTKitEnabled defaults to false.
+
+ * Shared/WebPreferencesDefinitions.h:
+
+2015-04-23 Jer Noble <[email protected]>
+
[WK2][Mac] Tweak the timing curve of the WebKit Fullscreen animation
https://bugs.webkit.org/show_bug.cgi?id=144120
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (183220 => 183221)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-04-23 22:40:19 UTC (rev 183220)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-04-23 22:43:38 UTC (rev 183221)
@@ -165,7 +165,7 @@
macro(TextAutosizingEnabled, textAutosizingEnabled, Bool, bool, false) \
macro(AggressiveTileRetentionEnabled, aggressiveTileRetentionEnabled, Bool, bool, false) \
macro(TemporaryTileCohortRetentionEnabled, temporaryTileCohortRetentionEnabled, Bool, bool, DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED) \
- macro(QTKitEnabled, isQTKitEnabled, Bool, bool, true) \
+ macro(QTKitEnabled, isQTKitEnabled, Bool, bool, WebCore::Settings::isQTKitEnabled()) \
macro(PageVisibilityBasedProcessSuppressionEnabled, pageVisibilityBasedProcessSuppressionEnabled, Bool, bool, true) \
macro(SmartInsertDeleteEnabled, smartInsertDeleteEnabled, Bool, bool, true) \
macro(SelectTrailingWhitespaceEnabled, selectTrailingWhitespaceEnabled, Bool, bool, false) \
