[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

abarth at webkit.org abarth at webkit.org
Wed Dec 22 13:14:13 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 34a1c9e22e24157e66aedda11054bde332de61ff
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 14:58:28 2010 +0000

    2010-09-09  Adam Barth  <abarth at webkit.org>
    
            Move FTPDirectoryDocument, ImageDocument, MediaDocument, and
            PluginDocument from WebCore/loader to WebCore/html.  These classes are
            subclasses of HTMLDocument.  They don't belong in the loader.  Further
            cleanup patches to follow.
    
            * Android.mk:
            * CMakeLists.txt:
            * GNUmakefile.am:
            * WebCore.gypi:
            * WebCore.pro:
            * WebCore.vcproj/WebCore.vcproj:
            * WebCore.xcodeproj/project.pbxproj:
            * html/FTPDirectoryDocument.cpp: Copied from WebCore/loader/FTPDirectoryDocument.cpp.
            * html/FTPDirectoryDocument.h: Copied from WebCore/loader/FTPDirectoryDocument.h.
            * html/ImageDocument.cpp: Copied from WebCore/loader/ImageDocument.cpp.
            * html/ImageDocument.h: Copied from WebCore/loader/ImageDocument.h.
            * html/MediaDocument.cpp: Copied from WebCore/loader/MediaDocument.cpp.
            * html/MediaDocument.h: Copied from WebCore/loader/MediaDocument.h.
            * html/PluginDocument.cpp: Copied from WebCore/loader/PluginDocument.cpp.
            * html/PluginDocument.h: Copied from WebCore/loader/PluginDocument.h.
            * loader/FTPDirectoryDocument.cpp: Removed.
            * loader/FTPDirectoryDocument.h: Removed.
            * loader/ImageDocument.cpp: Removed.
            * loader/ImageDocument.h: Removed.
            * loader/MediaDocument.cpp: Removed.
            * loader/MediaDocument.h: Removed.
            * loader/PluginDocument.cpp: Removed.
            * loader/PluginDocument.h: Removed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67085 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 8193746..cc58bcf 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -278,7 +278,10 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/HTMLTableRowsCollection.cpp \
 	html/HTMLViewSourceDocument.cpp \
 	html/ImageData.cpp \
+	html/ImageDocument.cpp \
+  html/MediaDocument.cpp \
 	html/ImageResizerThread.cpp \
+	html/PluginDocument.cpp \
 	html/TextDocument.cpp \
 	html/TimeRanges.cpp \
 	html/ValidityState.cpp \
@@ -324,15 +327,12 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	loader/FrameLoader.cpp \
 	loader/FrameLoaderStateMachine.cpp \
 	loader/HistoryController.cpp \
-	loader/ImageDocument.cpp \
 	loader/ImageLoader.cpp \
 	loader/MainResourceLoader.cpp \
-	loader/MediaDocument.cpp \
 	loader/NavigationAction.cpp \
 	loader/NetscapePlugInStreamLoader.cpp \
 	loader/PingLoader.cpp \
 	loader/PlaceholderDocument.cpp \
-	loader/PluginDocument.cpp \
 	loader/PolicyCallback.cpp \
 	loader/PolicyChecker.cpp \
 	loader/ProgressTracker.cpp \
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index ade5880..b510c4f 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -941,6 +941,7 @@ SET(WebCore_SOURCES
     html/DataGridColumn.cpp
     html/DataGridColumnList.cpp
     html/DateComponents.cpp
+    html/FTPDirectoryDocument.cpp
     html/FormDataList.cpp
     html/HTMLAllCollection.cpp
     html/HTMLAnchorElement.cpp
@@ -1024,8 +1025,11 @@ SET(WebCore_SOURCES
     html/HTMLUListElement.cpp
     html/HTMLViewSourceDocument.cpp
     html/ImageData.cpp
+    html/ImageDocument.cpp
     html/ImageResizerThread.cpp
     html/LabelsNodeList.cpp
+    html/MediaDocument.cpp
+    html/PluginDocument.cpp
     html/StepRange.cpp
     html/TextDocument.cpp
     html/ValidityState.cpp
@@ -1087,22 +1091,18 @@ SET(WebCore_SOURCES
     loader/DocumentLoader.cpp
     loader/DocumentThreadableLoader.cpp
     loader/DocumentWriter.cpp
-    loader/FTPDirectoryDocument.cpp
     loader/FTPDirectoryParser.cpp
     loader/FormState.cpp
     loader/FormSubmission.cpp
     loader/FrameLoader.cpp
     loader/FrameLoaderStateMachine.cpp
     loader/HistoryController.cpp
-    loader/ImageDocument.cpp
     loader/ImageLoader.cpp
     loader/MainResourceLoader.cpp
-    loader/MediaDocument.cpp
     loader/NavigationAction.cpp
     loader/NetscapePlugInStreamLoader.cpp
     loader/PingLoader.cpp
     loader/PlaceholderDocument.cpp
-    loader/PluginDocument.cpp
     loader/PolicyCallback.cpp
     loader/PolicyChecker.cpp
     loader/ProgressTracker.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eadd80a..169448c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2010-09-09  Adam Barth  <abarth at webkit.org>
+
+        Move FTPDirectoryDocument, ImageDocument, MediaDocument, and
+        PluginDocument from WebCore/loader to WebCore/html.  These classes are
+        subclasses of HTMLDocument.  They don't belong in the loader.  Further
+        cleanup patches to follow.
+
+        * Android.mk:
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * html/FTPDirectoryDocument.cpp: Copied from WebCore/loader/FTPDirectoryDocument.cpp.
+        * html/FTPDirectoryDocument.h: Copied from WebCore/loader/FTPDirectoryDocument.h.
+        * html/ImageDocument.cpp: Copied from WebCore/loader/ImageDocument.cpp.
+        * html/ImageDocument.h: Copied from WebCore/loader/ImageDocument.h.
+        * html/MediaDocument.cpp: Copied from WebCore/loader/MediaDocument.cpp.
+        * html/MediaDocument.h: Copied from WebCore/loader/MediaDocument.h.
+        * html/PluginDocument.cpp: Copied from WebCore/loader/PluginDocument.cpp.
+        * html/PluginDocument.h: Copied from WebCore/loader/PluginDocument.h.
+        * loader/FTPDirectoryDocument.cpp: Removed.
+        * loader/FTPDirectoryDocument.h: Removed.
+        * loader/ImageDocument.cpp: Removed.
+        * loader/ImageDocument.h: Removed.
+        * loader/MediaDocument.cpp: Removed.
+        * loader/MediaDocument.h: Removed.
+        * loader/PluginDocument.cpp: Removed.
+        * loader/PluginDocument.h: Removed.
+
 2010-09-09  Andrey Kosyakov  <caseq at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 8297365..573b7db 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1351,6 +1351,8 @@ webcore_sources += \
 	WebCore/html/DataGridDataSource.h \
 	WebCore/html/DateComponents.cpp \
 	WebCore/html/DateComponents.h \
+	WebCore/html/FTPDirectoryDocument.cpp \
+	WebCore/html/FTPDirectoryDocument.h \
 	WebCore/html/FormDataList.cpp \
 	WebCore/html/FormDataList.h \
 	WebCore/html/HTMLAllCollection.cpp \
@@ -1518,11 +1520,17 @@ webcore_sources += \
 	WebCore/html/HTMLViewSourceDocument.h \
 	WebCore/html/ImageData.cpp \
 	WebCore/html/ImageData.h \
+	WebCore/html/ImageDocument.cpp \
+	WebCore/html/ImageDocument.h \
 	WebCore/html/ImageResizerThread.cpp \
 	WebCore/html/ImageResizerThread.h \
 	WebCore/html/LabelsNodeList.cpp \
 	WebCore/html/LabelsNodeList.h \
+	WebCore/html/MediaDocument.cpp \
+	WebCore/html/MediaDocument.h \
 	WebCore/html/MediaError.h \
+	WebCore/html/PluginDocument.cpp \
+	WebCore/html/PluginDocument.h \
 	WebCore/html/StepRange.cpp \
 	WebCore/html/StepRange.h \
 	WebCore/html/TextDocument.cpp \
@@ -1685,8 +1693,6 @@ webcore_sources += \
 	WebCore/loader/DocumentWriter.cpp \
 	WebCore/loader/DocumentWriter.h \
 	WebCore/loader/EmptyClients.h \
-	WebCore/loader/FTPDirectoryDocument.cpp \
-	WebCore/loader/FTPDirectoryDocument.h \
 	WebCore/loader/FTPDirectoryParser.cpp \
 	WebCore/loader/FTPDirectoryParser.h \
 	WebCore/loader/FormState.cpp \
@@ -1702,14 +1708,10 @@ webcore_sources += \
 	WebCore/loader/FrameNetworkingContext.h \
 	WebCore/loader/HistoryController.cpp \
 	WebCore/loader/HistoryController.h \
-	WebCore/loader/ImageDocument.cpp \
-	WebCore/loader/ImageDocument.h \
 	WebCore/loader/ImageLoader.cpp \
 	WebCore/loader/ImageLoader.h \
 	WebCore/loader/MainResourceLoader.cpp \
 	WebCore/loader/MainResourceLoader.h \
-	WebCore/loader/MediaDocument.cpp \
-	WebCore/loader/MediaDocument.h \
 	WebCore/loader/NavigationAction.cpp \
 	WebCore/loader/NavigationAction.h \
 	WebCore/loader/NetscapePlugInStreamLoader.cpp \
@@ -1718,8 +1720,6 @@ webcore_sources += \
 	WebCore/loader/PingLoader.h \
 	WebCore/loader/PlaceholderDocument.cpp \
 	WebCore/loader/PlaceholderDocument.h \
-	WebCore/loader/PluginDocument.cpp \
-	WebCore/loader/PluginDocument.h \
 	WebCore/loader/PolicyCallback.cpp \
 	WebCore/loader/PolicyCallback.h \
 	WebCore/loader/PolicyChecker.cpp \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 7ee7ab4..5de16e0 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1505,6 +1505,8 @@
             'html/DataGridColumnList.h',
             'html/DateComponents.cpp',
             'html/DateComponents.h',
+            'html/FTPDirectoryDocument.cpp',
+            'html/FTPDirectoryDocument.h',
             'html/FormDataList.cpp',
             'html/FormDataList.h',
             'html/HTMLAllCollection.cpp',
@@ -1679,11 +1681,17 @@
             'html/HTMLViewSourceDocument.h',
             'html/ImageData.cpp',
             'html/ImageData.h',
+            'html/ImageDocument.cpp',
+            'html/ImageDocument.h',
             'html/ImageResizerThread.cpp',
             'html/ImageResizerThread.h',
             'html/LabelsNodeList.cpp',
             'html/LabelsNodeList.h',
+            'html/MediaDocument.cpp',
+            'html/MediaDocument.h',
             'html/MediaError.h',
+            'html/PluginDocument.cpp',
+            'html/PluginDocument.h',
             'html/StepRange.cpp',
             'html/StepRange.h',
             'html/TextDocument.cpp',
@@ -1904,8 +1912,6 @@
             'loader/DocumentWriter.cpp',
             'loader/DocumentWriter.h',
             'loader/EmptyClients.h',
-            'loader/FTPDirectoryDocument.cpp',
-            'loader/FTPDirectoryDocument.h',
             'loader/FTPDirectoryParser.cpp',
             'loader/FTPDirectoryParser.h',
             'loader/FormState.cpp',
@@ -1921,14 +1927,10 @@
             'loader/FrameNetworkingContext.h',
             'loader/HistoryController.cpp',
             'loader/HistoryController.h',
-            'loader/ImageDocument.cpp',
-            'loader/ImageDocument.h',
             'loader/ImageLoader.cpp',
             'loader/ImageLoader.h',
             'loader/MainResourceLoader.cpp',
             'loader/MainResourceLoader.h',
-            'loader/MediaDocument.cpp',
-            'loader/MediaDocument.h',
             'loader/NavigationAction.cpp',
             'loader/NavigationAction.h',
             'loader/NetscapePlugInStreamLoader.cpp',
@@ -1937,8 +1939,6 @@
             'loader/PingLoader.h',
             'loader/PlaceholderDocument.cpp',
             'loader/PlaceholderDocument.h',
-            'loader/PluginDocument.cpp',
-            'loader/PluginDocument.h',
             'loader/PolicyCallback.cpp',
             'loader/PolicyCallback.h',
             'loader/PolicyChecker.cpp',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 9ec5a7d..b9d40fc 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -645,6 +645,7 @@ SOURCES += \
     html/DataGridColumn.cpp \
     html/DataGridColumnList.cpp \
     html/DateComponents.cpp \
+    html/FTPDirectoryDocument.cpp \
     html/FormDataList.cpp \
     html/HTMLAllCollection.cpp \
     html/HTMLAnchorElement.cpp \
@@ -728,8 +729,11 @@ SOURCES += \
     html/HTMLUListElement.cpp \
     html/HTMLViewSourceDocument.cpp \
     html/ImageData.cpp \
+    html/ImageDocument.cpp \
     html/ImageResizerThread.cpp \
     html/LabelsNodeList.cpp \
+    html/MediaDocument.cpp \
+    html/PluginDocument.cpp \
     html/StepRange.cpp \
     html/TextDocument.cpp \
     html/ValidityState.cpp \
@@ -797,19 +801,15 @@ SOURCES += \
     loader/FrameLoader.cpp \
     loader/FrameLoaderStateMachine.cpp \
     loader/HistoryController.cpp \
-    loader/FTPDirectoryDocument.cpp \
     loader/FTPDirectoryParser.cpp \
     loader/icon/IconLoader.cpp \
-    loader/ImageDocument.cpp \
     loader/ImageLoader.cpp \
     loader/loader.cpp \
     loader/MainResourceLoader.cpp \
-    loader/MediaDocument.cpp \
     loader/NavigationAction.cpp \
     loader/NetscapePlugInStreamLoader.cpp \
     loader/PingLoader.cpp \
     loader/PlaceholderDocument.cpp \
-    loader/PluginDocument.cpp \
     loader/PolicyCallback.cpp \
     loader/PolicyChecker.cpp \
     loader/ProgressTracker.cpp \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index b588548..47b6f4b 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -23581,14 +23581,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\loader\FTPDirectoryDocument.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\loader\FTPDirectoryDocument.h"
-				>
-			</File>
-			<File
 				RelativePath="..\loader\FTPDirectoryParser.cpp"
 				>
 			</File>
@@ -23605,14 +23597,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\loader\ImageDocument.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\loader\ImageDocument.h"
-				>
-			</File>
-			<File
 				RelativePath="..\loader\ImageLoader.cpp"
 				>
 			</File>
@@ -23637,14 +23621,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\loader\MediaDocument.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\loader\MediaDocument.h"
-				>
-			</File>
-			<File
 				RelativePath="..\loader\NavigationAction.cpp"
 				>
 			</File>
@@ -23677,14 +23653,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\loader\PluginDocument.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\loader\PluginDocument.h"
-				>
-			</File>
-			<File
 				RelativePath="..\loader\PolicyCallback.cpp"
 				>
 			</File>
@@ -37485,6 +37453,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\html\FTPDirectoryDocument.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\html\FTPDirectoryDocument.h"
+				>
+			</File>
+			<File
 				RelativePath="..\html\FormDataList.cpp"
 				>
 			</File>
@@ -41849,6 +41825,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\html\ImageDocument.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\html\ImageDocument.h"
+				>
+			</File>
+			<File
 				RelativePath="..\html\ImageResizerThread.cpp"
 				>
 			</File>
@@ -41865,9 +41849,25 @@
 				>
 			</File>
 			<File
+				RelativePath="..\html\MediaDocument.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\html\MediaDocument.h"
+				>
+			</File>
+			<File
 				RelativePath="..\html\MediaError.h"
 				>
 			</File>
+			<File
+				RelativePath="..\html\PluginDocument.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\html\PluginDocument.h"
+				>
+			</File>
 			<Filter
 				Name="parser"
 				>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 46ebb09..1027fec 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -436,8 +436,6 @@
 		1A7FA61B0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7FA61A0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp */; };
 		1A7FA6490DDA3CBA0028F8A5 /* NetworkStateNotifierMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7FA6470DDA3CBA0028F8A5 /* NetworkStateNotifierMac.cpp */; };
 		1A7FA7CC0DDA4B770028F8A5 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A7FA7CB0DDA4B770028F8A5 /* SystemConfiguration.framework */; };
-		1A820D910A13EBA600AF843C /* ImageDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A820D8F0A13EBA600AF843C /* ImageDocument.cpp */; };
-		1A820D920A13EBA600AF843C /* ImageDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A820D900A13EBA600AF843C /* ImageDocument.h */; };
 		1A85B18F0A1B18A200D8C87C /* JSHTMLHtmlElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A85B18D0A1B18A200D8C87C /* JSHTMLHtmlElement.cpp */; };
 		1A85B1900A1B18A200D8C87C /* JSHTMLHtmlElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A85B18E0A1B18A200D8C87C /* JSHTMLHtmlElement.h */; };
 		1A85B1E60A1B240500D8C87C /* JSHTMLDirectoryElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A85B1E00A1B240500D8C87C /* JSHTMLDirectoryElement.cpp */; };
