Fixes for Clipboard and IconDatabase
diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp
index a6c2a66..9c026d7 100644
--- a/WebCore/loader/icon/IconDatabase.cpp
+++ b/WebCore/loader/icon/IconDatabase.cpp
@@ -39,11 +39,7 @@
#include "SQLiteStatement.h"
#include "SQLiteTransaction.h"
#include "SuddenTermination.h"
-#if USE(JSC)
#include <runtime/InitializeThreading.h>
-#elif USE(V8)
-#include "V8InitializeThreading.h"
-#endif
#include <wtf/CurrentTime.h>
#include <wtf/MainThread.h>
#include <wtf/StdLibExtras.h>
@@ -97,11 +93,7 @@
IconDatabase* iconDatabase()
{
if (!sharedIconDatabase) {
-#if USE(JSC)
JSC::initializeThreading();
-#elif USE(V8)
- V8::initializeThreading();
-#endif
sharedIconDatabase = new IconDatabase;
}
return sharedIconDatabase;
diff --git a/WebCore/platform/android/ClipboardAndroid.cpp b/WebCore/platform/android/ClipboardAndroid.cpp
index 3e6a7c2..da2c230 100644
--- a/WebCore/platform/android/ClipboardAndroid.cpp
+++ b/WebCore/platform/android/ClipboardAndroid.cpp
@@ -29,6 +29,7 @@
#include "CachedImage.h"
#include "Element.h"
+#include "FileList.h"
#include "Frame.h"
#include "Range.h"
