Title: [133542] trunk/Source/WebCore
- Revision
- 133542
- Author
- [email protected]
- Date
- 2012-11-05 16:48:06 -0800 (Mon, 05 Nov 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=101275
Clean up ScrollingConstraints.h
Reviewed by Simon Fraser.
This class cleans up ScrollingConstraints.h by removing the constructors since the
compiler will generate those constructors for us anyway. The patch also makes the
two override functions private.
* page/scrolling/ScrollingConstraints.h:
(ViewportConstraints):
(FixedPositionViewportConstraints):
(StickyPositionViewportConstraints):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (133541 => 133542)
--- trunk/Source/WebCore/ChangeLog 2012-11-06 00:35:57 UTC (rev 133541)
+++ trunk/Source/WebCore/ChangeLog 2012-11-06 00:48:06 UTC (rev 133542)
@@ -1,3 +1,18 @@
+2012-11-05 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=101275
+ Clean up ScrollingConstraints.h
+
+ Reviewed by Simon Fraser.
+
+ This class cleans up ScrollingConstraints.h by removing the constructors since the
+ compiler will generate those constructors for us anyway. The patch also makes the
+ two override functions private.
+ * page/scrolling/ScrollingConstraints.h:
+ (ViewportConstraints):
+ (FixedPositionViewportConstraints):
+ (StickyPositionViewportConstraints):
+
2012-11-05 Simon Fraser <[email protected]>
Make Document::updateStyleIfNeeded() non-virtual
Modified: trunk/Source/WebCore/page/scrolling/ScrollingConstraints.h (133541 => 133542)
--- trunk/Source/WebCore/page/scrolling/ScrollingConstraints.h 2012-11-06 00:35:57 UTC (rev 133541)
+++ trunk/Source/WebCore/page/scrolling/ScrollingConstraints.h 2012-11-06 00:48:06 UTC (rev 133542)
@@ -64,28 +64,12 @@
: m_anchorEdges(0)
{ }
- ViewportConstraints(const ViewportConstraints& constraints)
- : m_alignmentOffset(constraints.alignmentOffset())
- , m_anchorEdges(constraints.anchorEdges())
- { }
-
FloatSize m_alignmentOffset;
AnchorEdges m_anchorEdges;
};
class FixedPositionViewportConstraints : public ViewportConstraints {
public:
- FixedPositionViewportConstraints()
- { }
-
- FixedPositionViewportConstraints(const FixedPositionViewportConstraints& constraints)
- : ViewportConstraints(constraints)
- , m_viewportRectAtLastLayout(constraints.viewportRectAtLastLayout())
- , m_layerPositionAtLastLayout(constraints.layerPositionAtLastLayout())
- { }
-
- virtual ConstraintType constraintType() const OVERRIDE { return FixedPositionConstaint; };
-
FloatPoint layerPositionForViewportRect(const FloatRect& viewportRect) const;
const FloatRect& viewportRectAtLastLayout() const { return m_viewportRectAtLastLayout; }
@@ -105,6 +89,8 @@
bool operator!=(const FixedPositionViewportConstraints& other) const { return !(*this == other); }
private:
+ virtual ConstraintType constraintType() const OVERRIDE { return FixedPositionConstaint; };
+
FloatRect m_viewportRectAtLastLayout;
FloatPoint m_layerPositionAtLastLayout;
};
@@ -118,7 +104,6 @@
, m_bottomOffset(0)
{ }
- virtual ConstraintType constraintType() const OVERRIDE { return StickyPositionConstraint; };
FloatSize computeStickyOffset(const FloatRect& viewportRect) const;
const FloatSize stickyOffsetAtLastLayout() const { return m_stickyOffsetAtLastLayout; }
@@ -143,6 +128,8 @@
void setAbsoluteStickyBoxRect(const FloatRect& rect) { m_absoluteStickyBoxRect = rect; }
private:
+ virtual ConstraintType constraintType() const OVERRIDE { return StickyPositionConstraint; };
+
float m_leftOffset;
float m_rightOffset;
float m_topOffset;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