@@ -497,8 +495,6 @@
 		1AC2260C0DB69F190089B669 /* JSDOMApplicationCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC2260A0DB69F190089B669 /* JSDOMApplicationCache.cpp */; };
 		1AC2260D0DB69F190089B669 /* JSDOMApplicationCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC2260B0DB69F190089B669 /* JSDOMApplicationCache.h */; };
 		1AC226170DB69F740089B669 /* JSDOMApplicationCacheCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC226160DB69F740089B669 /* JSDOMApplicationCacheCustom.cpp */; };
-		1AC694C70A3B1676003F5049 /* PluginDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC694C50A3B1676003F5049 /* PluginDocument.cpp */; };
-		1AC694C80A3B1676003F5049 /* PluginDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC694C60A3B1676003F5049 /* PluginDocument.h */; };
 		1ACD1B630B029739007E5016 /* DOMCSSStyleDeclarationInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85E711440AC5D5340053270F /* DOMCSSStyleDeclarationInternal.h */; };
 		1ACE53DF0A8D18810022947D /* JSDOMParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ACE53DD0A8D18810022947D /* JSDOMParser.cpp */; };
 		1ACE53E00A8D18810022947D /* JSDOMParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACE53DE0A8D18810022947D /* JSDOMParser.h */; };
