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

Unified Diff: Source/bindings/dart/DartDOMWrapper.h

Issue 24294002: Dartium changes for custom element lifecycle events. (Closed) Base URL: svn://svn.chromium.org/multivm/trunk/webkit
Patch Set: Created 7 years, 3 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: Source/bindings/dart/DartDOMWrapper.h
diff --git a/Source/bindings/dart/DartDOMWrapper.h b/Source/bindings/dart/DartDOMWrapper.h
index a4f8343554d4062cd7822319868e19e66de9cd4e..8cc93126124a1d7a0940a1ff01b534d81c308c5b 100644
--- a/Source/bindings/dart/DartDOMWrapper.h
+++ b/Source/bindings/dart/DartDOMWrapper.h
@@ -46,6 +46,10 @@
namespace WebCore {
+template<typename HTMLElement>
+class DartCustomElementWrapper;
+class HTMLElement;
+
template<class BindingsClass>
struct DartDOMWrapperTraits;
@@ -68,11 +72,7 @@ public:
DartDOMData* domData = DartDOMData::current();
if (isNode) {
Node* domNodeObject = reinterpret_cast<Node*>(domObject);
- Dart_WeakPersistentHandle wrapper = domData->nodeMap()->get(domNodeObject);
- if (wrapper && domNodeObject->isCustomElement()) {
- return lookupCustomElementWrapper(domData, wrapper, domNodeObject);
- }
- return wrapper;
+ return domData->nodeMap()->get(domNodeObject);
}
return domData->objectMap()->get(domObject);
}
@@ -252,9 +252,6 @@ private:
domObject->deref();
}
- static Dart_WeakPersistentHandle lookupCustomElementWrapper(
- DartDOMData*, Dart_WeakPersistentHandle wrapper, Node* domObject);
-
template <class BindingsClass>
static void associateWrapper(typename BindingsClass::NativeType* domObject, Dart_Handle newInstance)
{
@@ -282,7 +279,7 @@ private:
Traits::EventTargetTraits::removeWrapper(domData, domObject);
}
- friend class DartCustomElement;
+ friend class DartCustomElementWrapper<HTMLElement>;
};
template<bool isNode>

Powered by Google App Engine
This is Rietveld 408576698