Expand aura::PropertyConverter support.

ui/aura/mus/property_converter.cc

Index: ui/aura/mus/property_converter.cc
diff --git a/ui/aura/mus/property_converter.cc b/ui/aura/mus/property_converter.cc
index 070c8ff07e7f9c66fd6c6d5d19cddf2c7ed47394..45fa90dee21a7102ee070d340f461c5853e0919d 100644
--- a/ui/aura/mus/property_converter.cc
+++ b/ui/aura/mus/property_converter.cc
@@ -14,64 +14,133 @@ namespace aura {
 
 namespace {
 
-// Get the aura property key and name for a mus property transport |name|.
-bool GetPropertyKeyForTransportName(const std::string& name,
-                                    const void** key_out,
-                                    const char** name_out) {
-  if (name == ui::mojom::WindowManager::kAlwaysOnTop_Property) {
-    *key_out = client::kAlwaysOnTopKey;
-    *name_out = client::kAlwaysOnTopKey->name;
-    return true;
-  }
-  return false;
+// Get the WindowProperty's value as a byte array. Only supports aura properties
+// that point to types with a matching std::vector<uint8_t> mojo::TypeConverter.
+template <typename T>
+std::unique_ptr<std::vector<uint8_t>> GetArray(Window* window,
+                                               const WindowProperty<T>* key) {
+  const T value = window->GetProperty(key);
+  if (!value)
+    return base::MakeUnique<std::vector<uint8_t>>();
+  return base::MakeUnique<std::vector<uint8_t>>(
+      mojo::ConvertTo<std::vector<uint8_t>>(*value));
 }
 
 }  // namespace
 
-PropertyConverter::PropertyConverter() {}
+PropertyConverter::PropertyConverter() {
+  // Add known aura properties with associated mus properties.
+  RegisterProperty(client::kAlwaysOnTopKey,
+                   ui::mojom::WindowManager::kAlwaysOnTop_Property);
+  RegisterProperty(client::kExcludeFromMruKey,
+                   ui::mojom::WindowManager::kExcludeFromMru_Property);
+  RegisterProperty(client::kRestoreBoundsKey,
+                   ui::mojom::WindowManager::kRestoreBounds_Property);
+  RegisterProperty(client::kAppIdKey,

[sky, 2016/11/17 00:44:35]

Maybe sort these?

[msw, 2016/11/17 04:23:26]

Done.

+                   ui::mojom::WindowManager::kAppID_Property);
+}
 
 PropertyConverter::~PropertyConverter() {}
 
 bool PropertyConverter::ConvertPropertyForTransport(
     Window* window,
     const void* key,
-    std::string* server_property_name,
-    std::unique_ptr<std::vector<uint8_t>>* server_property_value) {
-  *server_property_name = GetTransportNameForPropertyKey(key);
-  if (!server_property_name->empty()) {
-    // TODO(msw): Using the int64_t accessor is wasteful for bool, etc.
-    const int64_t value = window->GetPropertyInternal(key, 0);
-    *server_property_value = base::MakeUnique<std::vector<uint8_t>>(
-        mojo::ConvertTo<std::vector<uint8_t>>(value));
+    std::string* transport_name,
+    std::unique_ptr<std::vector<uint8_t>>* transport_value) {
+  *transport_name = GetTransportNameForPropertyKey(key);
+  if (transport_name->empty())
+    return false;
+
+  auto rect_key = static_cast<const WindowProperty<gfx::Rect*>*>(key);
+  if (rect_properties_.count(rect_key) > 0) {
+    *transport_value = GetArray(window, rect_key);
+    return true;
+  }
+
+  auto string_key = static_cast<const WindowProperty<std::string*>*>(key);
+  if (string_properties_.count(string_key) > 0) {
+    *transport_value = GetArray(window, string_key);
     return true;
   }
-  DVLOG(2) << "Unknown aura property key: " << key;
-  return false;
+
+  // Handle primitive property types generically.
+  DCHECK_GT(primitive_properties_.count(key), 0u);
+  // TODO(msw): Using the int64_t accessor is wasteful for smaller types.
+  const int64_t value = window->GetPropertyInternal(key, 0);
+  *transport_value = base::MakeUnique<std::vector<uint8_t>>(
+      mojo::ConvertTo<std::vector<uint8_t>>(value));
+  return true;
 }
 
 std::string PropertyConverter::GetTransportNameForPropertyKey(const void* key) {
-  if (key == client::kAlwaysOnTopKey)
-    return ui::mojom::WindowManager::kAlwaysOnTop_Property;
+  if (primitive_properties_.count(key) > 0)
+    return primitive_properties_[key].second;
+
+  auto rect_key = static_cast<const WindowProperty<gfx::Rect*>*>(key);
+  if (rect_properties_.count(rect_key) > 0)
+    return rect_properties_[rect_key];
+
+  auto string_key = static_cast<const WindowProperty<std::string*>*>(key);
+  if (string_properties_.count(string_key) > 0)
+    return string_properties_[string_key];
+
   return std::string();
 }
 
 void PropertyConverter::SetPropertyFromTransportValue(
     Window* window,
-    const std::string& server_property_name,
+    const std::string& transport_name,
     const std::vector<uint8_t>* data) {
-  const void* key = nullptr;
-  const char* name = nullptr;
-  if (GetPropertyKeyForTransportName(server_property_name, &key, &name)) {
-    DCHECK(key);
-    DCHECK(name);
-    // Aura window only supports property types that fit in int64_t.
-    CHECK_LE(8u, data->size()) << " Property type not supported: " << key;
-    const int64_t value = mojo::ConvertTo<int64_t>(*data);
-    // TODO(msw): Should aura::Window just store all properties by name?
-    window->SetPropertyInternal(key, name, nullptr, value, 0);
-  } else {
-    DVLOG(2) << "Unknown mus property name: " << server_property_name;
+  for (const auto& primitive_property : primitive_properties_) {
+    if (primitive_property.second.second == transport_name) {
+      // aura::Window only supports property types that fit in int64_t.
+      if (data->size() != 8u) {
+        DVLOG(2) << "Property size mismatch (int64_t): " << transport_name;
+        return;
+      }
+      const int64_t value = mojo::ConvertTo<int64_t>(*data);
+      // TODO(msw): Should aura::Window just store all properties by name?
+      window->SetPropertyInternal(primitive_property.first,
+                                  primitive_property.second.first, nullptr,
+                                  value, 0);
+      return;
+    }
+  }
+
+  for (const auto& rect_property : rect_properties_) {
+    if (rect_property.second == transport_name) {
+      if (data->size() != 16u) {
+        DVLOG(2) << "Property size mismatch (gfx::Rect): " << transport_name;
+        return;
+      }
+      const gfx::Rect value = mojo::ConvertTo<gfx::Rect>(*data);
+      window->SetProperty(rect_property.first, new gfx::Rect(value));
+      return;
+    }
+  }
+
+  for (const auto& string_property : string_properties_) {
+    if (string_property.second == transport_name) {
+      // TODO(msw): Validate the data somehow, before trying to convert?
+      const std::string value = mojo::ConvertTo<std::string>(*data);
+      window->SetProperty(string_property.first, new std::string(value));
+      return;
+    }
   }
+
+  DVLOG(2) << "Unknown mus property name: " << transport_name;
+}
+
+void PropertyConverter::RegisterProperty(
+    const WindowProperty<gfx::Rect*>* property,
+    const char* transport_name) {
+  rect_properties_[property] = transport_name;
+}
+
+void PropertyConverter::RegisterProperty(
+    const WindowProperty<std::string*>* property,
+    const char* transport_name) {
+  string_properties_[property] = transport_name;
 }
 
 }  // namespace aura