Merge from google/chrome/m55
authorMatthew Leibowitz <mattleibow@live.com>
Tue, 11 Oct 2016 00:14:06 +0000 (02:14 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Tue, 11 Oct 2016 00:14:06 +0000 (02:14 +0200)
1  2 
gyp/common.gypi
gyp/common_conditions.gypi
gyp/core.gyp
gyp/core.gypi
src/core/SkRasterPipeline.cpp
src/ports/SkFontMgr_win_dw.cpp

diff --cc gyp/common.gypi
Simple merge
Simple merge
diff --cc gyp/core.gyp
Simple merge
diff --cc gyp/core.gypi
Simple merge
@@@ -37,10 -43,10 +43,10 @@@ void SkRasterPipeline::extend(const SkR
  
  void SkRasterPipeline::run(size_t x, size_t n) {
      // It's fastest to start uninitialized if the compilers all let us.  If not, next fastest is 0.
 -    Sk4f v;
 +    Sk4f v = { };
  
      while (n >= 4) {
-         fBodyStart(fBody.begin(), x, v,v,v,v, v,v,v,v);
+         fBodyStart(fBody.begin(), x,0, v,v,v,v, v,v,v,v);
          x += 4;
          n -= 4;
      }
Simple merge