Make zoom filter independent of the layer size.

content/common/cc_messages.cc

Index: content/common/cc_messages.cc
diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc
index 799fa972fa21e987bb458bb347cf381b45111693..f4cf17b24d23d2d8509dfc7202aa274ada0922ad 100644
--- a/content/common/cc_messages.cc
+++ b/content/common/cc_messages.cc
@@ -38,8 +38,10 @@ void ParamTraits<WebKit::WebFilterOperation>::Write(
         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
       break;
   }
 }
@@ -51,7 +53,9 @@ bool ParamTraits<WebKit::WebFilterOperation>::Read(
   WebKit::WebPoint dropShadowOffset;
   WebKit::WebColor dropShadowColor;
   SkScalar matrix[20];
-  WebKit::WebRect zoomRect;
+#ifdef NEW_ZOOM_FILTER // TODO(danakj): Remove this when WebKit rolls.
+  int zoom_inset;
+#endif
 
   if (!ReadParam(m, iter, &type))
     return false;
@@ -97,12 +101,16 @@ bool ParamTraits<WebKit::WebFilterOperation>::Read(
       break;
     }
     case WebKit::WebFilterOperation::FilterTypeZoom:
-      if (ReadParam(m, iter, &zoomRect) &&
-          ReadParam(m, iter, &amount)) {
-        r->setZoomRect(zoomRect);
+#ifdef NEW_ZOOM_FILTER // TODO(danakj): Remove this when WebKit rolls.
+      if (ReadParam(m, iter, &amount) &&
+          ReadParam(m, iter, &zoom_inset) &&
+          amount >= 0.f &&
+          zoom_inset >= 0) {
         r->setAmount(amount);
+        r->setZoomInset(zoom_inset);
         success = true;
       }
+#endif
       break;
   }
   return success;
@@ -142,9 +150,11 @@ void ParamTraits<WebKit::WebFilterOperation>::Log(
       }
       break;
     case WebKit::WebFilterOperation::FilterTypeZoom:
-      LogParam(p.zoomRect(), l);
-      l->append(", ");
+#ifdef NEW_ZOOM_FILTER // TODO(danakj): Remove this when WebKit rolls.
       LogParam(p.amount(), l);
+      l->append(", ");
+      LogParam(p.zoomInset(), l);
+#endif
       break;
   }
   l->append(")");