Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / DocumentLifecycleNotifier.h

diff --git a/src/third_party/WebKit/Source/core/dom/DocumentLifecycleNotifier.h b/src/third_party/WebKit/Source/core/dom/DocumentLifecycleNotifier.h
index f8a9f99..03e3042 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/DocumentLifecycleNotifier.h
+++ b/src/third_party/WebKit/Source/core/dom/DocumentLifecycleNotifier.h
@@ -30,7 +30,7 @@
 #include "wtf/PassOwnPtr.h"
 #include "wtf/TemporaryChange.h"
 
-namespace WebCore {
+namespace blink {
 
 class Document;
 
@@ -39,15 +39,17 @@ public:
     static PassOwnPtr<DocumentLifecycleNotifier> create(Document*);
 
     void notifyDocumentWasDetached();
+#if !ENABLE(OILPAN)
     void notifyDocumentWasDisposed();
+#endif
 
-    virtual void addObserver(Observer*) OVERRIDE FINAL;
-    virtual void removeObserver(Observer*) OVERRIDE FINAL;
+    virtual void addObserver(Observer*) override final;
+    virtual void removeObserver(Observer*) override final;
 
 private:
     explicit DocumentLifecycleNotifier(Document*);
 
-    typedef HashSet<DocumentLifecycleObserver*> DocumentObserverSet;
+    using DocumentObserverSet = HashSet<DocumentLifecycleObserver*>;
     DocumentObserverSet m_documentObservers;
 };
 
@@ -59,17 +61,19 @@ inline PassOwnPtr<DocumentLifecycleNotifier> DocumentLifecycleNotifier::create(D
 inline void DocumentLifecycleNotifier::notifyDocumentWasDetached()
 {
     TemporaryChange<IterationType> scope(this->m_iterating, IteratingOverDocumentObservers);
-    for (DocumentObserverSet::iterator i = m_documentObservers.begin(); i != m_documentObservers.end(); ++i)
-        (*i)->documentWasDetached();
+    for (DocumentLifecycleObserver* observer : m_documentObservers)
+        observer->documentWasDetached();
 }
 
+#if !ENABLE(OILPAN)
 inline void DocumentLifecycleNotifier::notifyDocumentWasDisposed()
 {
     TemporaryChange<IterationType> scope(this->m_iterating, IteratingOverDocumentObservers);
-    for (DocumentObserverSet::iterator i = m_documentObservers.begin(); i != m_documentObservers.end(); ++i)
-        (*i)->documentWasDisposed();
+    for (DocumentLifecycleObserver* observer : m_documentObservers)
+        observer->documentWasDisposed();
 }
+#endif
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // DocumentLifecycleNotifier_h