@@ -1217,8 +1213,6 @@
 		51E1ECC30C91C90400DC255B /* PageURLRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E1ECBD0C91C90400DC255B /* PageURLRecord.h */; };
 		51E3F9C70DA059DC00250911 /* Storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E3F9C50DA059DC00250911 /* Storage.cpp */; };
 		51E3F9D60DA05E1D00250911 /* JSStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E3F9D40DA05E1D00250911 /* JSStorage.cpp */; };
-		51E4ADB60C42B4CF0042BC55 /* FTPDirectoryDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E4ADB20C42B4CF0042BC55 /* FTPDirectoryDocument.cpp */; };
-		51E4ADB70C42B4CF0042BC55 /* FTPDirectoryDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E4ADB30C42B4CF0042BC55 /* FTPDirectoryDocument.h */; };
 		51EC92590CE90DB400F90308 /* SQLError.h in Headers */ = {isa = PBXBuildFile; fileRef = 51EC92570CE90DB400F90308 /* SQLError.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		51EC92650CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */; };
 		51FAFE340CECBF2D00BB3F24 /* DatabaseTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FAFE330CECBF2D00BB3F24 /* DatabaseTrackerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2726,6 +2720,14 @@
 		97059978107D975200A50A7C /* PolicyCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 97059974107D975200A50A7C /* PolicyCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		97059979107D975200A50A7C /* PolicyChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97059975107D975200A50A7C /* PolicyChecker.cpp */; };
 		9705997A107D975200A50A7C /* PolicyChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 97059976107D975200A50A7C /* PolicyChecker.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		97205AAF123928CA00B17380 /* FTPDirectoryDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97205AAD123928CA00B17380 /* FTPDirectoryDocument.cpp */; };
