Invert DSF to map from delegated frame to layer space

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 8d93e1f9744f7ddd5eb31b4a3431976ff3601a85..8946d70027b4bb2e7ef607b2310817b72ffd408e 100644
--- a/content/common/cc_messages.cc
+++ b/content/common/cc_messages.cc
@@ -711,13 +711,15 @@ void ParamTraits<cc::DelegatedFrameData>::Write(Message* m,
                                                 const param_type& p) {
   DCHECK_NE(0u, p.render_pass_list.size());
 
-  size_t to_reserve = p.resource_list.size() * sizeof(cc::TransferableResource);
+  size_t to_reserve = sizeof(p.device_scale_factor);
+  to_reserve += p.resource_list.size() * sizeof(cc::TransferableResource);
   for (size_t i = 0; i < p.render_pass_list.size(); ++i) {
     const cc::RenderPass* pass = p.render_pass_list[i];
     to_reserve += ReserveSizeForRenderPassWrite(*pass);
   }
   m->Reserve(to_reserve);
 
+  WriteParam(m, p.device_scale_factor);
   WriteParam(m, p.resource_list);
   WriteParam(m, p.render_pass_list.size());
   for (size_t i = 0; i < p.render_pass_list.size(); ++i)
@@ -727,6 +729,9 @@ void ParamTraits<cc::DelegatedFrameData>::Write(Message* m,
 bool ParamTraits<cc::DelegatedFrameData>::Read(const Message* m,
                                                PickleIterator* iter,
                                                param_type* p) {
+  if (!ReadParam(m, iter, &p->device_scale_factor))
+    return false;
+
   const static size_t kMaxRenderPasses = 10000;
 
   size_t num_render_passes;
@@ -746,6 +751,7 @@ bool ParamTraits<cc::DelegatedFrameData>::Read(const Message* m,
 void ParamTraits<cc::DelegatedFrameData>::Log(const param_type& p,
                                               std::string* l) {
   l->append("DelegatedFrameData(");
+  LogParam(p.device_scale_factor, l);
   LogParam(p.resource_list, l);
   l->append(", [");
   for (size_t i = 0; i < p.render_pass_list.size(); ++i) {