Modified: trunk/Source/WebCore/ChangeLog (173146 => 173147)
--- trunk/Source/WebCore/ChangeLog 2014-08-31 18:14:57 UTC (rev 173146)
+++ trunk/Source/WebCore/ChangeLog 2014-08-31 22:01:34 UTC (rev 173147)
@@ -1,5 +1,20 @@
2014-08-31 Tim Horton <[email protected]>
+ Use SinkDocument instead of PDFDocument; get rid of PDFDocument
+ https://bugs.webkit.org/show_bug.cgi?id=136414
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * loader/DocumentWriter.cpp:
+ (WebCore::DocumentWriter::createDocument):
+ * pdf/ios/PDFDocument.cpp: Removed.
+ * pdf/ios/PDFDocument.h: Removed.
+ Use the generic SinkDocument, which ignores all incoming data just like PDFDocument.
+ Delete the unnecessary and iOS-specific PDFDocument.cpp/h
+
+2014-08-31 Tim Horton <[email protected]>
+
Adjust an antique comment in Image::drawPattern
https://bugs.webkit.org/show_bug.cgi?id=136411
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (173146 => 173147)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-08-31 18:14:57 UTC (rev 173146)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-08-31 22:01:34 UTC (rev 173147)
@@ -1904,8 +1904,6 @@
5179CE36195CAC7E0019C198 /* HIDGamepadProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5179CE34195CAC7E0019C198 /* HIDGamepadProvider.cpp */; };
5179CE37195CAC7E0019C198 /* HIDGamepadProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 5179CE35195CAC7E0019C198 /* HIDGamepadProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
517FBA1E151AB17C00B57959 /* DOMWindowExtension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517FBA17151AA71B00B57959 /* DOMWindowExtension.cpp */; };
- 51889F0B1554AF3D004427F7 /* PDFDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51889F091554AF3D004427F7 /* PDFDocument.cpp */; };
- 51889F0C1554AF3D004427F7 /* PDFDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 51889F0A1554AF3D004427F7 /* PDFDocument.h */; };
5189F01D10B37BD900F3C739 /* JSPopStateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5189F01B10B37BD900F3C739 /* JSPopStateEvent.cpp */; };
5189F01E10B37BD900F3C739 /* JSPopStateEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 5189F01C10B37BD900F3C739 /* JSPopStateEvent.h */; };
5189F0DE10B46B0E00F3C739 /* PopStateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5189F0DD10B46B0E00F3C739 /* PopStateEvent.cpp */; };
@@ -8976,8 +8974,6 @@
5179CE35195CAC7E0019C198 /* HIDGamepadProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HIDGamepadProvider.h; sourceTree = "<group>"; };
517FBA17151AA71B00B57959 /* DOMWindowExtension.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowExtension.cpp; sourceTree = "<group>"; };
517FBA18151AA71B00B57959 /* DOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWindowExtension.h; sourceTree = "<group>"; };
- 51889F091554AF3D004427F7 /* PDFDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PDFDocument.cpp; sourceTree = "<group>"; };
- 51889F0A1554AF3D004427F7 /* PDFDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFDocument.h; sourceTree = "<group>"; };
5189F01B10B37BD900F3C739 /* JSPopStateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPopStateEvent.cpp; sourceTree = "<group>"; };
5189F01C10B37BD900F3C739 /* JSPopStateEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPopStateEvent.h; sourceTree = "<group>"; };
5189F0DD10B46B0E00F3C739 /* PopStateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PopStateEvent.cpp; sourceTree = "<group>"; };
@@ -14622,7 +14618,6 @@
BCB16BFB0979C38700467741 /* loader */,
FABE72EC1059C1EB00D999DD /* mathml */,
65BF02180974806300C43196 /* page */,
- 51889F071554AF3D004427F7 /* pdf */,
BCF1A5BA097832090061A123 /* platform */,
5DCF83690D59157800953BC6 /* plugins */,
F523D2F302DE443B018635CA /* rendering */,
@@ -16020,23 +16015,6 @@
tabWidth = 4;
usesTabs = 0;
};
- 51889F071554AF3D004427F7 /* pdf */ = {
- isa = PBXGroup;
- children = (
- 51889F081554AF3D004427F7 /* ios */,
- );
- path = pdf;
- sourceTree = "<group>";
- };
- 51889F081554AF3D004427F7 /* ios */ = {
- isa = PBXGroup;
- children = (
- 51889F091554AF3D004427F7 /* PDFDocument.cpp */,
- 51889F0A1554AF3D004427F7 /* PDFDocument.h */,
- );
- path = ios;
- sourceTree = "<group>";
- };
518F4FE9194CA4B60081BAAE /* gamepad */ = {
isa = PBXGroup;
children = (
@@ -25446,7 +25424,6 @@
A88DD4870B4629A300C02990 /* PathTraversalState.h in Headers */,
A8FA6E5D0E4CFDED00D5CF49 /* Pattern.h in Headers */,
B22279710D00BF220071B782 /* PatternAttributes.h in Headers */,
- 51889F0C1554AF3D004427F7 /* PDFDocument.h in Headers */,
B27535650B053814002CE64F /* PDFDocumentImage.h in Headers */,
8A7CC96B12076D73001D4588 /* PendingScript.h in Headers */,
8A844D0511D3C18E0014065C /* Performance.h in Headers */,
@@ -28963,7 +28940,6 @@
A88DD4890B4629B000C02990 /* PathTraversalState.cpp in Sources */,
A8FA6E5E0E4CFDED00D5CF49 /* Pattern.cpp in Sources */,
A80A38FE0E50CC8200A25EBC /* PatternCG.cpp in Sources */,
- 51889F0B1554AF3D004427F7 /* PDFDocument.cpp in Sources */,
B27535640B053814002CE64F /* PDFDocumentImage.cpp in Sources */,
2D6E468417D660F500ECF8BB /* PDFDocumentImageMac.mm in Sources */,
8A7CC97012076F8A001D4588 /* PendingScript.cpp in Sources */,
Modified: trunk/Source/WebCore/loader/DocumentWriter.cpp (173146 => 173147)
--- trunk/Source/WebCore/loader/DocumentWriter.cpp 2014-08-31 18:14:57 UTC (rev 173146)
+++ trunk/Source/WebCore/loader/DocumentWriter.cpp 2014-08-31 22:01:34 UTC (rev 173147)
@@ -49,10 +49,6 @@
#include "TextResourceDecoder.h"
#include <wtf/Ref.h>
-#if PLATFORM(IOS)
-#include "PDFDocument.h"
-#endif
-
namespace WebCore {
static inline bool canReferToParentFrameEncoding(const Frame* frame, const Frame* parentFrame)
@@ -110,7 +106,7 @@
return PluginDocument::create(m_frame, url);
#if PLATFORM(IOS)
if (MIMETypeRegistry::isPDFMIMEType(m_mimeType) && (m_frame->isMainFrame() || !m_frame->settings().useImageDocumentForSubframePDF()))
- return PDFDocument::create(m_frame, url);
+ return SinkDocument::create(m_frame, url);
#endif
if (!m_frame->loader().client().hasHTMLView())
return Document::createNonRenderedPlaceholder(m_frame, url);
