<!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>[164420] 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/164420">164420</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-02-20 01:46:47 -0800 (Thu, 20 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move to using std::unique_ptr for Document and related classes
https://bugs.webkit.org/show_bug.cgi?id=129063
Reviewed by Anders Carlsson.
Replace uses of OwnPtr and PassOwnPtr in the Document and related classes with std::unique_ptr.
* dom/DOMImplementation.h:
* dom/Document.cpp:
(WebCore::Document::Document):
(WebCore::Document::removedLastRef):
(WebCore::Document::selectorQueryCache):
(WebCore::Document::implementation):
(WebCore::Document::formController):
(WebCore::Document::createStyleResolver):
(WebCore::Document::clearStyleResolver):
(WebCore::Document::clearAXObjectCache):
(WebCore::Document::axObjectCache):
(WebCore::Document::setParsing):
(WebCore::Document::styleResolverChanged):
(WebCore::Document::setTransformSource):
(WebCore::Document::accessSVGExtensions):
(WebCore::Document::sharedObjectPoolClearTimerFired):
(WebCore::Document::didAddTouchEventHandler):
* dom/Document.h:
* dom/DocumentEventQueue.cpp:
(WebCore::DocumentEventQueue::DocumentEventQueue):
* dom/DocumentEventQueue.h:
* dom/DocumentMarkerController.cpp:
(WebCore::DocumentMarkerController::addMarker):
* dom/DocumentMarkerController.h:
* dom/DocumentSharedObjectPool.cpp:
* dom/DocumentSharedObjectPool.h:
* dom/DocumentStyleSheetCollection.cpp:
(WebCore::DocumentStyleSheetCollection::updateActiveStyleSheets):
(WebCore::DocumentStyleSheetCollection::activeStyleSheetsContains):
* dom/DocumentStyleSheetCollection.h:
* dom/DocumentType.h:
* html/FormController.h:
* rendering/TextAutosizer.h:
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::XMLDocumentParser::doEnd):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDOMImplementationh">trunk/Source/WebCore/dom/DOMImplementation.h</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="#trunkSourceWebCoredomDocumentEventQueuecpp">trunk/Source/WebCore/dom/DocumentEventQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentEventQueueh">trunk/Source/WebCore/dom/DocumentEventQueue.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentMarkerControllercpp">trunk/Source/WebCore/dom/DocumentMarkerController.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentMarkerControllerh">trunk/Source/WebCore/dom/DocumentMarkerController.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentSharedObjectPoolcpp">trunk/Source/WebCore/dom/DocumentSharedObjectPool.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentSharedObjectPoolh">trunk/Source/WebCore/dom/DocumentSharedObjectPool.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentStyleSheetCollectioncpp">trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentStyleSheetCollectionh">trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentTypeh">trunk/Source/WebCore/dom/DocumentType.h</a></li>
<li><a href="#trunkSourceWebCorehtmlFormControllerh">trunk/Source/WebCore/html/FormController.h</a></li>
<li><a href="#trunkSourceWebCorerenderingTextAutosizerh">trunk/Source/WebCore/rendering/TextAutosizer.h</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp">trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/ChangeLog 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-02-20 Zan Dobersek <zdobersek@igalia.com>
+
+ Move to using std::unique_ptr for Document and related classes
+ https://bugs.webkit.org/show_bug.cgi?id=129063
+
+ Reviewed by Anders Carlsson.
+
+ Replace uses of OwnPtr and PassOwnPtr in the Document and related classes with std::unique_ptr.
+
+ * dom/DOMImplementation.h:
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ (WebCore::Document::removedLastRef):
+ (WebCore::Document::selectorQueryCache):
+ (WebCore::Document::implementation):
+ (WebCore::Document::formController):
+ (WebCore::Document::createStyleResolver):
+ (WebCore::Document::clearStyleResolver):
+ (WebCore::Document::clearAXObjectCache):
+ (WebCore::Document::axObjectCache):
+ (WebCore::Document::setParsing):
+ (WebCore::Document::styleResolverChanged):
+ (WebCore::Document::setTransformSource):
+ (WebCore::Document::accessSVGExtensions):
+ (WebCore::Document::sharedObjectPoolClearTimerFired):
+ (WebCore::Document::didAddTouchEventHandler):
+ * dom/Document.h:
+ * dom/DocumentEventQueue.cpp:
+ (WebCore::DocumentEventQueue::DocumentEventQueue):
+ * dom/DocumentEventQueue.h:
+ * dom/DocumentMarkerController.cpp:
+ (WebCore::DocumentMarkerController::addMarker):
+ * dom/DocumentMarkerController.h:
+ * dom/DocumentSharedObjectPool.cpp:
+ * dom/DocumentSharedObjectPool.h:
+ * dom/DocumentStyleSheetCollection.cpp:
+ (WebCore::DocumentStyleSheetCollection::updateActiveStyleSheets):
+ (WebCore::DocumentStyleSheetCollection::activeStyleSheetsContains):
+ * dom/DocumentStyleSheetCollection.h:
+ * dom/DocumentType.h:
+ * html/FormController.h:
+ * rendering/TextAutosizer.h:
+ * xml/parser/XMLDocumentParserLibxml2.cpp:
+ (WebCore::XMLDocumentParser::doEnd):
+
</ins><span class="cx"> 2014-02-20 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Add helper method for region clipping flow content
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMImplementationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMImplementation.h (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMImplementation.h 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/DOMImplementation.h 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "MediaPlayer.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -44,7 +45,8 @@
</span><span class="cx"> class DOMImplementation : public ScriptWrappable {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<DOMImplementation> create(Document& document) { return adoptPtr(new DOMImplementation(document)); }
</del><ins>+ explicit DOMImplementation(Document&);
+
</ins><span class="cx">
</span><span class="cx"> void ref() { m_document.ref(); }
</span><span class="cx"> void deref() { m_document.deref(); }
</span><span class="lines">@@ -70,8 +72,6 @@
</span><span class="cx"> static bool isTextMIMEType(const String& MIMEType);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit DOMImplementation(Document&);
-
</del><span class="cx"> Document& m_document;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx"> , m_updateFocusAppearanceRestoresSelection(false)
</span><span class="cx"> , m_ignoreDestructiveWriteCount(0)
</span><span class="cx"> , m_titleSetExplicitly(false)
</span><del>- , m_markers(adoptPtr(new DocumentMarkerController))
</del><ins>+ , m_markers(std::make_unique<DocumentMarkerController>())
</ins><span class="cx"> , m_updateFocusAppearanceTimer(this, &Document::updateFocusAppearanceTimerFired)
</span><span class="cx"> , m_resetHiddenFocusElementTimer(this, &Document::resetHiddenFocusElementTimer)
</span><span class="cx"> , m_cssTarget(nullptr)
</span><span class="lines">@@ -520,7 +520,7 @@
</span><span class="cx"> m_cachedResourceLoader->setDocument(this);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><del>- m_textAutosizer = TextAutosizer::create(this);
</del><ins>+ m_textAutosizer = std::make_unique<TextAutosizer>(this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> resetLinkColor();
</span><span class="lines">@@ -665,7 +665,7 @@
</span><span class="cx">
</span><span class="cx"> destroyTreeScopeData();
</span><span class="cx"> removeDetachedChildren();
</span><del>- m_formController.clear();
</del><ins>+ m_formController = nullptr;
</ins><span class="cx">
</span><span class="cx"> m_markers->detach();
</span><span class="cx">
</span><span class="lines">@@ -745,7 +745,7 @@
</span><span class="cx"> SelectorQueryCache& Document::selectorQueryCache()
</span><span class="cx"> {
</span><span class="cx"> if (!m_selectorQueryCache)
</span><del>- m_selectorQueryCache = adoptPtr(new SelectorQueryCache());
</del><ins>+ m_selectorQueryCache = std::make_unique<SelectorQueryCache>();
</ins><span class="cx"> return *m_selectorQueryCache;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -796,7 +796,7 @@
</span><span class="cx"> DOMImplementation* Document::implementation()
</span><span class="cx"> {
</span><span class="cx"> if (!m_implementation)
</span><del>- m_implementation = DOMImplementation::create(*this);
</del><ins>+ m_implementation = std::make_unique<DOMImplementation>(*this);
</ins><span class="cx"> return m_implementation.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1602,7 +1602,7 @@
</span><span class="cx"> FormController& Document::formController()
</span><span class="cx"> {
</span><span class="cx"> if (!m_formController)
</span><del>- m_formController = FormController::create();
</del><ins>+ m_formController = std::make_unique<FormController>();
</ins><span class="cx"> return *m_formController;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1922,13 +1922,13 @@
</span><span class="cx"> bool matchAuthorAndUserStyles = true;
</span><span class="cx"> if (Settings* settings = this->settings())
</span><span class="cx"> matchAuthorAndUserStyles = settings->authorAndUserStylesEnabled();
</span><del>- m_styleResolver = adoptPtr(new StyleResolver(*this, matchAuthorAndUserStyles));
</del><ins>+ m_styleResolver = std::make_unique<StyleResolver>(*this, matchAuthorAndUserStyles);
</ins><span class="cx"> m_styleSheetCollection.combineCSSFeatureFlags();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::clearStyleResolver()
</span><span class="cx"> {
</span><del>- m_styleResolver.clear();
</del><ins>+ m_styleResolver = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::createRenderTree()
</span><span class="lines">@@ -2156,7 +2156,7 @@
</span><span class="cx"> ASSERT(&topDocument() == this);
</span><span class="cx"> // Clear the cache member variable before calling delete because attempts
</span><span class="cx"> // are made to access it during destruction.
</span><del>- m_axObjectCache.clear();
</del><ins>+ m_axObjectCache = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AXObjectCache* Document::existingAXObjectCache() const
</span><span class="lines">@@ -2184,7 +2184,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(&topDocument == this || !m_axObjectCache);
</span><span class="cx"> if (!topDocument.m_axObjectCache)
</span><del>- topDocument.m_axObjectCache = adoptPtr(new AXObjectCache(topDocument));
</del><ins>+ topDocument.m_axObjectCache = std::make_unique<AXObjectCache>(topDocument);
</ins><span class="cx"> return topDocument.m_axObjectCache.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2465,7 +2465,7 @@
</span><span class="cx"> m_bParsing = b;
</span><span class="cx">
</span><span class="cx"> if (m_bParsing && !m_sharedObjectPool)
</span><del>- m_sharedObjectPool = DocumentSharedObjectPool::create();
</del><ins>+ m_sharedObjectPool = std::make_unique<DocumentSharedObjectPool>();
</ins><span class="cx">
</span><span class="cx"> if (!m_bParsing && view())
</span><span class="cx"> view()->scheduleRelayout();
</span><span class="lines">@@ -3179,7 +3179,7 @@
</span><span class="cx"> // Don't bother updating, since we haven't loaded all our style info yet
</span><span class="cx"> // and haven't calculated the style selector for the first time.
</span><span class="cx"> if (!hasLivingRenderTree() || (!m_didCalculateStyleResolver && !haveStylesheetsLoaded())) {
</span><del>- m_styleResolver.clear();
</del><ins>+ m_styleResolver = nullptr;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_didCalculateStyleResolver = true;
</span><span class="lines">@@ -4228,9 +4228,9 @@
</span><span class="cx"> InspectorInstrumentation::frameDocumentUpdated(ownerFrame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::setTransformSource(PassOwnPtr<TransformSource> source)
</del><ins>+void Document::setTransformSource(std::unique_ptr<TransformSource> source)
</ins><span class="cx"> {
</span><del>- m_transformSource = source;
</del><ins>+ m_transformSource = std::move(source);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -4304,7 +4304,7 @@
</span><span class="cx"> SVGDocumentExtensions* Document::accessSVGExtensions()
</span><span class="cx"> {
</span><span class="cx"> if (!m_svgExtensions)
</span><del>- m_svgExtensions = adoptPtr(new SVGDocumentExtensions(this));
</del><ins>+ m_svgExtensions = std::make_unique<SVGDocumentExtensions>(this);
</ins><span class="cx"> return m_svgExtensions.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4420,7 +4420,7 @@
</span><span class="cx">
</span><span class="cx"> void Document::sharedObjectPoolClearTimerFired(Timer<Document>&)
</span><span class="cx"> {
</span><del>- m_sharedObjectPool.clear();
</del><ins>+ m_sharedObjectPool = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::didAccessStyleResolver()
</span><span class="lines">@@ -5608,7 +5608,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (!m_touchEventTargets.get())
</span><del>- m_touchEventTargets = adoptPtr(new TouchEventTargetSet);
</del><ins>+ m_touchEventTargets = std::make_unique<TouchEventTargetSet>();
</ins><span class="cx"> m_touchEventTargets->add(handler);
</span><span class="cx"> if (Document* parent = parentDocument()) {
</span><span class="cx"> parent->didAddTouchEventHandler(this);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/Document.h 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -950,7 +950,7 @@
</span><span class="cx"> PassRefPtr<Document> transformSourceDocument() { return m_transformSourceDocument; }
</span><span class="cx"> void setTransformSourceDocument(Document* doc) { m_transformSourceDocument = doc; }
</span><span class="cx">
</span><del>- void setTransformSource(PassOwnPtr<TransformSource>);
</del><ins>+ void setTransformSource(std::unique_ptr<TransformSource>);
</ins><span class="cx"> TransformSource* transformSource() const { return m_transformSource.get(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1345,7 +1345,7 @@
</span><span class="cx">
</span><span class="cx"> DeferrableOneShotTimer<Document> m_styleResolverThrowawayTimer;
</span><span class="cx">
</span><del>- OwnPtr<StyleResolver> m_styleResolver;
</del><ins>+ std::unique_ptr<StyleResolver> m_styleResolver;
</ins><span class="cx"> bool m_didCalculateStyleResolver;
</span><span class="cx"> bool m_hasNodesWithPlaceholderStyle;
</span><span class="cx"> bool m_needsNotifyRemoveAllPendingStylesheet;
</span><span class="lines">@@ -1386,7 +1386,7 @@
</span><span class="cx">
</span><span class="cx"> String m_baseTarget;
</span><span class="cx">
</span><del>- OwnPtr<DOMImplementation> m_implementation;
</del><ins>+ std::unique_ptr<DOMImplementation> m_implementation;
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSStyleSheet> m_elementSheet;
</span><span class="cx">
</span><span class="lines">@@ -1419,7 +1419,7 @@
</span><span class="cx"> DocumentStyleSheetCollection m_styleSheetCollection;
</span><span class="cx"> RefPtr<StyleSheetList> m_styleSheetList;
</span><span class="cx">
</span><del>- OwnPtr<FormController> m_formController;
</del><ins>+ std::unique_ptr<FormController> m_formController;
</ins><span class="cx">
</span><span class="cx"> Color m_linkColor;
</span><span class="cx"> Color m_visitedLinkColor;
</span><span class="lines">@@ -1451,8 +1451,8 @@
</span><span class="cx"> bool m_titleSetExplicitly;
</span><span class="cx"> RefPtr<Element> m_titleElement;
</span><span class="cx">
</span><del>- OwnPtr<AXObjectCache> m_axObjectCache;
- const OwnPtr<DocumentMarkerController> m_markers;
</del><ins>+ std::unique_ptr<AXObjectCache> m_axObjectCache;
+ const std::unique_ptr<DocumentMarkerController> m_markers;
</ins><span class="cx">
</span><span class="cx"> Timer<Document> m_updateFocusAppearanceTimer;
</span><span class="cx"> Timer<Document> m_resetHiddenFocusElementTimer;
</span><span class="lines">@@ -1475,7 +1475,7 @@
</span><span class="cx"> Vector<RefPtr<HTMLScriptElement>> m_currentScriptStack;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(XSLT)
</span><del>- OwnPtr<TransformSource> m_transformSource;
</del><ins>+ std::unique_ptr<TransformSource> m_transformSource;
</ins><span class="cx"> RefPtr<Document> m_transformSourceDocument;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1497,7 +1497,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<XPathEvaluator> m_xpathEvaluator;
</span><span class="cx">
</span><del>- OwnPtr<SVGDocumentExtensions> m_svgExtensions;
</del><ins>+ std::unique_ptr<SVGDocumentExtensions> m_svgExtensions;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> Vector<AnnotatedRegionValue> m_annotatedRegions;
</span><span class="lines">@@ -1527,7 +1527,7 @@
</span><span class="cx">
</span><span class="cx"> DocumentOrderedMap m_imagesByUsemap;
</span><span class="cx">
</span><del>- OwnPtr<SelectorQueryCache> m_selectorQueryCache;
</del><ins>+ std::unique_ptr<SelectorQueryCache> m_selectorQueryCache;
</ins><span class="cx">
</span><span class="cx"> DocumentClassFlags m_documentClasses;
</span><span class="cx">
</span><span class="lines">@@ -1579,7 +1579,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned m_wheelEventHandlerCount;
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>- OwnPtr<TouchEventTargetSet> m_touchEventTargets;
</del><ins>+ std::unique_ptr<TouchEventTargetSet> m_touchEventTargets;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> double m_lastHandledUserGestureTimestamp;
</span><span class="lines">@@ -1632,7 +1632,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><del>- OwnPtr<TextAutosizer> m_textAutosizer;
</del><ins>+ std::unique_ptr<TextAutosizer> m_textAutosizer;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void platformSuspendOrStopActiveDOMObjects();
</span><span class="lines">@@ -1651,7 +1651,7 @@
</span><span class="cx"> void sharedObjectPoolClearTimerFired(Timer<Document>&);
</span><span class="cx"> Timer<Document> m_sharedObjectPoolClearTimer;
</span><span class="cx">
</span><del>- OwnPtr<DocumentSharedObjectPool> m_sharedObjectPool;
</del><ins>+ std::unique_ptr<DocumentSharedObjectPool> m_sharedObjectPool;
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> bool m_didDispatchViewportPropertiesChanged;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentEventQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentEventQueue.cpp (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentEventQueue.cpp 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/DocumentEventQueue.cpp 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -38,18 +38,13 @@
</span><span class="cx">
</span><span class="cx"> class DocumentEventQueue::Timer final : public SuspendableTimer {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<Timer> create(DocumentEventQueue& eventQueue)
- {
- return adoptPtr(new Timer(eventQueue));
- }
-
-private:
</del><span class="cx"> Timer(DocumentEventQueue& eventQueue)
</span><span class="cx"> : SuspendableTimer(&eventQueue.m_document)
</span><span class="cx"> , m_eventQueue(eventQueue)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+private:
</ins><span class="cx"> virtual void fired() override
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isSuspended());
</span><span class="lines">@@ -61,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> DocumentEventQueue::DocumentEventQueue(Document& document)
</span><span class="cx"> : m_document(document)
</span><del>- , m_pendingEventTimer(Timer::create(*this))
</del><ins>+ , m_pendingEventTimer(std::make_unique<Timer>(*this))
</ins><span class="cx"> , m_isClosed(false)
</span><span class="cx"> {
</span><span class="cx"> m_pendingEventTimer->suspendIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentEventQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentEventQueue.h (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentEventQueue.h 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/DocumentEventQueue.h 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> #define DocumentEventQueue_h
</span><span class="cx">
</span><span class="cx"> #include "EventQueue.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> class Timer;
</span><span class="cx">
</span><span class="cx"> Document& m_document;
</span><del>- OwnPtr<Timer> m_pendingEventTimer;
</del><ins>+ std::unique_ptr<Timer> m_pendingEventTimer;
</ins><span class="cx"> ListHashSet<RefPtr<Event>, 16> m_queuedEvents;
</span><span class="cx"> HashSet<Node*> m_nodesWithQueuedScrollEvents;
</span><span class="cx"> bool m_isClosed;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentMarkerControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -168,10 +168,10 @@
</span><span class="cx">
</span><span class="cx"> m_possiblyExistingMarkerTypes.add(newMarker.type());
</span><span class="cx">
</span><del>- OwnPtr<MarkerList>& list = m_markers.add(node, nullptr).iterator->value;
</del><ins>+ std::unique_ptr<MarkerList>& list = m_markers.add(node, nullptr).iterator->value;
</ins><span class="cx">
</span><span class="cx"> if (!list) {
</span><del>- list = adoptPtr(new MarkerList);
</del><ins>+ list = std::make_unique<MarkerList>();
</ins><span class="cx"> list->append(RenderedDocumentMarker(newMarker));
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> } else if (newMarker.type() == DocumentMarker::DictationPhraseWithAlternatives || newMarker.type() == DocumentMarker::DictationResult) {
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentMarkerControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentMarkerController.h (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentMarkerController.h 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.h 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DocumentMarker.h"
</span><span class="cx"> #include "IntRect.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -96,7 +97,7 @@
</span><span class="cx"> void addMarker(Node*, const DocumentMarker&);
</span><span class="cx">
</span><span class="cx"> typedef Vector<RenderedDocumentMarker> MarkerList;
</span><del>- typedef HashMap<RefPtr<Node>, OwnPtr<MarkerList>> MarkerMap;
</del><ins>+ typedef HashMap<RefPtr<Node>, std::unique_ptr<MarkerList>> MarkerMap;
</ins><span class="cx"> bool possiblyHasMarkers(DocumentMarker::MarkerTypes);
</span><span class="cx"> void removeMarkersFromList(MarkerMap::iterator, DocumentMarker::MarkerTypes);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentSharedObjectPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentSharedObjectPool.cpp (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentSharedObjectPool.cpp 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/DocumentSharedObjectPool.cpp 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -59,12 +59,4 @@
</span><span class="cx"> return *cachedData;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DocumentSharedObjectPool::DocumentSharedObjectPool()
-{
</del><span class="cx"> }
</span><del>-
-DocumentSharedObjectPool::~DocumentSharedObjectPool()
-{
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoredomDocumentSharedObjectPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentSharedObjectPool.h (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentSharedObjectPool.h 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/DocumentSharedObjectPool.h 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #ifndef DocumentSharedObjectPool_h
</span><span class="cx"> #define DocumentSharedObjectPool_h
</span><span class="cx">
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="lines">@@ -39,14 +39,9 @@
</span><span class="cx">
</span><span class="cx"> class DocumentSharedObjectPool {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<DocumentSharedObjectPool> create() { return adoptPtr(new DocumentSharedObjectPool); }
- ~DocumentSharedObjectPool();
-
</del><span class="cx"> PassRef<ShareableElementData> cachedShareableElementDataWithAttributes(const Vector<Attribute>&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- DocumentSharedObjectPool();
-
</del><span class="cx"> typedef HashMap<unsigned, RefPtr<ShareableElementData>, AlreadyHashed> ShareableElementDataCache;
</span><span class="cx"> ShareableElementDataCache m_shareableElementDataCache;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStyleSheetCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> resetCSSFeatureFlags();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_weakCopyOfActiveStyleSheetListForFastLookup.clear();
</del><ins>+ m_weakCopyOfActiveStyleSheetListForFastLookup = nullptr;
</ins><span class="cx"> m_activeAuthorStyleSheets.swap(activeCSSStyleSheets);
</span><span class="cx"> m_styleSheetsForStyleSheetList.swap(activeStyleSheets);
</span><span class="cx">
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx"> bool DocumentStyleSheetCollection::activeStyleSheetsContains(const CSSStyleSheet* sheet) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_weakCopyOfActiveStyleSheetListForFastLookup) {
</span><del>- m_weakCopyOfActiveStyleSheetListForFastLookup = adoptPtr(new HashSet<const CSSStyleSheet*>);
</del><ins>+ m_weakCopyOfActiveStyleSheetListForFastLookup = std::make_unique<HashSet<const CSSStyleSheet*>>();
</ins><span class="cx"> for (unsigned i = 0; i < m_activeAuthorStyleSheets.size(); ++i)
</span><span class="cx"> m_weakCopyOfActiveStyleSheetListForFastLookup->add(m_activeAuthorStyleSheets[i].get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStyleSheetCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/DocumentStyleSheetCollection.h 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #ifndef DocumentStyleSheetCollection_h
</span><span class="cx"> #define DocumentStyleSheetCollection_h
</span><span class="cx">
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -132,7 +133,7 @@
</span><span class="cx"> Vector<RefPtr<CSSStyleSheet>> m_activeAuthorStyleSheets;
</span><span class="cx">
</span><span class="cx"> // This is a mirror of m_activeAuthorStyleSheets that gets populated on demand for activeStyleSheetsContains().
</span><del>- mutable OwnPtr<HashSet<const CSSStyleSheet*>> m_weakCopyOfActiveStyleSheetListForFastLookup;
</del><ins>+ mutable std::unique_ptr<HashSet<const CSSStyleSheet*>> m_weakCopyOfActiveStyleSheetListForFastLookup;
</ins><span class="cx">
</span><span class="cx"> // Track the number of currently loading top-level stylesheets needed for rendering.
</span><span class="cx"> // Sheets loaded using the @import directive are not included in this count.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentType.h (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentType.h 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/dom/DocumentType.h 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -37,9 +37,9 @@
</span><span class="cx"> return adoptRef(new DocumentType(document, name, publicId, systemId));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: We never fill m_entities and m_notations. Current implementation of NamedNodeMap doesn't work without an associated Element yet.
- NamedNodeMap* entities() const { return m_entities.get(); }
- NamedNodeMap* notations() const { return m_notations.get(); }
</del><ins>+ // FIXME: We return null entities and notations. Current implementation of NamedNodeMap doesn't work without an associated Element yet.
+ NamedNodeMap* entities() const { return nullptr; }
+ NamedNodeMap* notations() const { return nullptr; }
</ins><span class="cx">
</span><span class="cx"> const String& name() const { return m_name; }
</span><span class="cx"> const String& publicId() const { return m_publicId; }
</span><span class="lines">@@ -54,9 +54,6 @@
</span><span class="cx"> virtual NodeType nodeType() const override;
</span><span class="cx"> virtual PassRefPtr<Node> cloneNode(bool deep) override;
</span><span class="cx">
</span><del>- OwnPtr<NamedNodeMap> m_entities;
- OwnPtr<NamedNodeMap> m_notations;
-
</del><span class="cx"> String m_name;
</span><span class="cx"> String m_publicId;
</span><span class="cx"> String m_systemId;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlFormControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/FormController.h (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/FormController.h 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/html/FormController.h 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -74,10 +74,7 @@
</span><span class="cx"> class FormController {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static OwnPtr<FormController> create()
- {
- return adoptPtr(new FormController);
- }
</del><ins>+ FormController();
</ins><span class="cx"> ~FormController();
</span><span class="cx">
</span><span class="cx"> CheckedRadioButtons& checkedRadioButtons() { return m_checkedRadioButtons; }
</span><span class="lines">@@ -101,7 +98,6 @@
</span><span class="cx"> typedef ListHashSet<RefPtr<HTMLFormControlElementWithState>, 64> FormElementListHashSet;
</span><span class="cx"> typedef HashMap<RefPtr<AtomicStringImpl>, OwnPtr<SavedFormState>> SavedFormStateMap;
</span><span class="cx">
</span><del>- FormController();
</del><span class="cx"> static OwnPtr<SavedFormStateMap> createSavedFormStateMap(const FormElementListHashSet&);
</span><span class="cx"> FormControlState takeStateForFormElement(const HTMLFormControlElementWithState&);
</span><span class="cx"> static void formStatesFromStateVector(const Vector<String>&, SavedFormStateMap&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextAutosizerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextAutosizer.h (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextAutosizer.h 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/rendering/TextAutosizer.h 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -46,8 +46,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(TextAutosizer);
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<TextAutosizer> create(Document* document) { return adoptPtr(new TextAutosizer(document)); }
-
</del><ins>+ explicit TextAutosizer(Document*);
</ins><span class="cx"> virtual ~TextAutosizer();
</span><span class="cx">
</span><span class="cx"> bool processSubtree(RenderObject* layoutRoot);
</span><span class="lines">@@ -61,8 +60,6 @@
</span><span class="cx"> LastToFirst
</span><span class="cx"> };
</span><span class="cx">
</span><del>- explicit TextAutosizer(Document*);
-
</del><span class="cx"> float clusterMultiplier(WritingMode, const TextAutosizingWindowInfo&, float textWidth) const;
</span><span class="cx">
</span><span class="cx"> void processClusterInternal(TextAutosizingClusterInfo&, RenderBlock* container, RenderObject* subtreeRoot, const TextAutosizingWindowInfo&, float multiplier);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (164419 => 164420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2014-02-20 09:10:50 UTC (rev 164419)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2014-02-20 09:46:47 UTC (rev 164420)
</span><span class="lines">@@ -1374,7 +1374,7 @@
</span><span class="cx"> xmlTreeViewer.transformDocumentToTreeView();
</span><span class="cx"> } else if (m_sawXSLTransform) {
</span><span class="cx"> void* doc = xmlDocPtrForString(document()->cachedResourceLoader(), m_originalSourceForTransform.toString(), document()->url().string());
</span><del>- document()->setTransformSource(adoptPtr(new TransformSource(doc)));
</del><ins>+ document()->setTransformSource(std::make_unique<TransformSource>(doc));
</ins><span class="cx">
</span><span class="cx"> document()->setParsing(false); // Make the document think it's done, so it will apply XSL stylesheets.
</span><span class="cx"> document()->styleResolverChanged(RecalcStyleImmediately);
</span></span></pre>
</div>
</div>
</body>
</html>