Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/dom/DocumentMarkerController.h b/src/third_party/WebKit/Source/core/dom/DocumentMarkerController.h
index 7ecf064..7b3d9f8 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/DocumentMarkerController.h
+++ b/src/third_party/WebKit/Source/core/dom/DocumentMarkerController.h
@@ -44,7 +44,7 @@ class RenderedDocumentMarker;
 class Text;
 class TextIterator;
 
-class MarkerRemoverPredicate FINAL {
+class MarkerRemoverPredicate final {
 public:
     explicit MarkerRemoverPredicate(const Vector<String>& words);
     bool operator()(const DocumentMarker&, const Text&) const;
@@ -53,7 +53,7 @@ private:
     Vector<String> m_words;
 };
 
-class DocumentMarkerController FINAL : public NoBaseWillBeGarbageCollected<DocumentMarkerController> {
+class DocumentMarkerController final : public NoBaseWillBeGarbageCollected<DocumentMarkerController> {
     WTF_MAKE_NONCOPYABLE(DocumentMarkerController); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
     DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DocumentMarkerController);
 public:
@@ -101,9 +101,9 @@ public:
 private:
     void addMarker(Node*, const DocumentMarker&);
 
-    typedef WillBeHeapVector<OwnPtrWillBeMember<RenderedDocumentMarker> > MarkerList;
-    typedef WillBeHeapVector<OwnPtrWillBeMember<MarkerList>, DocumentMarker::MarkerTypeIndexesCount> MarkerLists;
-    typedef WillBeHeapHashMap<RawPtrWillBeWeakMember<const Node>, OwnPtrWillBeMember<MarkerLists> > MarkerMap;
+    using MarkerList = WillBeHeapVector<OwnPtrWillBeMember<RenderedDocumentMarker>>;
+    using MarkerLists = WillBeHeapVector<OwnPtrWillBeMember<MarkerList>, DocumentMarker::MarkerTypeIndexesCount>;
+    using MarkerMap = WillBeHeapHashMap<RawPtrWillBeWeakMember<const Node>, OwnPtrWillBeMember<MarkerLists>>;
     void mergeOverlapping(MarkerList*, DocumentMarker&);
     bool possiblyHasMarkers(DocumentMarker::MarkerTypes);
     void removeMarkersFromList(MarkerMap::iterator, DocumentMarker::MarkerTypes);