Fix FullScreen crash in Webapp

[platform/framework/web/chromium-efl.git] / courgette / label_manager.h

diff --git a/courgette/label_manager.h b/courgette/label_manager.h
index 4b25240..33f191c 100644 (file)
--- a/courgette/label_manager.h
+++ b/courgette/label_manager.h
@@ -1,4 +1,4 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "base/gtest_prod_util.h"
-#include "base/macros.h"
+#include "base/memory/raw_ptr.h"
 #include "courgette/image_utils.h"
 
 namespace courgette {
@@ -50,6 +50,10 @@ class LabelManager {
   class SimpleIndexAssigner {
    public:
     explicit SimpleIndexAssigner(LabelVector* labels);
+
+    SimpleIndexAssigner(const SimpleIndexAssigner&) = delete;
+    SimpleIndexAssigner& operator=(const SimpleIndexAssigner&) = delete;
+
     ~SimpleIndexAssigner();
 
     // Scans forward to assign successive indexes to Labels, using existing
@@ -66,18 +70,20 @@ class LabelManager {
 
    private:
     // The target LabelVector, owned by the caller.
-    LabelVector* labels_;
+    raw_ptr<LabelVector> labels_;
 
     // A bound on indexes.
     int num_index_ = 0;
 
     // Tracker for index usage to ensure uniqueness of indexes.
     std::vector<bool> available_;
-
-    DISALLOW_COPY_AND_ASSIGN(SimpleIndexAssigner);
   };
 
   LabelManager();
+
+  LabelManager(const LabelManager&) = delete;
+  LabelManager& operator=(const LabelManager&) = delete;
+
   ~LabelManager();
 
   // Returns an exclusive upper bound for all assigned indexes in |labels|.
@@ -114,9 +120,6 @@ class LabelManager {
 
   // The main list of Label instances, sorted by the |rva_| member.
   LabelVector labels_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(LabelManager);
 };
 
 }  // namespace courgette