| 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 e5a699a8e2584117318072d5729a03a1757f1ee9..b2bec9d7be47723daf33d175ad7cd8502d505185 100644
|
| --- a/third_party/WebKit/Source/core/xml/DocumentXPathEvaluator.cpp
|
| +++ b/third_party/WebKit/Source/core/xml/DocumentXPathEvaluator.cpp
|
| @@ -35,17 +35,17 @@ DocumentXPathEvaluator::DocumentXPathEvaluator()
|
| {
|
| }
|
|
|
| -DocumentXPathEvaluator& DocumentXPathEvaluator::from(WillBeHeapSupplementable<Document>& document)
|
| +DocumentXPathEvaluator& DocumentXPathEvaluator::from(HeapSupplementable<Document>& document)
|
| {
|
| - DocumentXPathEvaluator* cache = static_cast<DocumentXPathEvaluator*>(WillBeHeapSupplement<Document>::from(document, supplementName()));
|
| + DocumentXPathEvaluator* cache = static_cast<DocumentXPathEvaluator*>(HeapSupplement<Document>::from(document, supplementName()));
|
| if (!cache) {
|
| cache = new DocumentXPathEvaluator();
|
| - WillBeHeapSupplement<Document>::provideTo(document, supplementName(), adoptPtrWillBeNoop(cache));
|
| + HeapSupplement<Document>::provideTo(document, supplementName(), adoptPtrWillBeNoop(cache));
|
| }
|
| return *cache;
|
| }
|
|
|
| -XPathExpression* DocumentXPathEvaluator::createExpression(WillBeHeapSupplementable<Document>& document, const String& expression, XPathNSResolver* resolver, ExceptionState& exceptionState)
|
| +XPathExpression* DocumentXPathEvaluator::createExpression(HeapSupplementable<Document>& document, const String& expression, XPathNSResolver* resolver, ExceptionState& exceptionState)
|
| {
|
| DocumentXPathEvaluator& suplement = from(document);
|
| if (!suplement.m_xpathEvaluator)
|
| @@ -53,7 +53,7 @@ XPathExpression* DocumentXPathEvaluator::createExpression(WillBeHeapSupplementab
|
| return suplement.m_xpathEvaluator->createExpression(expression, resolver, exceptionState);
|
| }
|
|
|
| -XPathNSResolver* DocumentXPathEvaluator::createNSResolver(WillBeHeapSupplementable<Document>& document, Node* nodeResolver)
|
| +XPathNSResolver* DocumentXPathEvaluator::createNSResolver(HeapSupplementable<Document>& document, Node* nodeResolver)
|
| {
|
| DocumentXPathEvaluator& suplement = from(document);
|
| if (!suplement.m_xpathEvaluator)
|
| @@ -61,7 +61,7 @@ XPathNSResolver* DocumentXPathEvaluator::createNSResolver(WillBeHeapSupplementab
|
| return suplement.m_xpathEvaluator->createNSResolver(nodeResolver);
|
| }
|
|
|
| -XPathResult* DocumentXPathEvaluator::evaluate(WillBeHeapSupplementable<Document>& document, const String& expression,
|
| +XPathResult* DocumentXPathEvaluator::evaluate(HeapSupplementable<Document>& document, const String& expression,
|
| Node* contextNode, XPathNSResolver* resolver, unsigned short type,
|
| const ScriptValue&, ExceptionState& exceptionState)
|
| {
|
| @@ -74,7 +74,7 @@ XPathResult* DocumentXPathEvaluator::evaluate(WillBeHeapSupplementable<Document>
|
| DEFINE_TRACE(DocumentXPathEvaluator)
|
| {
|
| visitor->trace(m_xpathEvaluator);
|
| - WillBeHeapSupplement<Document>::trace(visitor);
|
| + HeapSupplement<Document>::trace(visitor);
|
| }
|
|
|
| } // namespace blink
|
|
|