Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2947)

Unified Diff: third_party/WebKit/Source/core/xml/DocumentXPathEvaluator.cpp

Issue 2617103002: Use a new Supplement constructor for Supplement<Document> (Part 1) (Closed)
Patch Set: temp Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/xml/DocumentXPathEvaluator.cpp
diff --git a/third_party/WebKit/Source/core/xml/DocumentXPathEvaluator.cpp b/third_party/WebKit/Source/core/xml/DocumentXPathEvaluator.cpp
index 25eef74f5e7d3de77ddb5f521835d1607fc09c18..799a723e60434e595330b8ba6da35fbd5ded24b5 100644
--- a/third_party/WebKit/Source/core/xml/DocumentXPathEvaluator.cpp
+++ b/third_party/WebKit/Source/core/xml/DocumentXPathEvaluator.cpp
@@ -31,21 +31,21 @@
namespace blink {
-DocumentXPathEvaluator::DocumentXPathEvaluator() {}
+DocumentXPathEvaluator::DocumentXPathEvaluator(Document& document)
+ : Supplement<Document>(document) {}
-DocumentXPathEvaluator& DocumentXPathEvaluator::from(
- Supplementable<Document>& document) {
+DocumentXPathEvaluator& DocumentXPathEvaluator::from(Document& document) {
DocumentXPathEvaluator* cache = static_cast<DocumentXPathEvaluator*>(
Supplement<Document>::from(document, supplementName()));
if (!cache) {
- cache = new DocumentXPathEvaluator;
+ cache = new DocumentXPathEvaluator(document);
Supplement<Document>::provideTo(document, supplementName(), cache);
}
return *cache;
}
XPathExpression* DocumentXPathEvaluator::createExpression(
- Supplementable<Document>& document,
+ Document& document,
const String& expression,
XPathNSResolver* resolver,
ExceptionState& exceptionState) {
@@ -56,23 +56,21 @@ XPathExpression* DocumentXPathEvaluator::createExpression(
exceptionState);
}
-XPathNSResolver* DocumentXPathEvaluator::createNSResolver(
- Supplementable<Document>& document,
- Node* nodeResolver) {
+XPathNSResolver* DocumentXPathEvaluator::createNSResolver(Document& document,
+ Node* nodeResolver) {
DocumentXPathEvaluator& suplement = from(document);
if (!suplement.m_xpathEvaluator)
suplement.m_xpathEvaluator = XPathEvaluator::create();
return suplement.m_xpathEvaluator->createNSResolver(nodeResolver);
}
-XPathResult* DocumentXPathEvaluator::evaluate(
- Supplementable<Document>& document,
- const String& expression,
- Node* contextNode,
- XPathNSResolver* resolver,
- unsigned short type,
- const ScriptValue&,
- ExceptionState& exceptionState) {
+XPathResult* DocumentXPathEvaluator::evaluate(Document& document,
+ const String& expression,
+ Node* contextNode,
+ XPathNSResolver* resolver,
+ unsigned short type,
+ const ScriptValue&,
+ ExceptionState& exceptionState) {
DocumentXPathEvaluator& suplement = from(document);
if (!suplement.m_xpathEvaluator)
suplement.m_xpathEvaluator = XPathEvaluator::create();

Powered by Google App Engine
This is Rietveld 408576698