+		97205AB0123928CA00B17380 /* FTPDirectoryDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 97205AAE123928CA00B17380 /* FTPDirectoryDocument.h */; };
+		97205AB51239291000B17380 /* ImageDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97205AB11239291000B17380 /* ImageDocument.cpp */; };
+		97205AB61239291000B17380 /* ImageDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 97205AB21239291000B17380 /* ImageDocument.h */; };
+		97205AB71239291000B17380 /* MediaDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97205AB31239291000B17380 /* MediaDocument.cpp */; };
+		97205AB81239291000B17380 /* MediaDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 97205AB41239291000B17380 /* MediaDocument.h */; };
+		97205ABB1239292700B17380 /* PluginDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97205AB91239292700B17380 /* PluginDocument.cpp */; };
+		97205ABC1239292700B17380 /* PluginDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 97205ABA1239292700B17380 /* PluginDocument.h */; };
 		973889A0116EA9DC00ADF313 /* DocumentWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9738899E116EA9DC00ADF313 /* DocumentWriter.cpp */; };
 		973889A1116EA9DC00ADF313 /* DocumentWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 9738899F116EA9DC00ADF313 /* DocumentWriter.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */; };
@@ -3733,8 +3735,6 @@
 		AB247A6C0AFD6383003FA5FD /* RenderSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB247A6A0AFD6383003FA5FD /* RenderSlider.cpp */; };
 		AB247A6D0AFD6383003FA5FD /* RenderSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = AB247A6B0AFD6383003FA5FD /* RenderSlider.h */; };
 		AB31C91E10AE1B8E000C7B92 /* LineClampValue.h in Headers */ = {isa = PBXBuildFile; fileRef = AB31C91D10AE1B8E000C7B92 /* LineClampValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		AB40484D0E083FA8007D6920 /* MediaDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB40484B0E083FA8007D6920 /* MediaDocument.cpp */; };
