Refactor and push window properties up to class properties.

ui/aura/window.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_WINDOW_H_
 #define UI_AURA_WINDOW_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window_observer.h"
+#include "ui/base/class_property.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/layer_delegate.h"
 #include "ui/compositor/layer_owner.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_target.h"
 #include "ui/events/event_targeter.h"
 #include "ui/events/gestures/gesture_types.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
@@ skipping 14 matching lines @@
 namespace aura {
 
 class LayoutManager;
 class WindowDelegate;
 class WindowPort;
 class WindowObserver;
 class WindowTreeHost;
 
 // Defined in window_property.h (which we do not include)
 template<typename T>
-struct WindowProperty;
+using WindowProperty = ui::ClassProperty<T>;
 
 namespace subtle {
 class PropertyHelper;
 }
 
 namespace test {
 class WindowTestApi;
 }
 
 // Aura window implementation. Interesting events are sent to the
 // WindowDelegate.
 // TODO(beng): resolve ownership.
 class AURA_EXPORT Window : public ui::LayerDelegate,
                            public ui::LayerOwner,
                            public ui::EventTarget,
-                           public ui::GestureConsumer {
+                           public ui::GestureConsumer,
+                           public ui::PropertyHandler {
  public:
   // Initial value of id() for newly created windows.
   static constexpr int kInitialId = -1;
 
   // Used when stacking windows.
   enum StackDirection {
     STACK_ABOVE,
     STACK_BELOW
   };
 
@@ skipping 205 matching lines @@
   bool HasCapture();
 
   // Suppresses painting window content by disgarding damaged rect and ignoring
   // new paint requests. This is a one way operation and there is no way to
   // reenable painting.
   void SuppressPaint();
 
   // Sets the |value| of the given window |property|. Setting to the default
   // value (e.g., NULL) removes the property. The caller is responsible for the
   // lifetime of any object set as a property on the Window.
-  template<typename T>
-  void SetProperty(const WindowProperty<T>* property, T value);
+  //template<typename T>
+  //void SetProperty(const WindowProperty<T>* property, T value);

[sky, 2017/01/13 20:28:20]

Is there a reason you are commenting this out and not removing them? In general
we don't comment out code like this.

[kylix_rd, 2017/01/13 21:44:59]

I'll do a cleanup pass once the substance of these changes have been vetted.

This review is kind of a checkpoint right now to make sure I've not taken a
left-turn and it is what we'd discussed and expected.

[kylix_rd, 2017/01/24 15:14:53]

Done.

 
   // Returns the value of the given window |property|.  Returns the
   // property-specific default value if the property was not previously set.
-  template<typename T>
-  T GetProperty(const WindowProperty<T>* property) const;
+  //template<typename T>
+  //T GetProperty(const WindowProperty<T>* property) const;
 
   // Sets the |property| to its default value. Useful for avoiding a cast when
   // setting to NULL.
-  template<typename T>
-  void ClearProperty(const WindowProperty<T>* property);
+  //template<typename T>
+  //void ClearProperty(const WindowProperty<T>* property);
 
   // Returns the value of all properties with a non-default value.
-  std::set<const void*> GetAllPropertKeys() const;
+  //std::set<const void*> GetAllPropertKeys() const;
 
   // NativeWidget::[GS]etNativeWindowProperty use strings as keys, and this is
   // difficult to change while retaining compatibility with other platforms.
   // TODO(benrg): Find a better solution.
   void SetNativeWindowProperty(const char* key, void* value);
   void* GetNativeWindowProperty(const char* key) const;
 
   // Type of a function to delete a property that this window owns.
-  typedef void (*PropertyDeallocator)(int64_t value);
+  //typedef void (*PropertyDeallocator)(int64_t value);
 
   // Overridden from ui::LayerDelegate:
   void OnDeviceScaleFactorChanged(float device_scale_factor) override;
 
 #if !defined(NDEBUG)
   // These methods are useful when debugging.
   std::string GetDebugInfo() const;
   void PrintWindowHierarchy(int depth) const;
 #endif
 
   // Returns true if there was state needing to be cleaned up.
   bool CleanupGestureState();
 
  protected:
   // Deletes (or removes if not owned by parent) all child windows. Intended for
   // use from the destructor.
   void RemoveOrDestroyChildren();
 
+  // Overrides from ui::PropertyHandler
+  std::unique_ptr<ui::PropertyData> BeforePropertyChange(const void* key)
+      override;
+  void AfterPropertyChange(const void* key,
+                           int64_t old_value,
+                           std::unique_ptr<ui::PropertyData> data) override;
  private:
   friend class LayoutManager;
   friend class PropertyConverter;
   friend class WindowPort;
   friend class WindowTargeter;
-  friend class subtle::PropertyHelper;
+  //friend class subtle::PropertyHelper;
   friend class test::WindowTestApi;
 
   // Called by the public {Set,Get,Clear}Property functions.
   int64_t SetPropertyInternal(const void* key,
                               const char* name,
-                              PropertyDeallocator deallocator,
+                              ui::PropertyDeallocator deallocator,
                               int64_t value,
                               int64_t default_value);
   int64_t GetPropertyInternal(const void* key, int64_t default_value) const;
 
   // Returns true if the mouse pointer at relative-to-this-Window's-origin
   // |local_point| can trigger an event for this Window.
   // TODO(beng): A Window can supply a hit-test mask to cause some portions of
   // itself to not trigger events, causing the events to fall through to the
   // Window behind.
   bool HitTest(const gfx::Point& local_point);
@@ skipping 145 matching lines @@
   bool ignore_events_;
 
   // See set_hit_test_bounds_override_inner().
   gfx::Insets hit_test_bounds_override_inner_;
 
   base::ObserverList<WindowObserver, true> observers_;
 
   // Value struct to keep the name and deallocator for this property.
   // Key cannot be used for this purpose because it can be char* or
   // WindowProperty<>.
-  struct Value {
-    const char* name;
-    int64_t value;
-    PropertyDeallocator deallocator;
-  };
+  //struct Value {
+  //  const char* name;
+  //  int64_t value;
+  //  PropertyDeallocator deallocator;
+  //};
 
-  std::map<const void*, Value> prop_map_;
+  //std::map<const void*, Value> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_