COMPLETED PREVIEW Migrate to Display Placement

ui/gfx/display_layout.h

 // Copyright 2016 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_GFX_DISPLAY_LAYOUT_H_
 #define UI_GFX_DISPLAY_LAYOUT_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 37 matching lines @@
   // The id of the display this placement will be applied to.
   int64_t display_id;
 
   // The parent display id to which the above display is placed.
   int64_t parent_display_id;
 
   // To which side the parent display the display is positioned.
   enum Position { TOP, RIGHT, BOTTOM, LEFT };
   Position position;
 
-  // The offset of the position of the secondary display. The offset is
-  // based on the top/left edge of the primary display.
+  // The offset of the position with respect to the parent.
   int offset;
 
-  explicit DisplayPlacement(const DisplayPlacement& placement);
+  // Determines if the offset is relative to the TOP_LEFT or the BOTTOM_RIGHT.
+  // Defaults to TOP_LEFT.
+  enum OffsetReference { TOP_LEFT, BOTTOM_RIGHT };
+  OffsetReference offset_reference;
+
   DisplayPlacement(Position position, int offset);
+  DisplayPlacement(Position position,
+                   int offset,
+                   OffsetReference offset_reference);
+  DisplayPlacement(int64_t display_id,
+                   int64_t parent_display_id,
+                   Position position,
+                   int offset,
+                   OffsetReference offset_reference);
   DisplayPlacement();
 
+  DisplayPlacement(const DisplayPlacement& placement);
+
   DisplayPlacement& Swap();
 
   std::string ToString() const;
 
   static std::string PositionToString(Position position);
   static bool StringToPosition(const base::StringPiece& string,
                                Position* position);
 };
 
 class GFX_EXPORT DisplayLayout final {
  public:
   DisplayLayout();
   ~DisplayLayout();
 
+  // Applies the layout and updates the bounds of displays in |display_list|.
+  // |updated_ids| contains the ids for displays whose bounds have changed.
+  void ApplyToDisplayList(DisplayList* display_list,
+                          std::vector<int64_t>* updated_ids,
+                          int minimum_offset_overlap) const;
+
+  // Apply the display placement to the display layout.
+  // Returns true if the display bounds has been updated.
+  bool ApplyDisplayPlacement(const gfx::DisplayPlacement& placement,
+                             gfx::DisplayList* display_list,
+                             int minimum_offset_overlap) const;
+
+
   // Validates the layout object.
   static bool Validate(const DisplayIdList& list, const DisplayLayout& layout);
 
   ScopedVector<DisplayPlacement> placement_list;
 
   // True if displays are mirrored.
   bool mirrored;
 
   // True if multi displays should default to unified mode.
   bool default_unified;
@@ skipping 14 matching lines @@
   // |display_id| if it exists, otherwise returns nullptr.
   const DisplayPlacement* FindPlacementById(int64_t display_id) const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisplayLayout);
 };
 
 }  // namespace gfx
 
 #endif