-		AB40484E0E083FA8007D6920 /* MediaDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = AB40484C0E083FA8007D6920 /* MediaDocument.h */; };
 		AB4261D80A2F6C9700BDD17D /* missingImage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AB4261D70A2F6C9700BDD17D /* missingImage.tiff */; };
 		AB4CB4EB0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = AB4CB4EA0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h */; };
 		AB67D1A8097F3AE300F9392E /* RenderTextControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */; };
@@ -6265,8 +6265,6 @@
 		1A7FA61A0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkStateNotifier.cpp; sourceTree = "<group>"; };
 		1A7FA6470DDA3CBA0028F8A5 /* NetworkStateNotifierMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkStateNotifierMac.cpp; sourceTree = "<group>"; };
 		1A7FA7CB0DDA4B770028F8A5 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; };
-		1A820D8F0A13EBA600AF843C /* ImageDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImageDocument.cpp; sourceTree = "<group>"; };
-		1A820D900A13EBA600AF843C /* ImageDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageDocument.h; sourceTree = "<group>"; };
 		1A85B17D0A1B183600D8C87C /* HTMLHtmlElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLHtmlElement.idl; sourceTree = "<group>"; };
 		1A85B18D0A1B18A200D8C87C /* JSHTMLHtmlElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLHtmlElement.cpp; sourceTree = "<group>"; };
 		1A85B18E0A1B18A200D8C87C /* JSHTMLHtmlElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLHtmlElement.h; sourceTree = "<group>"; };
@@ -6338,8 +6336,6 @@
 		1AC2260A0DB69F190089B669 /* JSDOMApplicationCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMApplicationCache.cpp; sourceTree = "<group>"; };
 		1AC2260B0DB69F190089B669 /* JSDOMApplicationCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMApplicationCache.h; sourceTree = "<group>"; };
 		1AC226160DB69F740089B669 /* JSDOMApplicationCacheCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMApplicationCacheCustom.cpp; sourceTree = "<group>"; };
-		1AC694C50A3B1676003F5049 /* PluginDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PluginDocument.cpp; sourceTree = "<group>"; };
-		1AC694C60A3B1676003F5049 /* PluginDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginDocument.h; sourceTree = "<group>"; };
 		1ACE53DD0A8D18810022947D /* JSDOMParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMParser.cpp; sourceTree = "<group>"; };
 		1ACE53DE0A8D18810022947D /* JSDOMParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSDOMParser.h; sourceTree = "<group>"; };
 		1ACE53E10A8D18E70022947D /* DOMParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DOMParser.cpp; sourceTree = "<group>"; };
@@ -7138,8 +7134,6 @@
 		51E3F9D10DA05D7100250911 /* Storage.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Storage.idl; sourceTree = "<group>"; };
 		51E3F9D40DA05E1D00250911 /* JSStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStorage.cpp; sourceTree = "<group>"; };
 		51E3F9D50DA05E1D00250911 /* JSStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStorage.h; sourceTree = "<group>"; };
-		51E4ADB20C42B4CF0042BC55 /* FTPDirectoryDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FTPDirectoryDocument.cpp; sourceTree = "<group>"; };
-		51E4ADB30C42B4CF0042BC55 /* FTPDirectoryDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FTPDirectoryDocument.h; sourceTree = "<group>"; };
 		51EC92570CE90DB400F90308 /* SQLError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLError.h; sourceTree = "<group>"; };
 		51EC92580CE90DB400F90308 /* SQLError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLError.idl; sourceTree = "<group>"; };
 		51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomSQLStatementErrorCallback.cpp; sourceTree = "<group>"; };
@@ -8600,6 +8594,14 @@
 		97059974107D975200A50A7C /* PolicyCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolicyCallback.h; sourceTree = "<group>"; };
 		97059975107D975200A50A7C /* PolicyChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PolicyChecker.cpp; sourceTree = "<group>"; };
 		97059976107D975200A50A7C /* PolicyChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolicyChecker.h; sourceTree = "<group>"; };
+		97205AAD123928CA00B17380 /* FTPDirectoryDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FTPDirectoryDocument.cpp; sourceTree = "<group>"; };
+		97205AAE123928CA00B17380 /* FTPDirectoryDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTPDirectoryDocument.h; sourceTree = "<group>"; };
+		97205AB11239291000B17380 /* ImageDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageDocument.cpp; sourceTree = "<group>"; };
+		97205AB21239291000B17380 /* ImageDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageDocument.h; sourceTree = "<group>"; };
+		97205AB31239291000B17380 /* MediaDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaDocument.cpp; sourceTree = "<group>"; };
+		97205AB41239291000B17380 /* MediaDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaDocument.h; sourceTree = "<group>"; };
+		97205AB91239292700B17380 /* PluginDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginDocument.cpp; sourceTree = "<group>"; };
+		97205ABA1239292700B17380 /* PluginDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginDocument.h; sourceTree = "<group>"; };
 		9738899E116EA9DC00ADF313 /* DocumentWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentWriter.cpp; sourceTree = "<group>"; };
 		9738899F116EA9DC00ADF313 /* DocumentWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentWriter.h; sourceTree = "<group>"; };
 		973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadNotifier.cpp; sourceTree = "<group>"; };
@@ -9360,8 +9362,6 @@
 		AB247A6A0AFD6383003FA5FD /* RenderSlider.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSlider.cpp; sourceTree = "<group>"; };
 		AB247A6B0AFD6383003FA5FD /* RenderSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSlider.h; sourceTree = "<group>"; };
 		AB31C91D10AE1B8E000C7B92 /* LineClampValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LineClampValue.h; path = style/LineClampValue.h; sourceTree = "<group>"; };
-		AB40484B0E083FA8007D6920 /* MediaDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaDocument.cpp; sourceTree = "<group>"; };
-		AB40484C0E083FA8007D6920 /* MediaDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaDocument.h; sourceTree = "<group>"; };
 		AB4261D70A2F6C9700BDD17D /* missingImage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = missingImage.tiff; sourceTree = "<group>"; };
 		AB4CB4EA0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLSelectElementCustom.h; sourceTree = "<group>"; };
 		AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextControl.cpp; sourceTree = "<group>"; };
@@ -14081,6 +14081,8 @@
 				2ED609BA1145B07100C8684E /* DOMFormData.cpp */,
 				2ED609BB1145B07100C8684E /* DOMFormData.h */,
 				2E0888C3114883A900AF4265 /* DOMFormData.idl */,
