Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/html/CanvasStyle.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  *
  * 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
@@ skipping 129 matching lines @@
             // We'll need a fancier Color abstraction to support CYMKA correctly
 #if PLATFORM(CG)
             CGContextSetCMYKStrokeColor(context->platformContext(), m_cyan, m_magenta, m_yellow, m_black, m_alpha);
 #elif PLATFORM(QT)
             QPen currentPen = context->platformContext()->pen();
             QColor clr;
             clr.setCmykF(m_cyan, m_magenta, m_yellow, m_black, m_alpha);
             currentPen.setColor(clr);
             context->platformContext()->setPen(currentPen);
 #else
-            context->setStrokeColor(Color(m_cyan, m_magenta, m_yellow, m_black, m_alpha));
+            context->setStrokeColor(cmykToRGB());
 #endif
             break;
         }
         case Gradient:
             context->setStrokeGradient(canvasGradient()->gradient());
             break;
         case ImagePattern:
             context->setStrokePattern(canvasPattern()->pattern());
             break;
     }
@@ skipping 40 matching lines @@
             // We'll need a fancier Color abstraction to support CYMKA correctly
 #if PLATFORM(CG)
             CGContextSetCMYKFillColor(context->platformContext(), m_cyan, m_magenta, m_yellow, m_black, m_alpha);
 #elif PLATFORM(QT)
             QBrush currentBrush = context->platformContext()->brush();
             QColor clr;
             clr.setCmykF(m_cyan, m_magenta, m_yellow, m_black, m_alpha);
             currentBrush.setColor(clr);
             context->platformContext()->setBrush(currentBrush);
 #else
-            context->setFillColor(Color(m_cyan, m_magenta, m_yellow, m_black, m_alpha));
+            context->setFillColor(cmykToRGB());
 #endif
             break;
         }
         case Gradient:
             context->setFillGradient(canvasGradient()->gradient());
             break;
         case ImagePattern:
             context->setFillPattern(canvasPattern()->pattern());
             break;
     }
 }
 
 Color CanvasStyle::cmykToRGB() const
 {
     float colors = 1 - m_black;
     int r = static_cast<int>(255 * (colors * (1 - m_cyan)));
     int g = static_cast<int>(255 * (colors * (1 - m_magenta)));
     int b = static_cast<int>(255 * (colors * (1 - m_yellow)));
     return Color(r, g, b, static_cast<int>(m_alpha * 255));
 }
 
 }