Title: [186071] trunk
Revision
186071
Author
commit-qu...@webkit.org
Date
2015-06-29 10:18:19 -0700 (Mon, 29 Jun 2015)

Log Message

[Mac] Disable QTKit by default.
https://bugs.webkit.org/show_bug.cgi?id=146352

Patch by Said Abou-Hallawa <sabouhall...@apple.com> on 2015-06-29
Reviewed by Darin Adler.
Source/WebCore:

Fix the the requirement for enabling QTKit and AVFoundation.

* page/Settings.cpp:
(WebCore::invalidateAfterGenericFamilyChange): Remove the requirement
for enabling QTKit and AVFoundation. The initial state of QTKit should
be disabled on all OS X ports. And the initial state of AVFoundation
should be enabled  on all OS X ports.

LayoutTests:

* platform/mac/TestExpectations: Skip media tests which require QTKit on
all OS X ports.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (186070 => 186071)


--- trunk/LayoutTests/ChangeLog	2015-06-29 16:50:16 UTC (rev 186070)
+++ trunk/LayoutTests/ChangeLog	2015-06-29 17:18:19 UTC (rev 186071)
@@ -1,3 +1,13 @@
+2015-06-29  Said Abou-Hallawa  <sabouhall...@apple.com>
+
+        [Mac] Disable QTKit by default.
+        https://bugs.webkit.org/show_bug.cgi?id=146352
+
+        Reviewed by Darin Adler.
+
+        * platform/mac/TestExpectations: Skip media tests which require QTKit on
+        all OS X ports.
+
 2015-06-26  Matt Rajca  <mra...@apple.com>
 
         Test existence of controls on MediaSession

Modified: trunk/LayoutTests/platform/mac/TestExpectations (186070 => 186071)


--- trunk/LayoutTests/platform/mac/TestExpectations	2015-06-29 16:50:16 UTC (rev 186070)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2015-06-29 17:18:19 UTC (rev 186071)
@@ -1282,9 +1282,9 @@
 [ ElCapitan+ ] http/tests/media/video-play-stall.html [ Failure ]
 
 # <rdar://problem/21263363>
-[ ElCapitan+ ] http/tests/media/remove-while-loading.html [ Skip ]
-[ ElCapitan+ ] http/tests/media/video-accept-encoding.html [ Failure ]
-[ ElCapitan+ ] http/tests/media/video-cancel-load.html [ Skip ]
-[ ElCapitan+ ] http/tests/media/video-served-as-text.html [ Failure ]
-[ ElCapitan+ ] http/tests/media/video-throttled-load-metadata.html [ Failure ]
-[ ElCapitan+ ] http/tests/security/contentSecurityPolicy/media-src-allowed.html [ Skip ]
+http/tests/media/remove-while-loading.html [ Skip ]
+http/tests/media/video-accept-encoding.html [ Failure ]
+http/tests/media/video-cancel-load.html [ Skip ]
+http/tests/media/video-served-as-text.html [ Failure ]
+http/tests/media/video-throttled-load-metadata.html [ Failure ]
+http/tests/security/contentSecurityPolicy/media-src-allowed.html [ Skip ]

Modified: trunk/Source/WebCore/ChangeLog (186070 => 186071)


--- trunk/Source/WebCore/ChangeLog	2015-06-29 16:50:16 UTC (rev 186070)
+++ trunk/Source/WebCore/ChangeLog	2015-06-29 17:18:19 UTC (rev 186071)
@@ -1,3 +1,18 @@
+2015-06-29  Said Abou-Hallawa  <sabouhall...@apple.com>
+
+        [Mac] Disable QTKit by default.
+        https://bugs.webkit.org/show_bug.cgi?id=146352
+
+        Reviewed by Darin Adler.
+        
+        Fix the the requirement for enabling QTKit and AVFoundation.
+
+        * page/Settings.cpp:
+        (WebCore::invalidateAfterGenericFamilyChange): Remove the requirement
+        for enabling QTKit and AVFoundation. The initial state of QTKit should
+        be disabled on all OS X ports. And the initial state of AVFoundation
+        should be enabled  on all OS X ports.
+
 2015-06-29  Hyungwook Lee  <hyungwook....@navercorp.com>
 
         [EFL] Purge unused favicons from IconDatabase after 30 days.

Modified: trunk/Source/WebCore/page/Settings.cpp (186070 => 186071)


--- trunk/Source/WebCore/page/Settings.cpp	2015-06-29 16:50:16 UTC (rev 186070)
+++ trunk/Source/WebCore/page/Settings.cpp	2015-06-29 17:18:19 UTC (rev 186071)
@@ -70,20 +70,12 @@
 }
 
 #if USE(AVFOUNDATION)
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
-bool Settings::gAVFoundationEnabled = false;
-#else
 bool Settings::gAVFoundationEnabled = true;
 #endif
-#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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to