Use pixel coordinates for shadow underlay bounds

components/exo/shell_surface.h

 // 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.
 
 #ifndef COMPONENTS_EXO_SHELL_SURFACE_H_
 #define COMPONENTS_EXO_SHELL_SURFACE_H_
 
 #include <deque>
 #include <memory>
 #include <string>
@@ skipping 129 matching lines @@
   void Resize(int component);
 
   // Signal a request to close the window. It is up to the implementation to
   // actually decide to do so though.
   void Close();
 
   // Set geometry for surface. The geometry represents the "visible bounds"
   // for the surface from the user's perspective.
   void SetGeometry(const gfx::Rect& geometry);
 
-  // Enable/disable rectangular shadow.
-  void SetRectangularShadow(bool enabled);
+  // Enable/disable rectangular shadow that uses the widget bounds as a content
+  // bounds.
+  void SetRectangularShadowEnabled(bool enabled);
 
-  // Set the content bounds for the shadow. Shell surface geometry will be
+  // [Deprecated] Set the content bounds for the shadow. Shell surface geometry
+  // will be
   // used if bounds are empty.
-  void SetRectangularShadowContentBounds(const gfx::Rect& content_bounds);
+  void SetRectangularShadow_DEPRECATED(const gfx::Rect& content_bounds);
+
+  // Set the content bounds for the shadow in the surface's coordinates.
+  // Setting empty bounds will disable the shadow.
+  void SetRectangularSurfaceShadow(const gfx::Rect& content_bounds);
 
   // Set the pacity of the background for the window that has a shadow.
   void SetRectangularShadowBackgroundOpacity(float opacity);
 
   // Enable/disable window frame.
   void SetFrame(bool enabled);
 
   // Set scale factor for surface. The scale factor will be applied to surface
   // and all descendants.
   void SetScale(double scale);
@@ skipping 65 matching lines @@
   // Overridden from WMHelper::AccessibilityObserver:
   void OnAccessibilityModeChanged() override;
 
   // Overridden from ui::EventHandler:
   void OnKeyEvent(ui::KeyEvent* event) override;
   void OnMouseEvent(ui::MouseEvent* event) override;
 
   // Overridden from ui::AcceleratorTarget:
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
 
+  aura::Window* shadow_overlay() { return shadow_overlay_; }
   aura::Window* shadow_underlay() { return shadow_underlay_; }
 
+  Surface* surface_for_testing() { return surface_; }
+
  private:
   class ScopedConfigure;
   class ScopedAnimationsDisabled;
 
   // Surface state associated with each configure request.
   struct Config {
     uint32_t serial;
     gfx::Vector2d origin_offset;
     int resize_component;
   };
@@ skipping 60 matching lines @@
   aura::Window* shadow_overlay_ = nullptr;
   aura::Window* shadow_underlay_ = nullptr;
   std::unique_ptr<ui::EventHandler> shadow_underlay_event_handler_;
   gfx::Rect shadow_content_bounds_;
   float shadow_background_opacity_ = 1.0;
   std::deque<Config> pending_configs_;
   std::unique_ptr<ash::WindowResizer> resizer_;
   std::unique_ptr<ScopedAnimationsDisabled> scoped_animations_disabled_;
   int top_inset_height_ = 0;
   int pending_top_inset_height_ = 0;
+  bool shadow_underlay_in_surface_ = true;
 
   DISALLOW_COPY_AND_ASSIGN(ShellSurface);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_SHELL_SURFACE_H_