Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / cc / output / compositor_frame_metadata.h

diff --git a/src/cc/output/compositor_frame_metadata.h b/src/cc/output/compositor_frame_metadata.h
index 54c3ce6..173a4c7 100644 (file)
--- a/src/cc/output/compositor_frame_metadata.h
+++ b/src/cc/output/compositor_frame_metadata.h
@@ -8,9 +8,10 @@
 #include <vector>
 
 #include "cc/base/cc_export.h"
+#include "cc/output/viewport_selection_bound.h"
 #include "ui/events/latency_info.h"
-#include "ui/gfx/size_f.h"
-#include "ui/gfx/vector2d_f.h"
+#include "ui/gfx/geometry/size_f.h"
+#include "ui/gfx/geometry/vector2d_f.h"
 
 namespace cc {
 
@@ -29,7 +30,7 @@ class CC_EXPORT CompositorFrameMetadata {
 
   // These limits can be used together with the scroll/scale fields above to
   // determine if scrolling/scaling in a particular direction is possible.
-  gfx::SizeF viewport_size;
+  gfx::SizeF scrollable_viewport_size;
   gfx::SizeF root_layer_size;
   float min_page_scale_factor;
   float max_page_scale_factor;
@@ -40,6 +41,11 @@ class CC_EXPORT CompositorFrameMetadata {
   gfx::Vector2dF location_bar_content_translation;
   float overdraw_bottom_height;
 
+  // Provides selection region updates relative to the current viewport. If the
+  // selection is empty or otherwise unused, the bound types will indicate such.
+  ViewportSelectionBound selection_start;
+  ViewportSelectionBound selection_end;
+
   std::vector<ui::LatencyInfo> latency_info;
 };