Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (110230 => 110231)
--- trunk/Source/WebCore/CMakeLists.txt 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-03-09 00:41:22 UTC (rev 110231)
@@ -1464,7 +1464,9 @@
)
LIST(APPEND WebCore_IDL_FILES
+ fileapi/FileException.idl
fileapi/FileReaderSync.idl
+ fileapi/OperationNotAllowedException.idl
)
ENDIF ()
@@ -1685,13 +1687,6 @@
)
ENDIF ()
-IF (ENABLE_BLOB OR ENABLE_FILE_SYSTEM)
- LIST(APPEND WebCore_IDL_FILES
- fileapi/FileException.idl
- fileapi/OperationNotAllowedException.idl
- )
-ENDIF ()
-
IF (ENABLE_SVG)
LIST(APPEND WebCore_SOURCES
css/SVGCSSComputedStyleDeclaration.cpp
Modified: trunk/Source/WebCore/ChangeLog (110230 => 110231)
--- trunk/Source/WebCore/ChangeLog 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/ChangeLog 2012-03-09 00:41:22 UTC (rev 110231)
@@ -1,3 +1,42 @@
+2012-03-08 Mark Pilgrim <[email protected]>
+
+ Collapse ENABLE(BLOB)|ENABLE(FILE_SYSTEM) to just ENABLE(BLOB)
+ https://bugs.webkit.org/show_bug.cgi?id=80592
+
+ Reviewed by Adam Barth.
+
+ In anticipation of moving FILE_SYSTEM-related code to Modules/, we
+ are collapsing combination BLOB/FILE_SYSTEM ifdefs to just
+ BLOB. In other words, it is assumed from now on that you can not
+ have FILE_SYSTEM support without BLOB support.
+
+ No new tests, all existing tests pass.
+
+ * CMakeLists.txt:
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
+ (WebCore):
+ (WebCore::ScriptExecutionContext::fileThread):
+ * dom/ScriptExecutionContext.h:
+ (WebCore):
+ (ScriptExecutionContext):
+ * fileapi/AsyncFileStream.cpp:
+ * fileapi/AsyncFileStream.h:
+ * fileapi/FileError.h:
+ * fileapi/FileException.cpp:
+ * fileapi/FileException.h:
+ * fileapi/FileThread.cpp:
+ * fileapi/FileThread.h:
+ * fileapi/OperationNotAllowedException.cpp:
+ * fileapi/OperationNotAllowedException.h:
+ * platform/FileStream.cpp:
+ * platform/FileStream.h:
+ * platform/FileStreamClient.h:
+ * platform/SchemeRegistry.cpp:
+ (WebCore::canDisplayOnlyIfCanRequestSchemes):
+ (WebCore::CORSEnabledSchemes):
+ (WebCore::SchemeRegistry::registerURLSchemeAsNotAllowingJavascriptURLs):
+
2012-03-08 James Robinson <[email protected]>
Use an explicit attribute to signal that a context prefers to use a discrete GPU
Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (110230 => 110231)
--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2012-03-09 00:41:22 UTC (rev 110231)
@@ -112,13 +112,11 @@
ASSERT((*iter)->scriptExecutionContext() == this);
(*iter)->contextDestroyed();
}
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
if (m_fileThread) {
m_fileThread->stop();
m_fileThread = 0;
}
-#endif
-#if ENABLE(BLOB)
if (m_publicURLManager)
m_publicURLManager->contextDestroyed();
#endif
@@ -359,7 +357,7 @@
return m_timeouts.get(timeoutId);
}
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
FileThread* ScriptExecutionContext::fileThread()
{
if (!m_fileThread) {
@@ -369,9 +367,7 @@
}
return m_fileThread.get();
}
-#endif
-#if ENABLE(BLOB)
PublicURLManager& ScriptExecutionContext::publicURLManager()
{
if (!m_publicURLManager)
Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (110230 => 110231)
--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2012-03-09 00:41:22 UTC (rev 110231)
@@ -59,7 +59,7 @@
class PublicURLManager;
#endif
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
class FileThread;
#endif
@@ -147,7 +147,7 @@
JSC::JSGlobalData* globalData();
#endif
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
FileThread* fileThread();
void stopFileThread();
#endif
@@ -214,7 +214,7 @@
ActiveDOMObject::ReasonForSuspension m_reasonForSuspendingActiveDOMObjects;
bool m_activeDOMObjectsAreStopped;
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
RefPtr<FileThread> m_fileThread;
#endif
};
Modified: trunk/Source/WebCore/fileapi/AsyncFileStream.cpp (110230 => 110231)
--- trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2012-03-09 00:41:22 UTC (rev 110231)
@@ -31,7 +31,7 @@
#include "config.h"
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include "AsyncFileStream.h"
@@ -224,4 +224,4 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
Modified: trunk/Source/WebCore/fileapi/AsyncFileStream.h (110230 => 110231)
--- trunk/Source/WebCore/fileapi/AsyncFileStream.h 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/fileapi/AsyncFileStream.h 2012-03-09 00:41:22 UTC (rev 110231)
@@ -32,7 +32,7 @@
#ifndef AsyncFileStream_h
#define AsyncFileStream_h
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include <wtf/Forward.h>
#include <wtf/RefCounted.h>
@@ -90,6 +90,6 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
#endif // AsyncFileStream_h
Modified: trunk/Source/WebCore/fileapi/FileError.h (110230 => 110231)
--- trunk/Source/WebCore/fileapi/FileError.h 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/fileapi/FileError.h 2012-03-09 00:41:22 UTC (rev 110231)
@@ -31,7 +31,7 @@
#ifndef FileError_h
#define FileError_h
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -70,6 +70,6 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
#endif // FileError_h
Modified: trunk/Source/WebCore/fileapi/FileException.cpp (110230 => 110231)
--- trunk/Source/WebCore/fileapi/FileException.cpp 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/fileapi/FileException.cpp 2012-03-09 00:41:22 UTC (rev 110231)
@@ -28,7 +28,7 @@
#include "config.h"
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include "FileException.h"
@@ -87,4 +87,4 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
Modified: trunk/Source/WebCore/fileapi/FileException.h (110230 => 110231)
--- trunk/Source/WebCore/fileapi/FileException.h 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/fileapi/FileException.h 2012-03-09 00:41:22 UTC (rev 110231)
@@ -31,7 +31,7 @@
#ifndef FileException_h
#define FileException_h
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include "ExceptionBase.h"
@@ -80,6 +80,6 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
#endif // FileException_h
Modified: trunk/Source/WebCore/fileapi/FileThread.cpp (110230 => 110231)
--- trunk/Source/WebCore/fileapi/FileThread.cpp 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/fileapi/FileThread.cpp 2012-03-09 00:41:22 UTC (rev 110231)
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include "FileThread.h"
@@ -114,4 +114,4 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
Modified: trunk/Source/WebCore/fileapi/FileThread.h (110230 => 110231)
--- trunk/Source/WebCore/fileapi/FileThread.h 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/fileapi/FileThread.h 2012-03-09 00:41:22 UTC (rev 110231)
@@ -31,7 +31,7 @@
#ifndef FileThread_h
#define FileThread_h
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include <wtf/MessageQueue.h>
#include <wtf/PassOwnPtr.h>
@@ -84,6 +84,6 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
#endif // FileThread_h
Modified: trunk/Source/WebCore/fileapi/OperationNotAllowedException.cpp (110230 => 110231)
--- trunk/Source/WebCore/fileapi/OperationNotAllowedException.cpp 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/fileapi/OperationNotAllowedException.cpp 2012-03-09 00:41:22 UTC (rev 110231)
@@ -28,7 +28,7 @@
#include "config.h"
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include "OperationNotAllowedException.h"
@@ -65,4 +65,4 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
Modified: trunk/Source/WebCore/fileapi/OperationNotAllowedException.h (110230 => 110231)
--- trunk/Source/WebCore/fileapi/OperationNotAllowedException.h 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/fileapi/OperationNotAllowedException.h 2012-03-09 00:41:22 UTC (rev 110231)
@@ -31,7 +31,7 @@
#ifndef OperationNotAllowedException_h
#define OperationNotAllowedException_h
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include "ExceptionBase.h"
@@ -62,6 +62,6 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
#endif // OperationNotAllowedException_h
Modified: trunk/Source/WebCore/platform/FileStream.cpp (110230 => 110231)
--- trunk/Source/WebCore/platform/FileStream.cpp 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/platform/FileStream.cpp 2012-03-09 00:41:22 UTC (rev 110231)
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include "FileStream.h"
@@ -147,4 +147,4 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
Modified: trunk/Source/WebCore/platform/FileStream.h (110230 => 110231)
--- trunk/Source/WebCore/platform/FileStream.h 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/platform/FileStream.h 2012-03-09 00:41:22 UTC (rev 110231)
@@ -31,7 +31,7 @@
#ifndef FileStream_h
#define FileStream_h
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
#include "FileSystem.h"
#include <wtf/Forward.h>
@@ -95,6 +95,6 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
#endif // FileStream_h
Modified: trunk/Source/WebCore/platform/FileStreamClient.h (110230 => 110231)
--- trunk/Source/WebCore/platform/FileStreamClient.h 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/platform/FileStreamClient.h 2012-03-09 00:41:22 UTC (rev 110231)
@@ -31,7 +31,7 @@
#ifndef FileStreamClient_h
#define FileStreamClient_h
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#if ENABLE(BLOB)
namespace WebCore {
@@ -53,6 +53,6 @@
} // namespace WebCore
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
#endif // FileStreamClient_h
Modified: trunk/Source/WebCore/platform/SchemeRegistry.cpp (110230 => 110231)
--- trunk/Source/WebCore/platform/SchemeRegistry.cpp 2012-03-09 00:31:40 UTC (rev 110230)
+++ trunk/Source/WebCore/platform/SchemeRegistry.cpp 2012-03-09 00:41:22 UTC (rev 110231)
@@ -20,7 +20,7 @@
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "config.h"
@@ -100,16 +100,14 @@
{
DEFINE_STATIC_LOCAL(URLSchemesMap, canDisplayOnlyIfCanRequestSchemes, ());
-#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
- if (canDisplayOnlyIfCanRequestSchemes.isEmpty()) {
#if ENABLE(BLOB)
+ if (canDisplayOnlyIfCanRequestSchemes.isEmpty()) {
canDisplayOnlyIfCanRequestSchemes.add("blob");
-#endif
#if ENABLE(FILE_SYSTEM)
canDisplayOnlyIfCanRequestSchemes.add("filesystem");
#endif
}
-#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
+#endif // ENABLE(BLOB)
return canDisplayOnlyIfCanRequestSchemes;
}
@@ -155,7 +153,7 @@
static URLSchemesMap& CORSEnabledSchemes()
{
- // FIXME: http://bugs.webkit.org/show_bug.cgi?id=77160
+ // FIXME: http://bugs.webkit.org/show_bug.cgi?id=77160
DEFINE_STATIC_LOCAL(URLSchemesMap, CORSEnabledSchemes, ());
if (CORSEnabledSchemes.isEmpty()) {
@@ -251,7 +249,7 @@
canDisplayOnlyIfCanRequestSchemes().add(scheme);
}
-void SchemeRegistry::registerURLSchemeAsNotAllowingJavascriptURLs(const String& scheme)
+void SchemeRegistry::registerURLSchemeAsNotAllowingJavascriptURLs(const String& scheme)
{
notAllowingJavascriptURLsSchemes().add(scheme);
}
