Merge 88496 - 2011-06-09 James Robinson <jamesr@chromium.org>

Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h

 /*
  * Copyright (C) 2011 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:
  *
  * 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 82 matching lines @@
 
     void setOpacity(float opacity) { m_opacity = opacity; }
     float opacity() const { return m_opacity; }
 
     void setPosition(const FloatPoint& position) { m_position = position; }
     const FloatPoint& position() const { return m_position; }
 
     void setPreserves3D(bool preserves3D) { m_preserves3D = preserves3D; }
     bool preserves3D() const { return m_preserves3D; }
 
+    void setUsesLayerScissor(bool usesLayerScissor) { m_usesLayerScissor = usesLayerScissor; }
+    bool usesLayerScissor() const { return m_usesLayerScissor; }
+
     void setSublayerTransform(const TransformationMatrix& sublayerTransform) { m_sublayerTransform = sublayerTransform; }
     const TransformationMatrix& sublayerTransform() const { return m_sublayerTransform; }
 
     void setTransform(const TransformationMatrix& transform) { m_transform = transform; }
     const TransformationMatrix& transform() const { return m_transform; }
 
     void setName(const String& name) { m_name = name; }
     const String& name() const { return m_name; }
 
     // Debug layer border - visual effect only, do not change geometry/clipping/etc.
@@ skipping 63 matching lines @@
 
     // Whether the "back" of this layer should draw.
     bool m_doubleSided;
 
     bool m_masksToBounds;
     float m_opacity;
     FloatPoint m_position;
     bool m_preserves3D;
     TransformationMatrix m_sublayerTransform;
     TransformationMatrix m_transform;
+    bool m_usesLayerScissor;
 
     // Properties owned exclusively by this CCLayerImpl.
     // Debugging.
 #ifndef NDEBUG
     int m_debugID;
 #endif
 
     String m_name;
 
     // Render surface this layer draws into. This is a surface that can belong
@@ skipping 25 matching lines @@
     // Hierarchical bounding rect containing the layer and its descendants.
     IntRect m_drawableContentRect;
 
     // Points to the layer renderer that updates and draws this layer.
     RefPtr<LayerRendererChromium> m_layerRenderer;
 };
 
 }
 
 #endif // CCLayerImpl_h