diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/dom/MutationObserverRegistration.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/dom/MutationObserverRegistration.cpp')
| -rw-r--r-- | Source/WebCore/dom/MutationObserverRegistration.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/WebCore/dom/MutationObserverRegistration.cpp b/Source/WebCore/dom/MutationObserverRegistration.cpp index 5895ef49f..4c30ac30c 100644 --- a/Source/WebCore/dom/MutationObserverRegistration.cpp +++ b/Source/WebCore/dom/MutationObserverRegistration.cpp @@ -40,15 +40,16 @@ namespace WebCore { -PassOwnPtr<MutationObserverRegistration> MutationObserverRegistration::create(PassRefPtr<MutationObserver> observer, Node* registrationNode) +PassOwnPtr<MutationObserverRegistration> MutationObserverRegistration::create(PassRefPtr<MutationObserver> observer, Node* registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter) { - return adoptPtr(new MutationObserverRegistration(observer, registrationNode)); + return adoptPtr(new MutationObserverRegistration(observer, registrationNode, options, attributeFilter)); } -MutationObserverRegistration::MutationObserverRegistration(PassRefPtr<MutationObserver> observer, Node* registrationNode) - : m_observer(observer) - , m_registrationNode(registrationNode) - , m_options(0) +MutationObserverRegistration::MutationObserverRegistration(PassRefPtr<MutationObserver> observer, Node* registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter) + : m_observer(observer) + , m_registrationNode(registrationNode) + , m_options(options) + , m_attributeFilter(attributeFilter) { m_observer->observationStarted(this); } @@ -66,7 +67,7 @@ void MutationObserverRegistration::resetObservation(MutationObserverOptions opti m_attributeFilter = attributeFilter; } -void MutationObserverRegistration::observedSubtreeNodeWillDetach(PassRefPtr<Node> node) +void MutationObserverRegistration::observedSubtreeNodeWillDetach(Node* node) { if (!isSubtree()) return; @@ -105,7 +106,7 @@ void MutationObserverRegistration::unregister() // The above line will cause this object to be deleted, so don't do any more in this function. } -bool MutationObserverRegistration::shouldReceiveMutationFrom(Node* node, MutationObserver::MutationType type, const QualifiedName* attributeName) +bool MutationObserverRegistration::shouldReceiveMutationFrom(Node* node, MutationObserver::MutationType type, const QualifiedName* attributeName) const { ASSERT((type == MutationObserver::Attributes && attributeName) || !attributeName); if (!(m_options & type)) |