Rename updateIntrinsicContentLogicalHeight to setIntrinsicContentLogicalHeight

Source/platform/graphics/paint/ClipDisplayItem.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ClipDisplayItem_h
 #define ClipDisplayItem_h
 
+#include "SkRegion.h"
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/paint/DisplayItem.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class RoundedRect;
 
 class PLATFORM_EXPORT ClipDisplayItem : public DisplayItem {
 public:
-    ClipDisplayItem(DisplayItemClient client, Type type, IntRect clipRect)
-        : DisplayItem(client, type), m_clipRect(clipRect) { }
+    ClipDisplayItem(DisplayItemClient client, Type type, IntRect clipRect, SkRegion::Op operation = SkRegion::kIntersect_Op)
+        : DisplayItem(client, type), m_clipRect(clipRect), m_operation(operation) { }
 
     virtual void replay(GraphicsContext*) override;
 
     Vector<RoundedRect>& roundedRectClips() { return m_roundedRectClips; }
 
 private:
     IntRect m_clipRect;
     Vector<RoundedRect> m_roundedRectClips;
+    SkRegion::Op m_operation;
 #ifndef NDEBUG
     virtual WTF::String asDebugString() const override;
 #endif
 };
 
 class PLATFORM_EXPORT EndClipDisplayItem : public DisplayItem {
 public:
     EndClipDisplayItem(DisplayItemClient client) : DisplayItem(client, EndClip) { }
 
     virtual void replay(GraphicsContext*) override;
 };
 
 } // namespace blink
 
 #endif // ClipDisplayItem_h