Title: [144374] trunk/Source/WebCore
- Revision
- 144374
- Author
- [email protected]
- Date
- 2013-02-28 14:51:42 -0800 (Thu, 28 Feb 2013)
Log Message
Refine Ryosuke's r144367 fix.
Rubber-stamped by Ryosuke Niwa.
* page/PageGroup.cpp:
(WebCore::PageGroup::captionPreferences):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144373 => 144374)
--- trunk/Source/WebCore/ChangeLog 2013-02-28 22:48:33 UTC (rev 144373)
+++ trunk/Source/WebCore/ChangeLog 2013-02-28 22:51:42 UTC (rev 144374)
@@ -1,14 +1,11 @@
-2013-02-28 Alexey Proskuryakov <[email protected]>
+2013-02-28 Eric Carlson <[email protected]>
- Windows build fix.
+ Refine Ryosuke's r144367 fix.
- Removing ENABLE(BLOB) checks that I added in bug 111100. Many, many more are needed
- to cleanly disable blob code.
+ Rubber-stamped by Ryosuke Niwa.
- * platform/network/BlobData.h:
- * platform/network/BlobRegistryImpl.cpp:
- * platform/network/BlobRegistryImpl.h:
- * platform/network/BlobStorageData.h:
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::captionPreferences):
2013-02-28 Eric Seidel <[email protected]>
Modified: trunk/Source/WebCore/page/PageGroup.cpp (144373 => 144374)
--- trunk/Source/WebCore/page/PageGroup.cpp 2013-02-28 22:48:33 UTC (rev 144373)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2013-02-28 22:51:42 UTC (rev 144374)
@@ -39,7 +39,7 @@
#include "StorageNamespace.h"
#if ENABLE(VIDEO_TRACK)
-#if PLATFORM(MAC) && !PLATFORM(IOS)
+#if (PLATFORM(MAC) && !PLATFORM(IOS)) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
#include "CaptionUserPreferencesMac.h"
#else
#include "CaptionUserPreferences.h"
@@ -420,7 +420,7 @@
CaptionUserPreferences* PageGroup::captionPreferences()
{
if (!m_captionPreferences)
-#if PLATFORM(MAC) && !PLATFORM(IOS)
+#if (PLATFORM(MAC) && !PLATFORM(IOS)) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
m_captionPreferences = CaptionUserPreferencesMac::create(this);
#else
m_captionPreferences = CaptionUserPreferences::create(this);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
