Random wm frame painting fixes

mash/wm/property_util.cc

 // Copyright 2015 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.
 
 #include "mash/wm/property_util.h"
 
 #include <stdint.h>
 
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "mash/wm/shadow.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace mash {
 namespace wm {
 namespace {
 
 MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(Shadow*, kLocalShadowProperty, nullptr);
 
 }  // namespace
 
+void SetWindowShowState(mus::Window* window, mus::mojom::ShowState show_state) {
+  window->SetSharedProperty<int32_t>(
+      mus::mojom::WindowManager::kShowState_Property,
+      static_cast<uint32_t>(show_state));
+}
+
 mus::mojom::ShowState GetWindowShowState(const mus::Window* window) {
   if (window->HasSharedProperty(
           mus::mojom::WindowManager::kShowState_Property)) {
     return static_cast<mus::mojom::ShowState>(
         window->GetSharedProperty<int32_t>(
             mus::mojom::WindowManager::kShowState_Property));
   }
   return mus::mojom::ShowState::RESTORED;
 }
 
@@ skipping 58 matching lines @@
     return window->GetSharedProperty<gfx::Rect>(
         mus::mojom::WindowManager::kRestoreBounds_Property);
   }
   return gfx::Rect();
 }
 
 void SetShadow(mus::Window* window, Shadow* shadow) {
   window->SetLocalProperty(kLocalShadowProperty, shadow);
 }
 
-Shadow* GetShadow(mus::Window* window) {
+Shadow* GetShadow(const mus::Window* window) {
   return window->GetLocalProperty(kLocalShadowProperty);
 }
 
-mus::mojom::WindowType GetWindowType(mus::Window* window) {
-  return GetWindowType(window->shared_properties());
+mus::mojom::WindowType GetWindowType(const mus::Window* window) {
+  if (window->HasSharedProperty(
+          mus::mojom::WindowManager::kWindowType_Property)) {
+    return static_cast<mus::mojom::WindowType>(
+        window->GetSharedProperty<int32_t>(
+            mus::mojom::WindowManager::kWindowType_Property));
+  }
+  return mus::mojom::WindowType::POPUP;
 }
 
 mus::mojom::WindowType GetWindowType(
     const mus::Window::SharedProperties& properties) {
   const auto iter =
       properties.find(mus::mojom::WindowManager::kWindowType_Property);
   if (iter != properties.end()) {
     return static_cast<mus::mojom::WindowType>(
         mojo::ConvertTo<int32_t>(iter->second));
   }
   return mus::mojom::WindowType::POPUP;
 }
 
+base::string16 GetWindowTitle(const mus::Window* window) {
+  if (!window->HasSharedProperty(
+          mus::mojom::WindowManager::kWindowTitle_Property)) {
+    return base::string16();
+  }
+
+  return window->GetSharedProperty<base::string16>(
+      mus::mojom::WindowManager::kWindowTitle_Property);
+}
+
 }  // namespace wm
 }  // namespace mash