+				97205AAD123928CA00B17380 /* FTPDirectoryDocument.cpp */,
+				97205AAE123928CA00B17380 /* FTPDirectoryDocument.h */,
 				A8136D370973A8E700D74463 /* FormDataList.cpp */,
 				A8136D360973A8E700D74463 /* FormDataList.h */,
 				BC97E239109144950010D361 /* HTMLAllCollection.cpp */,
@@ -14333,12 +14335,18 @@
 				A77979130D6B9D0C003851B9 /* ImageData.cpp */,
 				A77979140D6B9D0C003851B9 /* ImageData.h */,
 				A77979150D6B9D0C003851B9 /* ImageData.idl */,
+				97205AB11239291000B17380 /* ImageDocument.cpp */,
+				97205AB21239291000B17380 /* ImageDocument.h */,
 				B0149E7B11A4B21500196A7B /* ImageResizerThread.cpp */,
 				B0149E7C11A4B21500196A7B /* ImageResizerThread.h */,
 				A456FA2411AD4A830020B420 /* LabelsNodeList.cpp */,
 				A456FA2511AD4A830020B420 /* LabelsNodeList.h */,
+				97205AB31239291000B17380 /* MediaDocument.cpp */,
+				97205AB41239291000B17380 /* MediaDocument.h */,
 				E446139B0CD6331000FADA75 /* MediaError.h */,
 				E446139C0CD6331000FADA75 /* MediaError.idl */,
+				97205AB91239292700B17380 /* PluginDocument.cpp */,
+				97205ABA1239292700B17380 /* PluginDocument.h */,
 				A5AFB34D115151A700B045CB /* StepRange.cpp */,
 				A5AFB34E115151A700B045CB /* StepRange.h */,
 				97BC84B112371180000C6161 /* TextDocument.cpp */,
@@ -16548,22 +16556,16 @@
 				D000EBA011BDAFD400C47726 /* FrameLoaderStateMachine.cpp */,
 				D000EBA111BDAFD400C47726 /* FrameLoaderStateMachine.h */,
 				93B77A370ADD792500EA4B81 /* FrameLoaderTypes.h */,
