Make parseCompositeAndBlendOperator() take care of "normal".

Source/platform/graphics/GraphicsTypes.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2012 Rik Cabanier (cabanier@adobe.com)
  *
  * 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 31 matching lines @@
     "destination-over",
     "destination-in",
     "destination-out",
     "destination-atop",
     "xor",
     "darker",
     "lighter"
 };
 
 static const char* const blendOperatorNames[] = {
+    "normal",
     "multiply",
     "screen",
     "overlay",
     "darken",
     "lighten",
     "color-dodge",
     "color-burn",
     "hard-light",
     "soft-light",
     "difference",
@@ skipping 11 matching lines @@
     for (int i = 0; i < numCompositeOperatorNames; i++) {
         if (s == compositeOperatorNames[i]) {
             op = static_cast<CompositeOperator>(i);
             blendOp = WebBlendModeNormal;
             return true;
         }
     }
 
     for (int i = 0; i < numBlendOperatorNames; i++) {
         if (s == blendOperatorNames[i]) {
-            blendOp = static_cast<WebBlendMode>(i+1);
+            blendOp = static_cast<WebBlendMode>(i);
             // For now, blending will always assume source-over. This will be fixed in the future
             op = CompositeSourceOver;
             return true;
         }
     }
 
     return false;
 }
 
 // FIXME: when we support blend modes in combination with compositing other than source-over
 // this routine needs to be updated.
 String compositeOperatorName(CompositeOperator op, WebBlendMode blendOp)
 {
     ASSERT(op >= 0);
     ASSERT(op < numCompositeOperatorNames);
     ASSERT(blendOp >= 0);
     ASSERT(blendOp <= numBlendOperatorNames);

[Justin Novosad, 2014/10/22 15:22:38]

This assert is now a tautology.  You can remove it.

     if (blendOp != WebBlendModeNormal)
         return blendOperatorNames[blendOp-1];

[Justin Novosad, 2014/10/22 15:22:38]

I think you would need to remove the '-1' here.  

     return compositeOperatorNames[op];
 }
 
 bool parseLineCap(const String& s, LineCap& cap)
 {
     if (s == "butt") {
         cap = ButtCap;
         return true;
     }
     if (s == "round") {
@@ skipping 104 matching lines @@
         return true;
     }
     if (s == "hanging") {
         baseline = HangingTextBaseline;
         return true;
     }
     return false;
 }
 
 } // namespace blink