Make zoom filter independent of the layer size.

content/common/cc_messages.cc

 // Copyright (c) 2012 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 "content/common/cc_messages.h"
 
 #include "cc/compositor_frame.h"
 #include "content/public/common/common_param_traits.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
@@ skipping 20 matching lines @@
     case WebKit::WebFilterOperation::FilterTypeDropShadow:
       WriteParam(m, p.dropShadowOffset());
       WriteParam(m, p.amount());
       WriteParam(m, p.dropShadowColor());
       break;
     case WebKit::WebFilterOperation::FilterTypeColorMatrix:
       for (int i = 0; i < 20; ++i)
         WriteParam(m, p.matrix()[i]);
       break;
     case WebKit::WebFilterOperation::FilterTypeZoom:
-      WriteParam(m, p.zoomRect());
+#ifdef NEW_ZOOM_FILTER // TODO(danakj): Remove this when WebKit rolls.
       WriteParam(m, p.amount());
+      WriteParam(m, p.zoomInset());
+#endif

[piman, 2013/03/13 06:01:14]

It's a bit awkward to leave it like that, where the current code (pre-roll)
doesn't write anything but reads a float and an int. It means it'll mess up the
rest of the message deserialization.
Let's just write something that matches what the reader expects (or change the
reader to not read anything if !NEW_ZOOM_FILTER).

[danakj, 2013/03/13 06:05:48]

True. Ok, made it not read anything.

       break;
   }
 }
 
 bool ParamTraits<WebKit::WebFilterOperation>::Read(
     const Message* m, PickleIterator* iter, param_type* r) {
   WebKit::WebFilterOperation::FilterType type;
   float amount;
   WebKit::WebPoint dropShadowOffset;
   WebKit::WebColor dropShadowColor;
   SkScalar matrix[20];
-  WebKit::WebRect zoomRect;
+  int zoomInset;
 
   if (!ReadParam(m, iter, &type))
     return false;
   r->setType(type);
 
   bool success = false;
   switch (type) {
     case WebKit::WebFilterOperation::FilterTypeGrayscale:
     case WebKit::WebFilterOperation::FilterTypeSepia:
     case WebKit::WebFilterOperation::FilterTypeSaturate:
@@ skipping 25 matching lines @@
         if (!ReadParam(m, iter, &matrix[i]))
           break;
       }
       if (i == 20) {
         r->setMatrix(matrix);
         success = true;
       }
       break;
     }
     case WebKit::WebFilterOperation::FilterTypeZoom:
-      if (ReadParam(m, iter, &zoomRect) &&
-          ReadParam(m, iter, &amount)) {
-        r->setZoomRect(zoomRect);
+      if (ReadParam(m, iter, &amount) &&
+          ReadParam(m, iter, &zoomInset)) {
+#ifdef NEW_ZOOM_FILTER // TODO(danakj): Remove this when WebKit rolls.
         r->setAmount(amount);
+        r->setZoomInset(zoomInset);
+#else
+        r->setAmount(0.f);
+        r->setZoomRect(WebKit::WebRect(0, 0, 0, 0));
+#endif
         success = true;
       }
       break;
   }
   return success;
 }
 
 void ParamTraits<WebKit::WebFilterOperation>::Log(
     const param_type& p, std::string* l) {
   l->append("(");
@@ skipping 21 matching lines @@
       LogParam(p.dropShadowColor(), l);
       break;
     case WebKit::WebFilterOperation::FilterTypeColorMatrix:
       for (int i = 0; i < 20; ++i) {
         if (i)
           l->append(", ");
         LogParam(p.matrix()[i], l);
       }
       break;
     case WebKit::WebFilterOperation::FilterTypeZoom:
-      LogParam(p.zoomRect(), l);
+#ifdef NEW_ZOOM_FILTER // TODO(danakj): Remove this when WebKit rolls.
+      LogParam(p.amount(), l);
       l->append(", ");
-      LogParam(p.amount(), l);
+      LogParam(p.zoomInset(), l);
+#endif
       break;
   }
   l->append(")");
 }
 
 void ParamTraits<WebKit::WebFilterOperations>::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.size());
   for (std::size_t i = 0; i < p.size(); ++i) {
     WriteParam(m, p.at(i));
@@ skipping 521 matching lines @@
   l->append(", [");
   for (size_t i = 0; i < p.render_pass_list.size(); ++i) {
     if (i)
       l->append(", ");
     LogParam(*p.render_pass_list[i], l);
   }
   l->append("])");
 }
 
 }  // namespace IPC