Merge 106663 - [Chromium] Use the current clip when marking paints as opaque

Source/WebCore/platform/graphics/skia/PlatformContextSkia.h

 /*
  * Copyright (c) 2008, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 134 matching lines @@
     // Returns the fill color. The returned color has it's alpha adjusted
     // by the current alpha.
     SkColor effectiveFillColor() const;
 
     // Returns the stroke color. The returned color has it's alpha adjusted
     // by the current alpha.
     SkColor effectiveStrokeColor() const;
 
     // Returns the canvas used for painting, NOT guaranteed to be non-null.
     SkCanvas* canvas() { return m_canvas; }
+    const SkCanvas* canvas() const { return m_canvas; }
 
     InterpolationQuality interpolationQuality() const;
     void setInterpolationQuality(InterpolationQuality interpolationQuality);
 
     // FIXME: This should be pushed down to GraphicsContext.
     void drawRect(SkRect rect);
 
     // FIXME: I'm still unsure how I will serialize this call.
     void paintSkPaint(const SkRect&, const SkPaint&);
 
@@ skipping 69 matching lines @@
     IntSize m_imageResamplingHintSrcSize;
     FloatSize m_imageResamplingHintDstSize;
     bool m_printing;
     bool m_deferred;
     bool m_drawingToImageBuffer;
     GraphicsContext3D* m_gpuContext;
 };
 
 }
 #endif // PlatformContextSkia_h