Move color/gradient/pattern out of StrokeData

Source/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 967 matching lines @@
     ASSERT(!rect.isEmpty());
     if (rect.isEmpty())
         return;
 
     SkRect skRect = rect;
     int fillcolorNotTransparent = immutableState()->fillColor().rgb() & 0xFF000000;
     if (fillcolorNotTransparent)
         drawRect(skRect, immutableState()->fillPaint());
 
     if (immutableState()->strokeData().style() != NoStroke
-        && immutableState()->strokeData().color().alpha()) {
+        && immutableState()->strokeColor().alpha()) {
         // Stroke a width: 1 inset border
         SkPaint paint(immutableState()->fillPaint());
         paint.setColor(effectiveStrokeColor());
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setStrokeWidth(1);
 
         skRect.inset(0.5f, 0.5f);
         drawRect(skRect, paint);
     }
 }
@@ skipping 1004 matching lines @@
         // FIXME: This is to not break tests (it results in the filter bitmap flag
         // being set to true). We need to decide if we respect InterpolationNone
         // being returned from computeInterpolationQuality.
         resampling = InterpolationLow;
     }
     resampling = limitInterpolationQuality(this, resampling);
     paint->setFilterLevel(static_cast<SkPaint::FilterLevel>(resampling));
 }
 
 } // namespace blink