Replace setCompositeOperation(CompositeOperator, WebBlendMode) with setCompositeOperation(SkXfermod…

Source/platform/graphics/GraphicsContext.h

Index: Source/platform/graphics/GraphicsContext.h
diff --git a/Source/platform/graphics/GraphicsContext.h b/Source/platform/graphics/GraphicsContext.h
index 24b35beb53400033804201aa6c3940d670f1dd04..5093163dc7dbb400c32e8845fe066a3348d1cce8 100644
--- a/Source/platform/graphics/GraphicsContext.h
+++ b/Source/platform/graphics/GraphicsContext.h
@@ -179,9 +179,9 @@ public:
     InterpolationQuality imageInterpolationQuality() const { return immutableState()->interpolationQuality(); }
 
     void setCompositeOperation(SkXfermode::Mode);
+    SkXfermode::Mode compositeOperation() const;
     // TODO(dshwang): remove these method. crbug.com/425656
-    void setCompositeOperation(CompositeOperator, WebBlendMode = WebBlendModeNormal);
-    CompositeOperator compositeOperation() const;
+    CompositeOperator compositeOperator() const;

[dshwang, 2015/01/21 16:18:11]

change this method name to avoid conflict with "SkXfermode::Mode
compositeOperation()"
"CompositeOperator compositeOperator() const;" will be removed soon.

[Justin Novosad, 2015/01/21 16:44:01]

The coexistence of these two names is quite confusing. When looking at a
callsite it is not always obvious which one is being used. I would rather you
call the old one by a name that is more obvious, like
compositeOperationDeprecated()

     WebBlendMode blendModeOperation() const;
 
     // Specify the device scale factor which may change the way document markers