Changeset 17687 in webkit

Timestamp:

Nov 9, 2006 7:41:25 AM (17 years ago)

Author:

darin

Message:

• improved version of last night's build fix (should not do using namespace in a header)

• rendering/RenderObject.h:
• rendering/RenderObject.cpp: (WebCore::RenderObject::maxTopMargin): (WebCore::RenderObject::maxBottomMargin):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (2 diffs)
• rendering/RenderObject.h (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-09  Darin Adler  <darin@apple.com>
+
+        - improved version of last night's build fix (should not do using namespace in a header)
+
+        * rendering/RenderObject.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::maxTopMargin):
+        (WebCore::RenderObject::maxBottomMargin):
+
 2006-11-08  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/rendering/RenderObject.cpp

@@ -3087 +3087 @@
 int RenderObject::previousOffset(int current) const
 {
-    int previousOffset = current - 1;
-    return previousOffset;
+    return current - 1;
 }
 
 int RenderObject::nextOffset(int current) const
 {
-    int nextOffset = current + 1;
-    return nextOffset;
+    return current + 1;
 }
 
@@ -3100 +3098 @@
 {
     return inlineBoxWrapper();
+}
+
+int RenderObject::maxTopMargin(bool positive) const
+{
+    return positive ? max(0, marginTop()) : min(0, -marginTop());
+}
+
+int RenderObject::maxBottomMargin(bool positive) const
+{
+    return positive ? max(0, marginBottom()) : min(0, -marginBottom());
 }
 

trunk/WebCore/rendering/RenderObject.h

@@ -29 +29 @@
 
 #include "CachedResourceClient.h"
+#if 0
 #include "DeprecatedValueList.h"
 #include "RenderStyle.h"
@@ -35 +36 @@
 #include <algorithm>
 #include <wtf/HashMap.h>
-
-using namespace std;
-
-/*
- *  The painting of a layer occurs in three distinct phases.  Each phase involves
- *  a recursive descent into the layer's render objects. The first phase is the background phase.
- *  The backgrounds and borders of all blocks are painted.  Inlines are not painted at all.
- *  Floats must paint above block backgrounds but entirely below inline content that can overlap them.
- *  In the foreground phase, all inlines are fully painted.  Inline replaced elements will get all
- *  three phases invoked on them during this phase.
- */
+#endif
+#include "PlatformString.h"
 
 namespace WebCore {
@@ -77 +69 @@
 struct HitTestRequest;
 
+/*
+ *  The painting of a layer occurs in three distinct phases.  Each phase involves
+ *  a recursive descent into the layer's render objects. The first phase is the background phase.
+ *  The backgrounds and borders of all blocks are painted.  Inlines are not painted at all.
+ *  Floats must paint above block backgrounds but entirely below inline content that can overlap them.
+ *  In the foreground phase, all inlines are fully painted.  Inline replaced elements will get all
+ *  three phases invoked on them during this phase.
+ */
+
 enum PaintPhase {
     PaintPhaseBlockBackground,
@@ -657 +658 @@
     virtual bool isBottomMarginQuirk() const { return false; }
 
-    virtual int maxTopMargin(bool positive) const { return positive ? max(0, marginTop()) : min(0, -marginTop()); }
-    virtual int maxBottomMargin(bool positive) const { return positive ? max(0, marginBottom()) : min(0, -marginBottom()); }
+    virtual int maxTopMargin(bool positive) const;
+    virtual int maxBottomMargin(bool positive) const;
 
     virtual int marginTop() const { return 0; }