Merge WebKit at r84325: Initial merge by git.

[android-x86/external-webkit.git] / Source / WebCore / DerivedSources.cpp

diff --git a/Source/WebCore/DerivedSources.cpp b/Source/WebCore/DerivedSources.cpp
index b7bcb66..3bba78c 100644 (file)
--- a/Source/WebCore/DerivedSources.cpp
+++ b/Source/WebCore/DerivedSources.cpp
@@ -34,7 +34,6 @@
 #include "JSBarInfo.cpp"
 #include "JSBeforeLoadEvent.cpp"
 #include "JSBlob.cpp"
-#include "JSBlobBuilder.cpp"
 #include "JSCanvasGradient.cpp"
 #include "JSCanvasPattern.cpp"
 #include "JSCanvasRenderingContext.cpp"
@@ -72,6 +71,8 @@
 #include "JSDatabaseSync.cpp"
 #include "JSDataGridColumn.cpp"
 #include "JSDataGridColumnList.cpp"
+#include "JSDataTransferItem.cpp"
+#include "JSDataTransferItems.cpp"
 #include "JSDataView.cpp"
 #include "JSDedicatedWorkerContext.cpp"
 #include "JSDeviceOrientationEvent.cpp"
@@ -127,7 +128,7 @@
 #include "JSFileWriter.cpp"
 #include "JSFileWriterCallback.cpp"
 #include "JSFileWriterSync.cpp"
-#include "JSFlags.cpp"
+#include "JSWebKitFlags.cpp"
 #include "JSFloat32Array.cpp"
 #include "JSGeolocation.cpp"
 #include "JSGeoposition.cpp"
@@ -214,15 +215,12 @@
 #include "JSIDBDatabase.cpp"
 #include "JSIDBDatabaseError.cpp"
 #include "JSIDBDatabaseException.cpp"
-#include "JSIDBErrorEvent.cpp"
-#include "JSIDBEvent.cpp"
 #include "JSIDBFactory.cpp"
 #include "JSIDBIndex.cpp"
 #include "JSIDBKey.cpp"
 #include "JSIDBKeyRange.cpp"
 #include "JSIDBObjectStore.cpp"
 #include "JSIDBRequest.cpp"
-#include "JSIDBSuccessEvent.cpp"
 #include "JSIDBTransaction.cpp"
 #include "JSImageData.cpp"
 #include "JSInjectedScriptHost.cpp"
@@ -246,6 +244,9 @@
 #include "JSMutationEvent.cpp"
 #include "JSNamedNodeMap.cpp"
 #include "JSNavigator.cpp"
+#include "JSNavigatorUserMediaError.cpp"
+#include "JSNavigatorUserMediaErrorCallback.cpp"
+#include "JSNavigatorUserMediaSuccessCallback.cpp"
 #include "JSNode.cpp"
 #include "JSNodeFilter.cpp"
 #include "JSNodeIterator.cpp"
@@ -284,6 +285,10 @@
 #include "JSSQLTransactionSyncCallback.cpp"
 #include "JSStorage.cpp"
 #include "JSStorageEvent.cpp"
+#include "JSStorageInfo.cpp"
+#include "JSStorageInfoErrorCallback.cpp"
+#include "JSStorageInfoUsageCallback.cpp"
+#include "JSStringCallback.cpp"
 #include "JSStyleMedia.cpp"
 #include "JSStyleSheet.cpp"
 #include "JSStyleSheetList.cpp"
@@ -435,7 +440,10 @@
 #include "JSUint8Array.cpp"
 #include "JSUIEvent.cpp"
 #include "JSValidityState.cpp"
+#include "JSWebKitAnimation.cpp"
 #include "JSWebKitAnimationEvent.cpp"
+#include "JSWebKitAnimationList.cpp"
+#include "JSWebKitBlobBuilder.cpp"
 #include "JSWebKitCSSKeyframeRule.cpp"
 #include "JSWebKitCSSKeyframesRule.cpp"
 #include "JSWebKitCSSTransformValue.cpp"