[webkit-changes] cvs commit: WebCore/khtml/rendering
render_layer.cpp render_layer.h
Adele
adele at opensource.apple.com
Thu Nov 3 12:00:58 PST 2005
adele 05/11/03 12:00:57
Modified: . ChangeLog
khtml/rendering render_layer.cpp render_layer.h
Log:
Reviewed by Darin.
* khtml/rendering/render_layer.cpp:
(khtml::): Made global ScrollAlignment members const
(khtml::RenderLayer::scrollRectToVisible): Changed ScrollAlignment parameters to const ScrollAlignment&
(khtml::RenderLayer::getRectToExpose): ditto.
* khtml/rendering/render_layer.h:
(khtml::RenderLayer::): removed typedefs
(khtml::RenderLayer::getVisibleBehavior): Made this static.
(khtml::RenderLayer::getPartialBehavior): ditto.
(khtml::RenderLayer::getHiddenBehavior): ditto.
Revision Changes Path
1.331 +14 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- ChangeLog 3 Nov 2005 19:12:00 -0000 1.330
+++ ChangeLog 3 Nov 2005 20:00:51 -0000 1.331
@@ -1,5 +1,19 @@
2005-11-03 Adele Peterson <adele at apple.com>
+ Reviewed by Darin.
+
+ * khtml/rendering/render_layer.cpp:
+ (khtml::): Made global ScrollAlignment members const
+ (khtml::RenderLayer::scrollRectToVisible): Changed ScrollAlignment parameters to const ScrollAlignment&
+ (khtml::RenderLayer::getRectToExpose): ditto.
+ * khtml/rendering/render_layer.h:
+ (khtml::RenderLayer::): removed typedefs
+ (khtml::RenderLayer::getVisibleBehavior): Made this static.
+ (khtml::RenderLayer::getPartialBehavior): ditto.
+ (khtml::RenderLayer::getHiddenBehavior): ditto.
+
+2005-11-03 Adele Peterson <adele at apple.com>
+
Reviewed by Hyatt.
Clean up of layer scrolling code. Now we can clearly define what to do if a rectangle is fully visible, partially visible, or hidden.
1.122 +7 -7 WebCore/khtml/rendering/render_layer.cpp
Index: render_layer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- render_layer.cpp 3 Nov 2005 19:12:04 -0000 1.121
+++ render_layer.cpp 3 Nov 2005 20:00:57 -0000 1.122
@@ -82,11 +82,11 @@
static bool inRenderLayerDestroy;
#endif
-RenderLayer::ScrollAlignment RenderLayer::gAlignCenterIfNeeded = { RenderLayer::noScroll, RenderLayer::alignCenter, RenderLayer::alignToClosestEdge };
-RenderLayer::ScrollAlignment RenderLayer::gAlignToEdgeIfNeeded = { RenderLayer::noScroll, RenderLayer::alignToClosestEdge, RenderLayer::alignToClosestEdge };
-RenderLayer::ScrollAlignment RenderLayer::gAlignCenterAlways = { RenderLayer::alignCenter, RenderLayer::alignCenter, RenderLayer::alignCenter };
-RenderLayer::ScrollAlignment RenderLayer::gAlignTopAlways = { RenderLayer::alignTop, RenderLayer::alignTop, RenderLayer::alignTop };
-RenderLayer::ScrollAlignment RenderLayer::gAlignBottomAlways = { RenderLayer::alignBottom, RenderLayer::alignBottom, RenderLayer::alignBottom };
+const RenderLayer::ScrollAlignment RenderLayer::gAlignCenterIfNeeded = { RenderLayer::noScroll, RenderLayer::alignCenter, RenderLayer::alignToClosestEdge };
+const RenderLayer::ScrollAlignment RenderLayer::gAlignToEdgeIfNeeded = { RenderLayer::noScroll, RenderLayer::alignToClosestEdge, RenderLayer::alignToClosestEdge };
+const RenderLayer::ScrollAlignment RenderLayer::gAlignCenterAlways = { RenderLayer::alignCenter, RenderLayer::alignCenter, RenderLayer::alignCenter };
+const RenderLayer::ScrollAlignment RenderLayer::gAlignTopAlways = { RenderLayer::alignTop, RenderLayer::alignTop, RenderLayer::alignTop };
+const RenderLayer::ScrollAlignment RenderLayer::gAlignBottomAlways = { RenderLayer::alignBottom, RenderLayer::alignBottom, RenderLayer::alignBottom };
void* ClipRects::operator new(size_t sz, RenderArena* renderArena) throw()
{
@@ -557,7 +557,7 @@
}
}
-void RenderLayer::scrollRectToVisible(const QRect &rect, ScrollAlignment alignX, ScrollAlignment alignY)
+void RenderLayer::scrollRectToVisible(const QRect &rect, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
{
RenderLayer* parentLayer = 0;
QRect newRect = rect;
@@ -603,7 +603,7 @@
parentLayer->scrollRectToVisible(newRect, alignX, alignY);
}
-QRect RenderLayer::getRectToExpose(const QRect &visibleRect, const QRect &exposeRect, ScrollAlignment alignX, ScrollAlignment alignY) {
+QRect RenderLayer::getRectToExpose(const QRect &visibleRect, const QRect &exposeRect, const ScrollAlignment& alignX, const ScrollAlignment& alignY) {
int x, y, w, h;
x = exposeRect.x();
1.57 +15 -15 WebCore/khtml/rendering/render_layer.h
Index: render_layer.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- render_layer.h 3 Nov 2005 19:12:04 -0000 1.56
+++ render_layer.h 3 Nov 2005 20:00:57 -0000 1.57
@@ -159,7 +159,7 @@
class RenderLayer
{
public:
- typedef enum {
+ enum ScrollBehavior {
noScroll,
alignCenter,
alignTop,
@@ -167,23 +167,23 @@
alignLeft,
alignRight,
alignToClosestEdge
- } ScrollBehavior;
+ };
- typedef struct {
+ struct ScrollAlignment {
ScrollBehavior m_rectVisible;
ScrollBehavior m_rectHidden;
ScrollBehavior m_rectPartial;
- } ScrollAlignment;
+ };
- static ScrollAlignment gAlignCenterIfNeeded;
- static ScrollAlignment gAlignToEdgeIfNeeded;
- static ScrollAlignment gAlignCenterAlways;
- static ScrollAlignment gAlignTopAlways;
- static ScrollAlignment gAlignBottomAlways;
-
- ScrollBehavior getVisibleBehavior(ScrollAlignment s) { return s.m_rectVisible; }
- ScrollBehavior getPartialBehavior(ScrollAlignment s) { return s.m_rectPartial; }
- ScrollBehavior getHiddenBehavior(ScrollAlignment s) { return s.m_rectHidden; }
+ static const ScrollAlignment gAlignCenterIfNeeded;
+ static const ScrollAlignment gAlignToEdgeIfNeeded;
+ static const ScrollAlignment gAlignCenterAlways;
+ static const ScrollAlignment gAlignTopAlways;
+ static const ScrollAlignment gAlignBottomAlways;
+
+ static ScrollBehavior getVisibleBehavior(const ScrollAlignment& s) { return s.m_rectVisible; }
+ static ScrollBehavior getPartialBehavior(const ScrollAlignment& s) { return s.m_rectPartial; }
+ static ScrollBehavior getHiddenBehavior(const ScrollAlignment& s) { return s.m_rectHidden; }
#ifdef APPLE_CHANGES
static QScrollBar* gScrollBar;
@@ -247,8 +247,8 @@
void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true);
void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); }
void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); }
- void scrollRectToVisible(const QRect &r, ScrollAlignment alignX = gAlignCenterIfNeeded, ScrollAlignment alignY = gAlignCenterIfNeeded);
- QRect getRectToExpose(const QRect &visibleRect, const QRect &exposeRect, ScrollAlignment alignX, ScrollAlignment alignY);
+ void scrollRectToVisible(const QRect &r, const ScrollAlignment& alignX = gAlignCenterIfNeeded, const ScrollAlignment& alignY = gAlignCenterIfNeeded);
+ QRect getRectToExpose(const QRect &visibleRect, const QRect &exposeRect, const ScrollAlignment& alignX, const ScrollAlignment& alignY);
void setHasHorizontalScrollbar(bool hasScrollbar);
void setHasVerticalScrollbar(bool hasScrollbar);
QScrollBar* horizontalScrollbar() { return m_hBar; }
More information about the webkit-changes
mailing list