Bug 1205521 - Part4: (v2) Align LayerScopePacket to fit changes in Bug 1211324. r=dglastonbury
☠☠ backed out by 7a5670ba45ae ☠ ☠
authorJeremy Chen <jeremychen@mozilla.com>
Sun, 18 Oct 2015 20:37:00 +0200
changeset 303662 2a3c00d122c57048b68c668589bffcd9d0a9ee06
parent 303661 e8769c3e5d4f00c7244adddd69693ceeb2fcb79e
child 303663 402cca1e7b46dc2be0dec60c3b3c27e49b81fac2
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdglastonbury
bugs1205521, 1211324
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1205521 - Part4: (v2) Align LayerScopePacket to fit changes in Bug 1211324. r=dglastonbury
gfx/layers/protobuf/LayerScopePacket.pb.cc
gfx/layers/protobuf/LayerScopePacket.pb.h
gfx/layers/protobuf/LayerScopePacket.proto
--- a/gfx/layers/protobuf/LayerScopePacket.pb.cc
+++ b/gfx/layers/protobuf/LayerScopePacket.pb.cc
@@ -2472,30 +2472,34 @@ bool LayersPacket_Layer_Filter_IsValid(i
   switch(value) {
     case 0:
     case 1:
     case 2:
     case 3:
     case 4:
     case 5:
     case 6:
+    case 7:
+    case 8:
       return true;
     default:
       return false;
   }
 }
 
 #ifndef _MSC_VER
 const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_FAST;
 const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_GOOD;
 const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_BEST;
 const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_NEAREST;
 const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_BILINEAR;
 const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_GAUSSIAN;
 const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_SENTINEL;
+const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_LINEAR;
+const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_POINT;
 const LayersPacket_Layer_Filter LayersPacket_Layer::Filter_MIN;
 const LayersPacket_Layer_Filter LayersPacket_Layer::Filter_MAX;
 const int LayersPacket_Layer::Filter_ARRAYSIZE;
 #endif  // _MSC_VER
 #ifndef _MSC_VER
 const int LayersPacket_Layer_Size::kWFieldNumber;
 const int LayersPacket_Layer_Size::kHFieldNumber;
 #endif  // !_MSC_VER
--- a/gfx/layers/protobuf/LayerScopePacket.pb.h
+++ b/gfx/layers/protobuf/LayerScopePacket.pb.h
@@ -91,21 +91,23 @@ const int LayersPacket_Layer_ScrollingDi
 
 enum LayersPacket_Layer_Filter {
   LayersPacket_Layer_Filter_FILTER_FAST = 0,
   LayersPacket_Layer_Filter_FILTER_GOOD = 1,
   LayersPacket_Layer_Filter_FILTER_BEST = 2,
   LayersPacket_Layer_Filter_FILTER_NEAREST = 3,
   LayersPacket_Layer_Filter_FILTER_BILINEAR = 4,
   LayersPacket_Layer_Filter_FILTER_GAUSSIAN = 5,
-  LayersPacket_Layer_Filter_FILTER_SENTINEL = 6
+  LayersPacket_Layer_Filter_FILTER_SENTINEL = 6,
+  LayersPacket_Layer_Filter_FILTER_LINEAR = 7,
+  LayersPacket_Layer_Filter_FILTER_POINT = 8
 };
 bool LayersPacket_Layer_Filter_IsValid(int value);
 const LayersPacket_Layer_Filter LayersPacket_Layer_Filter_Filter_MIN = LayersPacket_Layer_Filter_FILTER_FAST;
-const LayersPacket_Layer_Filter LayersPacket_Layer_Filter_Filter_MAX = LayersPacket_Layer_Filter_FILTER_SENTINEL;
+const LayersPacket_Layer_Filter LayersPacket_Layer_Filter_Filter_MAX = LayersPacket_Layer_Filter_FILTER_POINT;
 const int LayersPacket_Layer_Filter_Filter_ARRAYSIZE = LayersPacket_Layer_Filter_Filter_MAX + 1;
 
 enum Packet_DataType {
   Packet_DataType_FRAMESTART = 1,
   Packet_DataType_FRAMEEND = 2,
   Packet_DataType_COLOR = 3,
   Packet_DataType_TEXTURE = 4,
   Packet_DataType_LAYERS = 5,
@@ -1699,16 +1701,18 @@ class LayersPacket_Layer : public ::goog
   typedef LayersPacket_Layer_Filter Filter;
   static const Filter FILTER_FAST = LayersPacket_Layer_Filter_FILTER_FAST;
   static const Filter FILTER_GOOD = LayersPacket_Layer_Filter_FILTER_GOOD;
   static const Filter FILTER_BEST = LayersPacket_Layer_Filter_FILTER_BEST;
   static const Filter FILTER_NEAREST = LayersPacket_Layer_Filter_FILTER_NEAREST;
   static const Filter FILTER_BILINEAR = LayersPacket_Layer_Filter_FILTER_BILINEAR;
   static const Filter FILTER_GAUSSIAN = LayersPacket_Layer_Filter_FILTER_GAUSSIAN;
   static const Filter FILTER_SENTINEL = LayersPacket_Layer_Filter_FILTER_SENTINEL;
+  static const Filter FILTER_LINEAR = LayersPacket_Layer_Filter_FILTER_LINEAR;
+  static const Filter FILTER_POINT = LayersPacket_Layer_Filter_FILTER_POINT;
   static inline bool Filter_IsValid(int value) {
     return LayersPacket_Layer_Filter_IsValid(value);
   }
   static const Filter Filter_MIN =
     LayersPacket_Layer_Filter_Filter_MIN;
   static const Filter Filter_MAX =
     LayersPacket_Layer_Filter_Filter_MAX;
   static const int Filter_ARRAYSIZE =
--- a/gfx/layers/protobuf/LayerScopePacket.proto
+++ b/gfx/layers/protobuf/LayerScopePacket.proto
@@ -80,23 +80,25 @@ message LayersPacket {
       RefLayer = 7;
       ReadbackLayer = 8;
     }
     enum ScrollingDirect {
       VERTICAL = 1;
       HORIZONTAL = 2;
     }
     enum Filter {
-      FILTER_FAST = 0;
+      FILTER_FAST = 0; // deprecated
       FILTER_GOOD = 1;
-      FILTER_BEST = 2;
-      FILTER_NEAREST = 3;
-      FILTER_BILINEAR = 4;
-      FILTER_GAUSSIAN = 5;
-      FILTER_SENTINEL = 6;
+      FILTER_BEST = 2; // deprecated
+      FILTER_NEAREST = 3; //deprecated
+      FILTER_BILINEAR = 4; //deprecated
+      FILTER_GAUSSIAN = 5; //deprecated
+      FILTER_SENTINEL = 6; //deprecated
+      FILTER_LINEAR = 7;
+      FILTER_POINT = 8;
     }
     message Size {
       optional int32 w = 1;
       optional int32 h = 2;
     }
     message Rect {
       optional int32 x = 1;
       optional int32 y = 2;