Changeset 20930 in webkit


Ignore:
Timestamp:
Apr 17, 2007 8:50:25 PM (17 years ago)
Author:
justing
Message:

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

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r20927 r20930  
    1 2007-04-17  Justin Garcia  <justin.garcia@apple.com>
    2 
    3         Reviewed by adam
    4 
    5         Removed workarounds for compiler bug 4213314.
    6 
    7         * platform/mac/CursorMac.mm:
    8         (WebCore::leakNamedCursor):
    9         * platform/mac/ScrollViewMac.mm:
    10         (WebCore::ScrollView::resizeContents):
    11         (WebCore::ScrollView::contentsToWindow):
    12         (WebCore::ScrollView::windowToContents):
    13 
    1412007-04-17  Justin Garcia  <justin.garcia@apple.com>
    152

  • trunk/WebCore/platform/mac/CursorMac.mm

    r20927 r20930  
    6767    NSCursor* cursor = 0;
    6868    if (cursorImage) {
    69         cursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:NSMakePoint(x, y)];
     69        NSPoint hotSpotPoint = {x, y}; // workaround for 4213314
     70        cursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:hotSpotPoint];
    7071        [cursorImage release];
    7172    }

  • trunk/WebCore/platform/mac/ScrollViewMac.mm

    r20927 r20930  
    335335            _h = 0;
    336336           
    337         [view setFrameSize:NSMakeSize(_w, _h)];
     337        NSSize tempSize = { _w, _h }; // workaround for 4213314
     338        [view setFrameSize:tempSize];
    338339    } else {
    339340        resize (_w, _h);
    … …  
    392393        view = docView;
    393394   
    394     NSPoint np = [view convertPoint:contentsPoint toView: nil];
     395    NSPoint tempPoint = { contentsPoint.x(), contentsPoint.y() }; // workaround for 4213314
     396    NSPoint np = [view convertPoint:tempPoint toView: nil];
    395397    return IntPoint(np);
    396398
    … …  
    411413        view = docView;
    412414   
    413     NSPoint np = [view convertPoint:point fromView: nil];
     415    NSPoint tempPoint = { point.x(), point.y() }; // workaround for 4213314
     416    NSPoint np = [view convertPoint:tempPoint fromView: nil];
    414417
    415418    return IntPoint(np);

  • trunk/WebKit/ChangeLog

    r20927 r20930  
    1 2007-04-17  Justin Garcia  <justin.garcia@apple.com>
    2 
    3         Reviewed by adam
    4        
    5         Removed workarounds for compiler bug 4213314.
    6 
    7         * Misc/WebNSAttributedStringExtras.mm:
    8         (+[NSAttributedString _web_attributedStringFromRange:]):
    9         * WebKit.xcodeproj/project.pbxproj:
    10 
    1112007-04-17  John Sullivan  <sullivan@apple.com>
    122

  • trunk/WebKit/Misc/WebNSAttributedStringExtras.mm

    r20927 r20930  
    426426                   
    427427                    NSURL *URL = kURL.getNSURL();
    428                     [result addAttribute:NSLinkAttributeName value:URL range:NSMakeRange(linkStartLocation, [result length] - linkStartLocation)];
     428                    NSRange tempRange = { linkStartLocation, [result length]-linkStartLocation }; // workaround for 4213314
     429                    [result addAttribute:NSLinkAttributeName value:URL range:tempRange];
    429430                    linkStartNode = 0;
    430431                }
    … …  
    544545                        [[[NSTextTab alloc] initWithType:NSLeftTabStopType location:rx] autorelease],
    545546                        nil]];
    546             [result addAttribute:NSParagraphStyleAttributeName value:mps range:NSMakeRange(info.start, info.end - info.start)];
     547            NSRange tempRange = { info.start, info.end-info.start }; // workaround for 4213314
     548            [result addAttribute:NSParagraphStyleAttributeName value:mps range:tempRange];
    547549            [mps release];
    548550        }

  • trunk/WebKit/WebKit.xcodeproj/project.pbxproj

    r20927 r20930  
    13351335                        isa = PBXProject;
    13361336                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
     1337                        compatibilityVersion = "Xcode 2.4";
    13371338                        hasScannedForEncodings = 1;
    13381339                        knownRegions = (
    … …  
    13491350                        projectDirPath = "";
    13501351                        projectRoot = "";
     1352                        shouldCheckCompatibility = 1;
    13511353                        targets = (
    13521354                                9398100A0824BF01008DF038 /* WebKit */,
Note: See TracChangeset for help on using the changeset viewer.