Minor tweak to earlier patch. Use containsFloats instad.
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Aug 2006 05:41:43 +0000 (05:41 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Aug 2006 05:41:43 +0000 (05:41 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15795 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/rendering/RenderBlock.cpp

index df01119e2ece7cd22813d4a1f96e6b63fe0f8ea9..0b57c60bc1bc668d039f4dfc17b7ebfe3ac48d12 100644 (file)
                FAE04190097596C9000540BE /* SVGImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE0418E097596C9000540BE /* SVGImageLoader.h */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXBuildStyle section */
+               BCFE34870A82F16A00B598BE /* Development */ = {
+                       isa = PBXBuildStyle;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = NO;
+                       };
+                       name = Development;
+               };
+               BCFE34880A82F16A00B598BE /* Deployment */ = {
+                       isa = PBXBuildStyle;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = YES;
+                       };
+                       name = Deployment;
+               };
+/* End PBXBuildStyle section */
+
 /* Begin PBXContainerItemProxy section */
                DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
+                       buildSettings = {
+                       };
+                       buildStyles = (
+                               BCFE34870A82F16A00B598BE /* Development */,
+                               BCFE34880A82F16A00B598BE /* Deployment */,
+                       );
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
index d21eb1d1f8326d750d0ee2c3c359918ec3ae32d3..a69a7edda42318848567597f00855b9d8c5dc668 100644 (file)
@@ -2432,7 +2432,7 @@ void RenderBlock::markAllDescendantsWithFloatsForLayout(RenderObject* floatToRem
 int RenderBlock::getClearDelta(RenderObject *child)
 {
     // There is no need to compute clearance if we have no floats.
-    if (!m_floatingObjects)
+    if (!containsFloats())
         return 0;
     
     // At least one float is present.  We need to perform the clearance computation.