Added serialization to protobufs for property trees.

cc/proto/gfx_conversions_unittest.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 "cc/proto/gfx_conversions.h"
 
 #include "cc/proto/point.pb.h"
 #include "cc/proto/pointf.pb.h"
 #include "cc/proto/rect.pb.h"
 #include "cc/proto/rectf.pb.h"
+#include "cc/proto/scroll_offset.pb.h"
 #include "cc/proto/size.pb.h"
 #include "cc/proto/sizef.pb.h"
 #include "cc/proto/transform.pb.h"
+#include "cc/proto/vector2df.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/size_f.h"
+#include "ui/gfx/geometry/vector2d_f.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 namespace {
 
 TEST(GfxProtoConversionsTest, IntSerializationLimits) {
   // Test Point with the minimum int value.
   {
     gfx::Point point(std::numeric_limits<int>::min(),
                      std::numeric_limits<int>::min());
@@ skipping 135 matching lines @@
   EXPECT_EQ(transform.matrix().get(2, 3), proto.matrix(11));
   EXPECT_EQ(transform.matrix().get(3, 0), proto.matrix(12));
   EXPECT_EQ(transform.matrix().get(3, 1), proto.matrix(13));
   EXPECT_EQ(transform.matrix().get(3, 2), proto.matrix(14));
   EXPECT_EQ(transform.matrix().get(3, 3), proto.matrix(15));
 
   // Test ProtoToTransform
   EXPECT_EQ(transform, ProtoToTransform(proto));
 }
 
+TEST(GfxProtoConversionsTest, SerializeDeserializeVector2dF) {
+  const gfx::Vector2dF vector(5.1f, 10.2f);
+
+  // Test Vector2dFToProto
+  proto::Vector2dF proto;
+  Vector2dFToProto(vector, &proto);
+  EXPECT_EQ(vector.x(), proto.x());
+  EXPECT_EQ(vector.y(), proto.y());
+
+  // Test ProtoToVector2dF
+  EXPECT_EQ(vector, ProtoToVector2dF(proto));
+}
+
+TEST(GfxProtoConversionsTest, SerializeDeserializeScrollOffset) {
+  const gfx::ScrollOffset scroll_offset(5.1f, 10.2f);
+
+  // Test ScrollOffsetToProto
+  proto::ScrollOffset proto;
+  ScrollOffsetToProto(scroll_offset, &proto);
+  EXPECT_EQ(scroll_offset.x(), proto.x());
+  EXPECT_EQ(scroll_offset.y(), proto.y());
+
+  // Test ProtoToScrollOffset
+  EXPECT_EQ(scroll_offset, ProtoToScrollOffset(proto));
+}
+
 }  // namespace
 }  // namespace cc