[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:10:39 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c8be4f263c099c9214f705df2a1191b15c81fe02
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 8 09:06:58 2010 +0000
2010-09-08 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
TextDocument doesn't belong in WebCore/loader
https://bugs.webkit.org/show_bug.cgi?id=45346
TextDocument has nothing to do with loading. It turns out that it
should be in WebCore/html because TextDocument is actually a subclass
of HTMLDocument (in quirks mode, no less).
* Android.mk:
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* html/TextDocument.cpp: Renamed from WebCore/loader/TextDocument.cpp.
(WebCore::TextDocument::TextDocument):
(WebCore::TextDocument::createParser):
* html/TextDocument.h: Renamed from WebCore/loader/TextDocument.h.
(WebCore::TextDocument::create):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66960 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 9e56fea..f53daba 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -279,6 +279,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
html/HTMLViewSourceDocument.cpp \
html/ImageData.cpp \
html/ImageResizerThread.cpp \
+ html/TextDocument.cpp \
html/TimeRanges.cpp \
html/ValidityState.cpp \
\
@@ -341,7 +342,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
loader/ResourceLoader.cpp \
loader/SubframeLoader.cpp \
loader/SubresourceLoader.cpp \
- loader/TextDocument.cpp \
loader/TextResourceDecoder.cpp \
loader/ThreadableLoader.cpp \
loader/WorkerThreadableLoader.cpp \
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index dbf6acb..291c780 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1027,6 +1027,7 @@ SET(WebCore_SOURCES
html/ImageResizerThread.cpp
html/LabelsNodeList.cpp
html/StepRange.cpp
+ html/TextDocument.cpp
html/ValidityState.cpp
html/canvas/CanvasGradient.cpp
html/canvas/CanvasPattern.cpp
@@ -1112,7 +1113,6 @@ SET(WebCore_SOURCES
loader/SinkDocument.cpp
loader/SubframeLoader.cpp
loader/SubresourceLoader.cpp
- loader/TextDocument.cpp
loader/TextResourceDecoder.cpp
loader/ThreadableLoader.cpp
loader/WorkerThreadableLoader.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 496df26..c917833 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,30 @@
Reviewed by Eric Seidel.
+ TextDocument doesn't belong in WebCore/loader
+ https://bugs.webkit.org/show_bug.cgi?id=45346
+
+ TextDocument has nothing to do with loading. It turns out that it
+ should be in WebCore/html because TextDocument is actually a subclass
+ of HTMLDocument (in quirks mode, no less).
+
+ * Android.mk:
+ * CMakeLists.txt:
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * html/TextDocument.cpp: Renamed from WebCore/loader/TextDocument.cpp.
+ (WebCore::TextDocument::TextDocument):
+ (WebCore::TextDocument::createParser):
+ * html/TextDocument.h: Renamed from WebCore/loader/TextDocument.h.
+ (WebCore::TextDocument::create):
+
+2010-09-08 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
Create TextViewSourceParser
https://bugs.webkit.org/show_bug.cgi?id=45343
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 0df8663..bd4b768 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1525,6 +1525,8 @@ webcore_sources += \
WebCore/html/MediaError.h \
WebCore/html/StepRange.cpp \
WebCore/html/StepRange.h \
+ WebCore/html/TextDocument.cpp \
+ WebCore/html/TextDocument.h \
WebCore/html/TextMetrics.h \
WebCore/html/canvas/CanvasContextAttributes.h \
WebCore/html/canvas/CanvasGradient.cpp \
@@ -1741,8 +1743,6 @@ webcore_sources += \
WebCore/loader/SubresourceLoaderClient.h \
WebCore/loader/SubstituteData.h \
WebCore/loader/SubstituteResource.h \
- WebCore/loader/TextDocument.cpp \
- WebCore/loader/TextDocument.h \
WebCore/loader/TextResourceDecoder.cpp \
WebCore/loader/TextResourceDecoder.h \
WebCore/loader/ThreadableLoader.cpp \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 3acc572..76c4290 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1686,6 +1686,8 @@
'html/MediaError.h',
'html/StepRange.cpp',
'html/StepRange.h',
+ 'html/TextDocument.cpp',
+ 'html/TextDocument.h',
'html/TextMetrics.h',
'html/TimeRanges.cpp',
'html/TimeRanges.h',
@@ -1960,8 +1962,6 @@
'loader/SubresourceLoaderClient.h',
'loader/SubstituteData.h',
'loader/SubstituteResource.h',
- 'loader/TextDocument.cpp',
- 'loader/TextDocument.h',
'loader/TextResourceDecoder.cpp',
'loader/TextResourceDecoder.h',
'loader/ThreadableLoader.cpp',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index b26306b..a82a859 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -731,6 +731,7 @@ SOURCES += \
html/ImageResizerThread.cpp \
html/LabelsNodeList.cpp \
html/StepRange.cpp \
+ html/TextDocument.cpp \
html/ValidityState.cpp \
html/canvas/CanvasGradient.cpp \
html/canvas/CanvasPattern.cpp \
@@ -819,7 +820,6 @@ SOURCES += \
loader/SinkDocument.cpp \
loader/SubframeLoader.cpp \
loader/SubresourceLoader.cpp \
- loader/TextDocument.cpp \
loader/TextResourceDecoder.cpp \
loader/ThreadableLoader.cpp \
notifications/Notification.cpp \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index c87cebf..0cfbd3d 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -23797,10 +23797,6 @@
>
</File>
<File
- RelativePath="..\loader\TextDocument.cpp"
- >
- </File>
- <File
RelativePath="..\loader\TextDocument.h"
>
</File>
@@ -41997,6 +41993,10 @@
>
</File>
<File
+ RelativePath="..\html\TextDocument.cpp"
+ >
+ </File>
+ <File
RelativePath="..\html\TimeRanges.cpp"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index f5155de..ad54da0 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -410,8 +410,6 @@
1A569D230D7E2B82007C3983 /* runtime_object.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CF40D7E2B82007C3983 /* runtime_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A569D240D7E2B82007C3983 /* runtime_root.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CF50D7E2B82007C3983 /* runtime_root.cpp */; };
1A569D250D7E2B82007C3983 /* runtime_root.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CF60D7E2B82007C3983 /* runtime_root.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 1A6938010A11100A00C127FE /* TextDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6937FF0A11100A00C127FE /* TextDocument.cpp */; };
- 1A6938020A11100A00C127FE /* TextDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6938000A11100A00C127FE /* TextDocument.h */; };
1A71D57B0F33819000F9CE4E /* IdentifierRep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A71D5790F33819000F9CE4E /* IdentifierRep.cpp */; };
1A71D57C0F33819000F9CE4E /* IdentifierRep.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A71D57A0F33819000F9CE4E /* IdentifierRep.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A750D5C0A90DEE1000FF215 /* JSTreeWalker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A750D5A0A90DEE1000FF215 /* JSTreeWalker.cpp */; };
@@ -2791,6 +2789,8 @@
97BC849B12370A4B000C6161 /* HTMLInputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC849A12370A4B000C6161 /* HTMLInputStream.h */; };
97BC84A412370DC8000C6161 /* TextViewSourceParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC84A212370DC7000C6161 /* TextViewSourceParser.cpp */; };
97BC84A512370DC8000C6161 /* TextViewSourceParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC84A312370DC8000C6161 /* TextViewSourceParser.h */; };
+ 97BC84B312371180000C6161 /* TextDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC84B112371180000C6161 /* TextDocument.cpp */; };
+ 97BC84B412371180000C6161 /* TextDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC84B212371180000C6161 /* TextDocument.h */; };
97C078501165D5BE003A32EF /* SuffixTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 97C0784F1165D5BE003A32EF /* SuffixTree.h */; };
97DCE20110807C750057D394 /* HistoryController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97DCE1FF10807C750057D394 /* HistoryController.cpp */; };
97DCE20210807C750057D394 /* HistoryController.h in Headers */ = {isa = PBXBuildFile; fileRef = 97DCE20010807C750057D394 /* HistoryController.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -6233,8 +6233,6 @@
1A569CF40D7E2B82007C3983 /* runtime_object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = runtime_object.h; path = bridge/runtime_object.h; sourceTree = "<group>"; };
1A569CF50D7E2B82007C3983 /* runtime_root.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_root.cpp; path = bridge/runtime_root.cpp; sourceTree = "<group>"; };
1A569CF60D7E2B82007C3983 /* runtime_root.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = runtime_root.h; path = bridge/runtime_root.h; sourceTree = "<group>"; };
- 1A6937FF0A11100A00C127FE /* TextDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextDocument.cpp; sourceTree = "<group>"; };
- 1A6938000A11100A00C127FE /* TextDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextDocument.h; sourceTree = "<group>"; };
1A71D5790F33819000F9CE4E /* IdentifierRep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IdentifierRep.cpp; path = bridge/IdentifierRep.cpp; sourceTree = "<group>"; };
1A71D57A0F33819000F9CE4E /* IdentifierRep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IdentifierRep.h; path = bridge/IdentifierRep.h; sourceTree = "<group>"; };
1A750D3C0A90DE35000FF215 /* TreeWalker.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TreeWalker.idl; sourceTree = "<group>"; };
@@ -8663,6 +8661,8 @@
97BC849A12370A4B000C6161 /* HTMLInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLInputStream.h; path = parser/HTMLInputStream.h; sourceTree = "<group>"; };
97BC84A212370DC7000C6161 /* TextViewSourceParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextViewSourceParser.cpp; path = parser/TextViewSourceParser.cpp; sourceTree = "<group>"; };
97BC84A312370DC8000C6161 /* TextViewSourceParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextViewSourceParser.h; path = parser/TextViewSourceParser.h; sourceTree = "<group>"; };
+ 97BC84B112371180000C6161 /* TextDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextDocument.cpp; sourceTree = "<group>"; };
+ 97BC84B212371180000C6161 /* TextDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextDocument.h; sourceTree = "<group>"; };
97C0784F1165D5BE003A32EF /* SuffixTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SuffixTree.h; sourceTree = "<group>"; };
97C1F552122855CB00EDE616 /* HTMLToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLToken.h; path = parser/HTMLToken.h; sourceTree = "<group>"; };
97DCE1FF10807C750057D394 /* HistoryController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HistoryController.cpp; sourceTree = "<group>"; };
@@ -14335,6 +14335,8 @@
E446139C0CD6331000FADA75 /* MediaError.idl */,
A5AFB34D115151A700B045CB /* StepRange.cpp */,
A5AFB34E115151A700B045CB /* StepRange.h */,
+ 97BC84B112371180000C6161 /* TextDocument.cpp */,
+ 97BC84B212371180000C6161 /* TextDocument.h */,
BCEF45E80E687767001C1287 /* TextMetrics.h */,
BCEF453F0E676AC1001C1287 /* TextMetrics.idl */,
E446139D0CD6331000FADA75 /* TimeRanges.cpp */,
@@ -16589,8 +16591,6 @@
1A3178920B20A81600316987 /* SubresourceLoaderClient.h */,
659A7D120B6DB4D9001155B3 /* SubstituteData.h */,
1A8F6B010DB53006001DB794 /* SubstituteResource.h */,
- 1A6937FF0A11100A00C127FE /* TextDocument.cpp */,
- 1A6938000A11100A00C127FE /* TextDocument.h */,
F523D27802DE43D7018635CA /* TextResourceDecoder.cpp */,
F523D27902DE43D7018635CA /* TextResourceDecoder.h */,
0B90561D0F257E930095FF6A /* ThreadableLoader.cpp */,
@@ -20167,7 +20167,6 @@
B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */,
AB014DE40E689A4300E10445 /* TextControlInnerElements.h in Headers */,
B2C3DA450D006C1D00EF6F26 /* TextDirection.h in Headers */,
- 1A6938020A11100A00C127FE /* TextDocument.h in Headers */,
B2C3DA470D006C1D00EF6F26 /* TextEncoding.h in Headers */,
C105DA640F3AA6B8001DD44F /* TextEncodingDetector.h in Headers */,
B2C3DA490D006C1D00EF6F26 /* TextEncodingRegistry.h in Headers */,
@@ -20457,6 +20456,7 @@
97BC84841236FD93000C6161 /* TextDocumentParser.h in Headers */,
97BC849B12370A4B000C6161 /* HTMLInputStream.h in Headers */,
97BC84A512370DC8000C6161 /* TextViewSourceParser.h in Headers */,
+ 97BC84B412371180000C6161 /* TextDocument.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -22690,7 +22690,6 @@
B2C3DA3F0D006C1D00EF6F26 /* TextCodecUserDefined.cpp in Sources */,
B2C3DA410D006C1D00EF6F26 /* TextCodecUTF16.cpp in Sources */,
AB014DE30E689A4300E10445 /* TextControlInnerElements.cpp in Sources */,
- 1A6938010A11100A00C127FE /* TextDocument.cpp in Sources */,
B2C3DA460D006C1D00EF6F26 /* TextEncoding.cpp in Sources */,
C105DA620F3AA68F001DD44F /* TextEncodingDetectorICU.cpp in Sources */,
B2C3DA480D006C1D00EF6F26 /* TextEncodingRegistry.cpp in Sources */,
@@ -22923,6 +22922,7 @@
898785F4122E1EAC003AABDA /* JSFileReaderSync.cpp in Sources */,
97BC84831236FD93000C6161 /* TextDocumentParser.cpp in Sources */,
97BC84A412370DC8000C6161 /* TextViewSourceParser.cpp in Sources */,
+ 97BC84B312371180000C6161 /* TextDocument.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebCore/loader/TextDocument.cpp b/WebCore/html/TextDocument.cpp
similarity index 100%
rename from WebCore/loader/TextDocument.cpp
rename to WebCore/html/TextDocument.cpp
diff --git a/WebCore/loader/TextDocument.h b/WebCore/html/TextDocument.h
similarity index 100%
rename from WebCore/loader/TextDocument.h
rename to WebCore/html/TextDocument.h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list