Refine Ryosuke's r144367 fix.

Rubber-stamped by Ryosuke Niwa.

* page/PageGroup.cpp:
(WebCore::PageGroup::captionPreferences):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@144374 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 302ea38d
2013-02-28 Alexey Proskuryakov <ap@apple.com>
2013-02-28 Eric Carlson <eric.carlson@apple.com>
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 <eric@webkit.org>
......@@ -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 @@ void PageGroup::invalidatedInjectedStyleSheetCacheInAllFrames()
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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment