Rolling out my previous checkin, as the compiler bug still exists on Leopard.
authorjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Apr 2007 03:50:25 +0000 (03:50 +0000)
committerjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Apr 2007 03:50:25 +0000 (03:50 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@20930 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/mac/CursorMac.mm
WebCore/platform/mac/ScrollViewMac.mm
WebKit/ChangeLog
WebKit/Misc/WebNSAttributedStringExtras.mm
WebKit/WebKit.xcodeproj/project.pbxproj

index 486a66025648c83b8d3d180cbf203a910b52d2c4..1f0792526c00245886f1317d2c7c1ef986dfee75 100644 (file)
@@ -1,16 +1,3 @@
-2007-04-17  Justin Garcia  <justin.garcia@apple.com>
-
-        Reviewed by adam
-
-        Removed workarounds for compiler bug 4213314.
-
-        * platform/mac/CursorMac.mm:
-        (WebCore::leakNamedCursor):
-        * platform/mac/ScrollViewMac.mm:
-        (WebCore::ScrollView::resizeContents):
-        (WebCore::ScrollView::contentsToWindow):
-        (WebCore::ScrollView::windowToContents):
-
 2007-04-17  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by harrison
index 8943491ff9c56974afa7eee3f8976f1f1f9b6f65..0fe1add07e5a6618cf746cf683214c97192ba95f 100644 (file)
@@ -66,7 +66,8 @@ static NSCursor* leakNamedCursor(const char* name, int x, int y)
     [resourceName release];
     NSCursor* cursor = 0;
     if (cursorImage) {
-        cursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:NSMakePoint(x, y)];
+        NSPoint hotSpotPoint = {x, y}; // workaround for 4213314
+        cursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:hotSpotPoint];
         [cursorImage release];
     }
     return cursor;
index c5a2ac6f16541e5d1d2b11f3bd4e37e345933672..42f16f33766f1e497e146c3eeecd093de16b0d4b 100644 (file)
@@ -334,7 +334,8 @@ void ScrollView::resizeContents(int w, int h)
         if (_h < 0)
             _h = 0;
             
-        [view setFrameSize:NSMakeSize(_w, _h)];
+        NSSize tempSize = { _w, _h }; // workaround for 4213314
+        [view setFrameSize:tempSize];
     } else {
         resize (_w, _h);
     }
@@ -391,7 +392,8 @@ IntPoint ScrollView::contentsToWindow(const IntPoint& contentsPoint) const
     if (docView)
         view = docView;
     
-    NSPoint np = [view convertPoint:contentsPoint toView: nil];
+    NSPoint tempPoint = { contentsPoint.x(), contentsPoint.y() }; // workaround for 4213314
+    NSPoint np = [view convertPoint:tempPoint toView: nil];
     return IntPoint(np);
 
     END_BLOCK_OBJC_EXCEPTIONS;
@@ -410,7 +412,8 @@ IntPoint ScrollView::windowToContents(const IntPoint& point) const
     if (docView)
         view = docView;
     
-    NSPoint np = [view convertPoint:point fromView: nil];
+    NSPoint tempPoint = { point.x(), point.y() }; // workaround for 4213314
+    NSPoint np = [view convertPoint:tempPoint fromView: nil];
 
     return IntPoint(np);
 
index 60780c6f99ad52b2df2a5c922b29c52da46e08ef..6013cf1051307c9fe519e1d62f47a17408199878 100644 (file)
@@ -1,13 +1,3 @@
-2007-04-17  Justin Garcia  <justin.garcia@apple.com>
-
-        Reviewed by adam
-        
-        Removed workarounds for compiler bug 4213314.
-
-        * Misc/WebNSAttributedStringExtras.mm:
-        (+[NSAttributedString _web_attributedStringFromRange:]):
-        * WebKit.xcodeproj/project.pbxproj:
-
 2007-04-17  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Tim Hatcher
index fcb55cf5fc5f164328db32970062e7064fabda51..bc58f85d47271c725831d654f36a95d40dced2ba 100644 (file)
@@ -425,7 +425,8 @@ static NSFileWrapper *fileWrapperForElement(Element* e)
                     KURL kURL = linkStartNode->document()->frame()->loader()->completeURL(href.deprecatedString());
                     
                     NSURL *URL = kURL.getNSURL();
-                    [result addAttribute:NSLinkAttributeName value:URL range:NSMakeRange(linkStartLocation, [result length] - linkStartLocation)];
+                    NSRange tempRange = { linkStartLocation, [result length]-linkStartLocation }; // workaround for 4213314
+                    [result addAttribute:NSLinkAttributeName value:URL range:tempRange];
                     linkStartNode = 0;
                 }
             }
@@ -543,7 +544,8 @@ static NSFileWrapper *fileWrapperForElement(Element* e)
                         [[[NSTextTab alloc] initWithType:NSRightTabStopType location:rx-(pointSize*2/3)] autorelease],
                         [[[NSTextTab alloc] initWithType:NSLeftTabStopType location:rx] autorelease],
                         nil]];
-            [result addAttribute:NSParagraphStyleAttributeName value:mps range:NSMakeRange(info.start, info.end - info.start)];
+            NSRange tempRange = { info.start, info.end-info.start }; // workaround for 4213314
+            [result addAttribute:NSParagraphStyleAttributeName value:mps range:tempRange];
             [mps release];
         }
     }
index ce1c14b2002f540b1be3c889bd2b152a455b1642..567821f95e1adab90830029d56f042f2eefdf2e5 100644 (file)
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
                        projectRoot = "";
+                       shouldCheckCompatibility = 1;
                        targets = (
                                9398100A0824BF01008DF038 /* WebKit */,
                        );