-				51E4ADB20C42B4CF0042BC55 /* FTPDirectoryDocument.cpp */,
-				51E4ADB30C42B4CF0042BC55 /* FTPDirectoryDocument.h */,
 				51C81B870C4422F70019ECE3 /* FTPDirectoryParser.cpp */,
 				51C81B880C4422F70019ECE3 /* FTPDirectoryParser.h */,
 				97DCE1FF10807C750057D394 /* HistoryController.cpp */,
 				97DCE20010807C750057D394 /* HistoryController.h */,
-				1A820D8F0A13EBA600AF843C /* ImageDocument.cpp */,
-				1A820D900A13EBA600AF843C /* ImageDocument.h */,
 				089582530E857A7E00F82C83 /* ImageLoader.cpp */,
 				089582540E857A7E00F82C83 /* ImageLoader.h */,
 				BCB16C130979C3BD00467741 /* loader.cpp */,
 				BCB16C140979C3BD00467741 /* loader.h */,
 				93E227DC0AF589AD00D48324 /* MainResourceLoader.cpp */,
 				656D37290ADBA5DE00A4554D /* MainResourceLoader.h */,
-				AB40484B0E083FA8007D6920 /* MediaDocument.cpp */,
-				AB40484C0E083FA8007D6920 /* MediaDocument.h */,
 				93CCF05F0AF6CA7600018E89 /* NavigationAction.cpp */,
 				93CCF0260AF6C52900018E89 /* NavigationAction.h */,
 				93E227DD0AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp */,
@@ -16572,8 +16574,6 @@
 				D0FF2A5C11F8C45A007E74E0 /* PingLoader.h */,
 				377C4CDE1014E9F600B9AE42 /* PlaceholderDocument.cpp */,
 				377C4CDD1014E9F600B9AE42 /* PlaceholderDocument.h */,
-				1AC694C50A3B1676003F5049 /* PluginDocument.cpp */,
-				1AC694C60A3B1676003F5049 /* PluginDocument.h */,
 				97059973107D975200A50A7C /* PolicyCallback.cpp */,
 				97059974107D975200A50A7C /* PolicyCallback.h */,
 				97059975107D975200A50A7C /* PolicyChecker.cpp */,
@@ -18830,7 +18830,6 @@
 				628D214E12131EF40055DCFC /* FrameNetworkingContext.h in Headers */,
 				65A21485097A3F5300B9050A /* FrameTree.h in Headers */,
 				65CBFEFA0974F607001DAC25 /* FrameView.h in Headers */,
-				51E4ADB70C42B4CF0042BC55 /* FTPDirectoryDocument.h in Headers */,
 				51C81B8A0C4422F70019ECE3 /* FTPDirectoryParser.h in Headers */,
 				935C477509AC4D8E00A6AAB4 /* GapRects.h in Headers */,
 				1432E8470C51493800B1500F /* GCController.h in Headers */,
@@ -18999,7 +18998,6 @@
 				B27535700B053814002CE64F /* Image.h in Headers */,
 				B2A10B920B3818BD00099AA4 /* ImageBuffer.h in Headers */,
 				A779791A0D6B9D0C003851B9 /* ImageData.h in Headers */,
-				1A820D920A13EBA600AF843C /* ImageDocument.h in Headers */,
 				089582560E857A7E00F82C83 /* ImageLoader.h in Headers */,
 				BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */,
 				B0149E8011A4B21500196A7B /* ImageResizerThread.h in Headers */,
@@ -19532,7 +19530,6 @@
 				49E911C70EF86D47009D0CAF /* MatrixTransformOperation.h in Headers */,
 				931BCC611124DFCB00BE70DD /* MediaCanStartListener.h in Headers */,
 				ABFE7E130D32FAF60066F4D2 /* MediaControlElements.h in Headers */,
-				AB40484E0E083FA8007D6920 /* MediaDocument.h in Headers */,
 				E44613AD0CD6331000FADA75 /* MediaError.h in Headers */,
 				4E1959220A39DABA00220FE5 /* MediaFeatureNames.h in Headers */,
 				A8EA800E0A19516E00A8EF5F /* MediaList.h in Headers */,
@@ -19634,7 +19631,6 @@
 				B2C3DA2B0D006C1D00EF6F26 /* PlatformString.h in Headers */,
 				935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */,
 				A9C6E4F40D745E48006442E9 /* PluginData.h in Headers */,
-				1AC694C80A3B1676003F5049 /* PluginDocument.h in Headers */,
 				7693BAD4106C2DCA007B0823 /* PluginHalter.h in Headers */,
 				7693BAD5106C2DCA007B0823 /* PluginHalterClient.h in Headers */,
 				1ADA14110E1AE5D900023EE5 /* PluginMainThreadScheduler.h in Headers */,
@@ -20467,6 +20463,10 @@
 				97BC849B12370A4B000C6161 /* HTMLInputStream.h in Headers */,
 				97BC84A512370DC8000C6161 /* TextViewSourceParser.h in Headers */,
 				97BC84B412371180000C6161 /* TextDocument.h in Headers */,
+				97205AB0123928CA00B17380 /* FTPDirectoryDocument.h in Headers */,
+				97205AB61239291000B17380 /* ImageDocument.h in Headers */,
+				97205AB81239291000B17380 /* MediaDocument.h in Headers */,
+				97205ABC1239292700B17380 /* PluginDocument.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -21358,7 +21358,6 @@
 				65BF02450974819000C43196 /* FrameMac.mm in Sources */,
 				65A21484097A3F5300B9050A /* FrameTree.cpp in Sources */,
 				65CBFEF90974F607001DAC25 /* FrameView.cpp in Sources */,
