Commit d0d95afb authored by justing's avatar justing

Rolling out my previous checkin, as the compiler bug still exists on Leopard.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@20930 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6e8e42c7
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
......@@ -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;
......
......@@ -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);
......
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
......
......@@ -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];
}
}
......
......@@ -1334,6 +1334,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
knownRegions = (
English,
......@@ -1348,6 +1349,7 @@
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
projectRoot = "";
shouldCheckCompatibility = 1;
targets = (
9398100A0824BF01008DF038 /* WebKit */,
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment