<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161207] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161207">161207</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 07:50:28 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove PlaceholderDocument
https://bugs.webkit.org/show_bug.cgi?id=126382
Reviewed by Andreas Kling.
Remove PlaceholderDocument class and replace it with a bit in Document.
* WebCore.xcodeproj/project.pbxproj:
* dom/Document.cpp:
(WebCore::Document::Document):
(WebCore::Document::createRenderTree):
* dom/Document.h:
Also make Synthesized a construction flag instead of a boolean parameter.
(WebCore::Document::createNonRenderedPlaceholder):
* html/HTMLDocument.cpp:
(WebCore::HTMLDocument::HTMLDocument):
* html/HTMLDocument.h:
(WebCore::HTMLDocument::create):
(WebCore::HTMLDocument::createSynthesizedDocument):
* loader/DocumentWriter.cpp:
(WebCore::DocumentWriter::createDocument):
* loader/PlaceholderDocument.cpp: Removed.
* loader/PlaceholderDocument.h: Removed.
* pdf/ios/PDFDocument.h:
(WebCore::PDFDocument::PDFDocument):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDocumentcpp">trunk/Source/WebCore/html/HTMLDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDocumenth">trunk/Source/WebCore/html/HTMLDocument.h</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentWritercpp">trunk/Source/WebCore/loader/DocumentWriter.cpp</a></li>
<li><a href="#trunkSourceWebCorepdfiosPDFDocumenth">trunk/Source/WebCore/pdf/ios/PDFDocument.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreloaderPlaceholderDocumentcpp">trunk/Source/WebCore/loader/PlaceholderDocument.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderPlaceholderDocumenth">trunk/Source/WebCore/loader/PlaceholderDocument.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -1656,7 +1656,6 @@
</span><span class="cx"> loader/NavigationScheduler.cpp
</span><span class="cx"> loader/NetscapePlugInStreamLoader.cpp
</span><span class="cx"> loader/PingLoader.cpp
</span><del>- loader/PlaceholderDocument.cpp
</del><span class="cx"> loader/PolicyCallback.cpp
</span><span class="cx"> loader/PolicyChecker.cpp
</span><span class="cx"> loader/ProgressTracker.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/ChangeLog 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-01-02 Antti Koivisto <antti@apple.com>
+
+ Remove PlaceholderDocument
+ https://bugs.webkit.org/show_bug.cgi?id=126382
+
+ Reviewed by Andreas Kling.
+
+ Remove PlaceholderDocument class and replace it with a bit in Document.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ (WebCore::Document::createRenderTree):
+ * dom/Document.h:
+
+ Also make Synthesized a construction flag instead of a boolean parameter.
+
+ (WebCore::Document::createNonRenderedPlaceholder):
+ * html/HTMLDocument.cpp:
+ (WebCore::HTMLDocument::HTMLDocument):
+ * html/HTMLDocument.h:
+ (WebCore::HTMLDocument::create):
+ (WebCore::HTMLDocument::createSynthesizedDocument):
+ * loader/DocumentWriter.cpp:
+ (WebCore::DocumentWriter::createDocument):
+ * loader/PlaceholderDocument.cpp: Removed.
+ * loader/PlaceholderDocument.h: Removed.
+ * pdf/ios/PDFDocument.h:
+ (WebCore::PDFDocument::PDFDocument):
+
</ins><span class="cx"> 2014-01-01 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove public attachRenderTree
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -4031,8 +4031,6 @@
</span><span class="cx"> Source/WebCore/loader/NetscapePlugInStreamLoader.h \
</span><span class="cx"> Source/WebCore/loader/PingLoader.cpp \
</span><span class="cx"> Source/WebCore/loader/PingLoader.h \
</span><del>- Source/WebCore/loader/PlaceholderDocument.cpp \
- Source/WebCore/loader/PlaceholderDocument.h \
</del><span class="cx"> Source/WebCore/loader/PolicyCallback.cpp \
</span><span class="cx"> Source/WebCore/loader/PolicyCallback.h \
</span><span class="cx"> Source/WebCore/loader/PolicyChecker.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -7114,7 +7114,6 @@
</span><span class="cx"> <ClCompile Include="..\loader\NavigationScheduler.cpp" />
</span><span class="cx"> <ClCompile Include="..\loader\NetscapePlugInStreamLoader.cpp" />
</span><span class="cx"> <ClCompile Include="..\loader\PingLoader.cpp" />
</span><del>- <ClCompile Include="..\loader\PlaceholderDocument.cpp" />
</del><span class="cx"> <ClCompile Include="..\loader\PolicyCallback.cpp" />
</span><span class="cx"> <ClCompile Include="..\loader\PolicyChecker.cpp" />
</span><span class="cx"> <ClCompile Include="..\loader\ProgressTracker.cpp" />
</span><span class="lines">@@ -19005,7 +19004,6 @@
</span><span class="cx"> <ClInclude Include="..\loader\NavigationScheduler.h" />
</span><span class="cx"> <ClInclude Include="..\loader\NetscapePlugInStreamLoader.h" />
</span><span class="cx"> <ClInclude Include="..\loader\PingLoader.h" />
</span><del>- <ClInclude Include="..\loader\PlaceholderDocument.h" />
</del><span class="cx"> <ClInclude Include="..\loader\PolicyCallback.h" />
</span><span class="cx"> <ClInclude Include="..\loader\PolicyChecker.h" />
</span><span class="cx"> <ClInclude Include="..\loader\ProgressTracker.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -1178,8 +1178,6 @@
</span><span class="cx"> 376DCCE113B4F966002EBEFC /* TextRun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 376DCCE013B4F966002EBEFC /* TextRun.cpp */; };
</span><span class="cx"> 3774ABA50FA21EB400AD7DE9 /* OverlapTestRequestClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3774ABA30FA21EB400AD7DE9 /* OverlapTestRequestClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 377A3A9015EFCE9B0059F5C7 /* BitmapImageCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 377A3A8F15EFCE9A0059F5C7 /* BitmapImageCG.cpp */; };
</span><del>- 377C4CDF1014E9F600B9AE42 /* PlaceholderDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 377C4CDD1014E9F600B9AE42 /* PlaceholderDocument.h */; };
- 377C4CE01014E9F600B9AE42 /* PlaceholderDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 377C4CDE1014E9F600B9AE42 /* PlaceholderDocument.cpp */; };
</del><span class="cx"> 3784C34B0E11AA34007D8D48 /* FontTraitsMask.h in Headers */ = {isa = PBXBuildFile; fileRef = 3784C34A0E11AA34007D8D48 /* FontTraitsMask.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 37919C230B7D188600A56998 /* PositionIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37919C210B7D188600A56998 /* PositionIterator.cpp */; };
</span><span class="cx"> 37919C240B7D188600A56998 /* PositionIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 37919C220B7D188600A56998 /* PositionIterator.h */; settings = {ATTRIBUTES = (); }; };
</span><span class="lines">@@ -7889,8 +7887,6 @@
</span><span class="cx"> 3772B09516535856000A49CA /* PopupOpeningObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopupOpeningObserver.h; sourceTree = "<group>"; };
</span><span class="cx"> 3774ABA30FA21EB400AD7DE9 /* OverlapTestRequestClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlapTestRequestClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 377A3A8F15EFCE9A0059F5C7 /* BitmapImageCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitmapImageCG.cpp; sourceTree = "<group>"; };
</span><del>- 377C4CDD1014E9F600B9AE42 /* PlaceholderDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaceholderDocument.h; sourceTree = "<group>"; };
- 377C4CDE1014E9F600B9AE42 /* PlaceholderDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlaceholderDocument.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 3784C34A0E11AA34007D8D48 /* FontTraitsMask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontTraitsMask.h; sourceTree = "<group>"; };
</span><span class="cx"> 37919C210B7D188600A56998 /* PositionIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PositionIterator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 37919C220B7D188600A56998 /* PositionIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PositionIterator.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -20191,8 +20187,6 @@
</span><span class="cx"> 656D372B0ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h */,
</span><span class="cx"> D0FF2A5B11F8C45A007E74E0 /* PingLoader.cpp */,
</span><span class="cx"> D0FF2A5C11F8C45A007E74E0 /* PingLoader.h */,
</span><del>- 377C4CDE1014E9F600B9AE42 /* PlaceholderDocument.cpp */,
- 377C4CDD1014E9F600B9AE42 /* PlaceholderDocument.h */,
</del><span class="cx"> 97059973107D975200A50A7C /* PolicyCallback.cpp */,
</span><span class="cx"> 97059974107D975200A50A7C /* PolicyCallback.h */,
</span><span class="cx"> 97059975107D975200A50A7C /* PolicyChecker.cpp */,
</span><span class="lines">@@ -24378,7 +24372,6 @@
</span><span class="cx"> FD581FB51520F93B003A7A75 /* PeriodicWave.h in Headers */,
</span><span class="cx"> 49D5DC2E0F423A73008F20FD /* PerspectiveTransformOperation.h in Headers */,
</span><span class="cx"> D0FF2A5E11F8C45A007E74E0 /* PingLoader.h in Headers */,
</span><del>- 377C4CDF1014E9F600B9AE42 /* PlaceholderDocument.h in Headers */,
</del><span class="cx"> E4E9B11D1814569C003ACCDF /* SimpleLineLayoutFunctions.h in Headers */,
</span><span class="cx"> 499B3EDD128DB50200E726C2 /* PlatformCAAnimation.h in Headers */,
</span><span class="cx"> 0F13163E16ED0CC80035CC04 /* PlatformCAFilters.h in Headers */,
</span><span class="lines">@@ -27704,7 +27697,6 @@
</span><span class="cx"> FD581FB41520F93B003A7A75 /* PeriodicWave.cpp in Sources */,
</span><span class="cx"> 49D5DC2D0F423A73008F20FD /* PerspectiveTransformOperation.cpp in Sources */,
</span><span class="cx"> D0FF2A5D11F8C45A007E74E0 /* PingLoader.cpp in Sources */,
</span><del>- 377C4CE01014E9F600B9AE42 /* PlaceholderDocument.cpp in Sources */,
</del><span class="cx"> 4958782112A57DDF007238AC /* PlatformCAAnimationMac.mm in Sources */,
</span><span class="cx"> 0F13164016ED0CDE0035CC04 /* PlatformCAFiltersMac.mm in Sources */,
</span><span class="cx"> 4958782212A57DDF007238AC /* PlatformCALayerMac.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-Document::Document(Frame* frame, const URL& url, unsigned documentClasses, bool isSynthesized)
</del><ins>+Document::Document(Frame* frame, const URL& url, unsigned documentClasses, unsigned constructionFlags)
</ins><span class="cx"> : ContainerNode(nullptr, CreateDocument)
</span><span class="cx"> , TreeScope(this)
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS)
</span><span class="lines">@@ -453,7 +453,8 @@
</span><span class="cx"> , m_inPageCache(false)
</span><span class="cx"> , m_accessKeyMapValid(false)
</span><span class="cx"> , m_documentClasses(documentClasses)
</span><del>- , m_isSynthesized(isSynthesized)
</del><ins>+ , m_isSynthesized(constructionFlags & Synthesized)
+ , m_isNonRenderedPlaceholder(constructionFlags & NonRenderedPlaceholder)
</ins><span class="cx"> , m_isViewSource(false)
</span><span class="cx"> , m_sawElementsInKnownNamespaces(false)
</span><span class="cx"> , m_isSrcdocDocument(false)
</span><span class="lines">@@ -1950,6 +1951,9 @@
</span><span class="cx"> ASSERT(!m_inPageCache);
</span><span class="cx"> ASSERT(!m_axObjectCache || this != topDocument());
</span><span class="cx">
</span><ins>+ if (m_isNonRenderedPlaceholder)
+ return;
+
</ins><span class="cx"> // FIXME: It would be better if we could pass the resolved document style directly here.
</span><span class="cx"> m_renderView = createRenderer<RenderView>(*this, RenderStyle::create());
</span><span class="cx"> Node::setRenderer(m_renderView.get());
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/dom/Document.h 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -252,6 +252,10 @@
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(new Document(frame, url, XHTMLDocumentClass));
</span><span class="cx"> }
</span><ins>+ static PassRefPtr<Document> createNonRenderedPlaceholder(Frame* frame, const URL& url)
+ {
+ return adoptRef(new Document(frame, url, DefaultDocumentClass, NonRenderedPlaceholder));
+ }
</ins><span class="cx"> virtual ~Document();
</span><span class="cx">
</span><span class="cx"> MediaQueryMatcher& mediaQueryMatcher();
</span><span class="lines">@@ -1220,7 +1224,8 @@
</span><span class="cx"> void setVisualUpdatesAllowedByClient(bool);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- Document(Frame*, const URL&, unsigned = DefaultDocumentClass, bool isSynthesized = false);
</del><ins>+ enum ConstructionFlags { Synthesized = 1, NonRenderedPlaceholder = 1 << 1 };
+ Document(Frame*, const URL&, unsigned = DefaultDocumentClass, unsigned constructionFlags = 0);
</ins><span class="cx">
</span><span class="cx"> void clearXMLVersion() { m_xmlVersion = String(); }
</span><span class="cx">
</span><span class="lines">@@ -1235,11 +1240,11 @@
</span><span class="cx"> RenderObject* renderer() const WTF_DELETED_FUNCTION;
</span><span class="cx"> void setRenderer(RenderObject*) WTF_DELETED_FUNCTION;
</span><span class="cx">
</span><del>- virtual void createRenderTree();
</del><ins>+ void createRenderTree();
+ void detachParser();
+
</ins><span class="cx"> virtual void dropChildren() OVERRIDE;
</span><span class="cx">
</span><del>- void detachParser();
-
</del><span class="cx"> typedef void (*ArgumentsCallback)(const String& keyString, const String& valueString, Document*, void* data);
</span><span class="cx"> void processArguments(const String& features, void* data, ArgumentsCallback);
</span><span class="cx">
</span><span class="lines">@@ -1497,6 +1502,7 @@
</span><span class="cx"> DocumentClassFlags m_documentClasses;
</span><span class="cx">
</span><span class="cx"> bool m_isSynthesized;
</span><ins>+ bool m_isNonRenderedPlaceholder;
</ins><span class="cx">
</span><span class="cx"> bool m_isViewSource;
</span><span class="cx"> bool m_sawElementsInKnownNamespaces;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDocument.cpp (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDocument.cpp 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/html/HTMLDocument.cpp 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -81,8 +81,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-HTMLDocument::HTMLDocument(Frame* frame, const URL& url, DocumentClassFlags documentClasses, bool isSynthesized)
- : Document(frame, url, documentClasses | HTMLDocumentClass, isSynthesized)
</del><ins>+HTMLDocument::HTMLDocument(Frame* frame, const URL& url, DocumentClassFlags documentClasses, unsigned constructionFlags)
+ : Document(frame, url, documentClasses | HTMLDocumentClass, constructionFlags)
</ins><span class="cx"> {
</span><span class="cx"> clearXMLVersion();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDocument.h (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDocument.h 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/html/HTMLDocument.h 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -33,12 +33,12 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<HTMLDocument> create(Frame* frame, const URL& url)
</span><span class="cx"> {
</span><del>- return adoptRef(new HTMLDocument(frame, url));
</del><ins>+ return adoptRef(new HTMLDocument(frame, url, HTMLDocumentClass));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<HTMLDocument> createSynthesizedDocument(Frame* frame, const URL& url)
</span><span class="cx"> {
</span><del>- return adoptRef(new HTMLDocument(frame, url, true));
</del><ins>+ return adoptRef(new HTMLDocument(frame, url, HTMLDocumentClass, Synthesized));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~HTMLDocument();
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> static bool isCaseSensitiveAttribute(const QualifiedName&);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- HTMLDocument(Frame*, const URL&, DocumentClassFlags = 0, bool isSynthesized = false);
</del><ins>+ HTMLDocument(Frame*, const URL&, DocumentClassFlags = 0, unsigned constructionFlags = 0);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual PassRefPtr<Element> createElement(const AtomicString& tagName, ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentWritercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentWriter.cpp (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentWriter.cpp 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/loader/DocumentWriter.cpp 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameLoaderStateMachine.h"
</span><span class="cx"> #include "FrameView.h"
</span><del>-#include "PlaceholderDocument.h"
</del><span class="cx"> #include "PluginDocument.h"
</span><span class="cx"> #include "RawDataDocumentParser.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="lines">@@ -116,7 +115,7 @@
</span><span class="cx"> return PDFDocument::create(m_frame, url);
</span><span class="cx"> #endif
</span><span class="cx"> if (!m_frame->loader().client().hasHTMLView())
</span><del>- return PlaceholderDocument::create(m_frame, url);
</del><ins>+ return Document::createNonRenderedPlaceholder(m_frame, url);
</ins><span class="cx"> return DOMImplementation::createDocument(m_mimeType, m_frame, url, m_frame->inViewSourceMode());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPlaceholderDocumentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/loader/PlaceholderDocument.cpp (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PlaceholderDocument.cpp 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/loader/PlaceholderDocument.cpp 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "PlaceholderDocument.h"
-
-#include "ElementIterator.h"
-
-namespace WebCore {
-
-void PlaceholderDocument::createRenderTree()
-{
- ASSERT(!renderView());
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreloaderPlaceholderDocumenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/loader/PlaceholderDocument.h (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PlaceholderDocument.h 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/loader/PlaceholderDocument.h 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PlaceholderDocument_h
-#define PlaceholderDocument_h
-
-#include "Document.h"
-
-namespace WebCore {
-
-class PlaceholderDocument : public Document {
-public:
- static PassRefPtr<PlaceholderDocument> create(Frame* frame, const URL& url)
- {
- return adoptRef(new PlaceholderDocument(frame, url));
- }
-
-protected:
- PlaceholderDocument(Frame* frame, const URL& url)
- : Document(frame, url)
- {
- }
-
-private:
- virtual void createRenderTree() OVERRIDE;
-};
-
-} // namespace WebCore
-
-#endif // PlaceholderDocument_h
</del></span></pre></div>
<a id="trunkSourceWebCorepdfiosPDFDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/pdf/ios/PDFDocument.h (161206 => 161207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/pdf/ios/PDFDocument.h 2014-01-02 11:43:33 UTC (rev 161206)
+++ trunk/Source/WebCore/pdf/ios/PDFDocument.h 2014-01-02 15:50:28 UTC (rev 161207)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><del>-#include "PlaceholderDocument.h"
</del><ins>+#include "Document.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class PDFDocument : public PlaceholderDocument {
</del><ins>+class PDFDocument : public Document {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<PDFDocument> create(Frame* frame, const URL& url)
</span><span class="cx"> {
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> }
</span><span class="cx"> private:
</span><span class="cx"> PDFDocument(Frame* frame, const URL& url)
</span><del>- : PlaceholderDocument(frame, url)
</del><ins>+ : Document(frame, url, DefaultDocumentClass, NonRenderedPlaceholder)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>