-				51E4ADB60C42B4CF0042BC55 /* FTPDirectoryDocument.cpp in Sources */,
 				51C81B890C4422F70019ECE3 /* FTPDirectoryParser.cpp in Sources */,
 				1432E8490C51493F00B1500F /* GCController.cpp in Sources */,
 				BCE04C940DAFF902007A0F41 /* GeneratedImage.cpp in Sources */,
@@ -21510,7 +21509,6 @@
 				B2A10B940B3818D700099AA4 /* ImageBufferCG.cpp in Sources */,
 				B275355E0B053814002CE64F /* ImageCG.cpp in Sources */,
 				A77979190D6B9D0C003851B9 /* ImageData.cpp in Sources */,
-				1A820D910A13EBA600AF843C /* ImageDocument.cpp in Sources */,
 				089582550E857A7E00F82C83 /* ImageLoader.cpp in Sources */,
 				B275357B0B053814002CE64F /* ImageMac.mm in Sources */,
 				B0149E7F11A4B21500196A7B /* ImageResizerThread.cpp in Sources */,
@@ -22131,7 +22129,6 @@
 				49D5DC2B0F423A73008F20FD /* Matrix3DTransformOperation.cpp in Sources */,
 				49E911C60EF86D47009D0CAF /* MatrixTransformOperation.cpp in Sources */,
 				ABFE7E120D32FAF60066F4D2 /* MediaControlElements.cpp in Sources */,
-				AB40484D0E083FA8007D6920 /* MediaDocument.cpp in Sources */,
 				4E1959210A39DABA00220FE5 /* MediaFeatureNames.cpp in Sources */,
 				A8EA80090A19516E00A8EF5F /* MediaList.cpp in Sources */,
 				E44613E30CD6819F00FADA75 /* MediaPlayer.cpp in Sources */,
@@ -22211,7 +22208,6 @@
 				BC94D1080C274F88006BC617 /* PlatformScreenMac.mm in Sources */,
 				1AD8F81C11CAB9E900E93E54 /* PlatformStrategies.cpp in Sources */,
 				A9C6E4F30D745E48006442E9 /* PluginData.cpp in Sources */,
-				1AC694C70A3B1676003F5049 /* PluginDocument.cpp in Sources */,
 				7693BAD3106C2DCA007B0823 /* PluginHalter.cpp in Sources */,
 				1ADA14100E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp in Sources */,
 				76FF17E311235673001D61B5 /* PluginViewNone.cpp in Sources */,
@@ -22935,6 +22931,10 @@
 				97BC84831236FD93000C6161 /* TextDocumentParser.cpp in Sources */,
 				97BC84A412370DC8000C6161 /* TextViewSourceParser.cpp in Sources */,
 				97BC84B312371180000C6161 /* TextDocument.cpp in Sources */,
+				97205AAF123928CA00B17380 /* FTPDirectoryDocument.cpp in Sources */,
+				97205AB51239291000B17380 /* ImageDocument.cpp in Sources */,
+				97205AB71239291000B17380 /* MediaDocument.cpp in Sources */,
+				97205ABB1239292700B17380 /* PluginDocument.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/WebCore/loader/FTPDirectoryDocument.cpp b/WebCore/html/FTPDirectoryDocument.cpp
similarity index 100%
rename from WebCore/loader/FTPDirectoryDocument.cpp
rename to WebCore/html/FTPDirectoryDocument.cpp
diff --git a/WebCore/loader/FTPDirectoryDocument.h b/WebCore/html/FTPDirectoryDocument.h
similarity index 100%
rename from WebCore/loader/FTPDirectoryDocument.h
rename to WebCore/html/FTPDirectoryDocument.h
diff --git a/WebCore/loader/ImageDocument.cpp b/WebCore/html/ImageDocument.cpp
similarity index 100%
rename from WebCore/loader/ImageDocument.cpp
rename to WebCore/html/ImageDocument.cpp
diff --git a/WebCore/loader/ImageDocument.h b/WebCore/html/ImageDocument.h
similarity index 100%
rename from WebCore/loader/ImageDocument.h
rename to WebCore/html/ImageDocument.h
diff --git a/WebCore/loader/MediaDocument.cpp b/WebCore/html/MediaDocument.cpp
similarity index 100%
rename from WebCore/loader/MediaDocument.cpp
rename to WebCore/html/MediaDocument.cpp
diff --git a/WebCore/loader/MediaDocument.h b/WebCore/html/MediaDocument.h
similarity index 100%
rename from WebCore/loader/MediaDocument.h
rename to WebCore/html/MediaDocument.h
diff --git a/WebCore/loader/PluginDocument.cpp b/WebCore/html/PluginDocument.cpp
similarity index 100%
rename from WebCore/loader/PluginDocument.cpp
rename to WebCore/html/PluginDocument.cpp
diff --git a/WebCore/loader/PluginDocument.h b/WebCore/html/PluginDocument.h
similarity index 100%
rename from WebCore/loader/PluginDocument.h
rename to WebCore/html/PluginDocument.h

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list