Title: [173884] trunk/Source/WebCore
- Revision
- 173884
- Author
- cdu...@apple.com
- Date
- 2014-09-23 12:30:18 -0700 (Tue, 23 Sep 2014)
Log Message
Have Document::ensureTemplateDocument() return a reference
https://bugs.webkit.org/show_bug.cgi?id=137033
Reviewed by Ryosuke Niwa.
Have Document::ensureTemplateDocument() return a reference instead of
a pointer as it can never return null.
No new tests, no behavior change.
* dom/Document.cpp:
(WebCore::Document::ensureTemplateDocument):
* dom/Document.h:
* editing/markup.cpp:
(WebCore::createFragmentForInnerOuterHTML):
* html/HTMLTemplateElement.cpp:
(WebCore::HTMLTemplateElement::content):
(WebCore::HTMLTemplateElement::didMoveToNewDocument):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (173883 => 173884)
--- trunk/Source/WebCore/ChangeLog 2014-09-23 18:44:41 UTC (rev 173883)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 19:30:18 UTC (rev 173884)
@@ -1,5 +1,26 @@
2014-09-23 Chris Dumez <cdu...@apple.com>
+ Have Document::ensureTemplateDocument() return a reference
+ https://bugs.webkit.org/show_bug.cgi?id=137033
+
+ Reviewed by Ryosuke Niwa.
+
+ Have Document::ensureTemplateDocument() return a reference instead of
+ a pointer as it can never return null.
+
+ No new tests, no behavior change.
+
+ * dom/Document.cpp:
+ (WebCore::Document::ensureTemplateDocument):
+ * dom/Document.h:
+ * editing/markup.cpp:
+ (WebCore::createFragmentForInnerOuterHTML):
+ * html/HTMLTemplateElement.cpp:
+ (WebCore::HTMLTemplateElement::content):
+ (WebCore::HTMLTemplateElement::didMoveToNewDocument):
+
+2014-09-23 Chris Dumez <cdu...@apple.com>
+
Have Document::accessSVGExtensions() return a reference
https://bugs.webkit.org/show_bug.cgi?id=137030
Modified: trunk/Source/WebCore/dom/Document.cpp (173883 => 173884)
--- trunk/Source/WebCore/dom/Document.cpp 2014-09-23 18:44:41 UTC (rev 173883)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-09-23 19:30:18 UTC (rev 173884)
@@ -6126,10 +6126,10 @@
}
#if ENABLE(TEMPLATE_ELEMENT)
-Document* Document::ensureTemplateDocument()
+Document& Document::ensureTemplateDocument()
{
if (const Document* document = templateDocument())
- return const_cast<Document*>(document);
+ return const_cast<Document&>(*document);
if (isHTMLDocument())
m_templateDocument = HTMLDocument::create(nullptr, blankURL());
@@ -6138,7 +6138,7 @@
m_templateDocument->setTemplateDocumentHost(this); // balanced in dtor.
- return m_templateDocument.get();
+ return *m_templateDocument;
}
#endif
Modified: trunk/Source/WebCore/dom/Document.h (173883 => 173884)
--- trunk/Source/WebCore/dom/Document.h 2014-09-23 18:44:41 UTC (rev 173883)
+++ trunk/Source/WebCore/dom/Document.h 2014-09-23 19:30:18 UTC (rev 173884)
@@ -1257,7 +1257,7 @@
#if ENABLE(TEMPLATE_ELEMENT)
const Document* templateDocument() const;
- Document* ensureTemplateDocument();
+ Document& ensureTemplateDocument();
void setTemplateDocumentHost(Document* templateDocumentHost) { m_templateDocumentHost = templateDocumentHost; }
Document* templateDocumentHost() { return m_templateDocumentHost; }
#endif
Modified: trunk/Source/WebCore/editing/markup.cpp (173883 => 173884)
--- trunk/Source/WebCore/editing/markup.cpp 2014-09-23 18:44:41 UTC (rev 173883)
+++ trunk/Source/WebCore/editing/markup.cpp 2014-09-23 19:30:18 UTC (rev 173884)
@@ -884,7 +884,7 @@
Document* document = &contextElement->document();
#if ENABLE(TEMPLATE_ELEMENT)
if (contextElement->hasTagName(templateTag))
- document = document->ensureTemplateDocument();
+ document = &document->ensureTemplateDocument();
#endif
RefPtr<DocumentFragment> fragment = DocumentFragment::create(*document);
Modified: trunk/Source/WebCore/html/HTMLTemplateElement.cpp (173883 => 173884)
--- trunk/Source/WebCore/html/HTMLTemplateElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
+++ trunk/Source/WebCore/html/HTMLTemplateElement.cpp 2014-09-23 19:30:18 UTC (rev 173884)
@@ -63,7 +63,7 @@
DocumentFragment* HTMLTemplateElement::content() const
{
if (!m_content)
- m_content = TemplateContentDocumentFragment::create(*document().ensureTemplateDocument(), this);
+ m_content = TemplateContentDocumentFragment::create(document().ensureTemplateDocument(), this);
return m_content.get();
}
@@ -84,7 +84,7 @@
HTMLElement::didMoveToNewDocument(oldDocument);
if (!m_content)
return;
- document().ensureTemplateDocument()->adoptIfNeeded(m_content.get());
+ document().ensureTemplateDocument().adoptIfNeeded(m_content.get());
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
