Show
Ignore:
Timestamp:
08/06/08 13:29:36 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35588

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r427 r431  
    394394                2D9066060BE141D400956998 /* LayoutState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D9066040BE141D400956998 /* LayoutState.cpp */; }; 
    395395                2D9066070BE141D400956998 /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* LayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; }; 
     396                31288E720E3005D6003619AE /* WebKitCSSKeyframeRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31288E6E0E3005D6003619AE /* WebKitCSSKeyframeRule.cpp */; }; 
     397                31288E730E3005D6003619AE /* WebKitCSSKeyframeRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 31288E6F0E3005D6003619AE /* WebKitCSSKeyframeRule.h */; }; 
     398                31288E740E3005D6003619AE /* WebKitCSSKeyframesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31288E700E3005D6003619AE /* WebKitCSSKeyframesRule.cpp */; }; 
     399                31288E750E3005D6003619AE /* WebKitCSSKeyframesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 31288E710E3005D6003619AE /* WebKitCSSKeyframesRule.h */; }; 
    396400                31611E550E1C4D4A00F6A579 /* WebKitCSSTransformValue.idl in Resources */ = {isa = PBXBuildFile; fileRef = 31611E540E1C4D4A00F6A579 /* WebKitCSSTransformValue.idl */; }; 
    397401                31611E5A0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31611E580E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp */; }; 
    …… 
    38053809                BCB773620C17853D00132BA4 /* JSNodeFilterCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB7735F0C17853D00132BA4 /* JSNodeFilterCondition.h */; }; 
    38063810                BCB773630C17853D00132BA4 /* JSNodeFilterCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB773600C17853D00132BA4 /* JSNodeFilterCustom.cpp */; }; 
     3811                BCBD21AB0E417AD400A070F2 /* KURLHash.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBD21AA0E417AD400A070F2 /* KURLHash.h */; }; 
    38073812                BCBFB53C0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCBFB53A0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp */; }; 
    38083813                BCBFB53D0DCD29CF0019B3E5 /* JSDOMWindowShell.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBFB53B0DCD29CF0019B3E5 /* JSDOMWindowShell.h */; settings = {ATTRIBUTES = (Private, ); }; }; 
    …… 
    49134918                2D90660B0665D937006B6F1A /* ClipboardMac.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ClipboardMac.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 
    49144919                2D90660C0665D937006B6F1A /* ClipboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ClipboardMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 
     4920                31288E6E0E3005D6003619AE /* WebKitCSSKeyframeRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSKeyframeRule.cpp; sourceTree = "<group>"; }; 
     4921                31288E6F0E3005D6003619AE /* WebKitCSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSKeyframeRule.h; sourceTree = "<group>"; }; 
     4922                31288E700E3005D6003619AE /* WebKitCSSKeyframesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSKeyframesRule.cpp; sourceTree = "<group>"; }; 
     4923                31288E710E3005D6003619AE /* WebKitCSSKeyframesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSKeyframesRule.h; sourceTree = "<group>"; }; 
    49154924                31611E540E1C4D4A00F6A579 /* WebKitCSSTransformValue.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitCSSTransformValue.idl; sourceTree = "<group>"; }; 
    49164925                31611E580E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitCSSTransformValue.cpp; sourceTree = "<group>"; }; 
    …… 
    81768185                BCB7735F0C17853D00132BA4 /* JSNodeFilterCondition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSNodeFilterCondition.h; sourceTree = "<group>"; }; 
    81778186                BCB773600C17853D00132BA4 /* JSNodeFilterCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeFilterCustom.cpp; sourceTree = "<group>"; }; 
     8187                BCBD21AA0E417AD400A070F2 /* KURLHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KURLHash.h; sourceTree = "<group>"; }; 
    81788188                BCBFB53A0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMWindowShell.cpp; sourceTree = "<group>"; }; 
    81798189                BCBFB53B0DCD29CF0019B3E5 /* JSDOMWindowShell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowShell.h; sourceTree = "<group>"; }; 
    …… 
    83438353                DB23C2CA0A508D29002489EB /* IndentOutdentCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IndentOutdentCommand.h; sourceTree = "<group>"; }; 
    83448354                DD05FE0B0B8BA3C6009ACDFE /* WebCoreObjCExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreObjCExtras.h; sourceTree = "<group>"; }; 
    8345                 DD05FE0C0B8BA3C6009ACDFE /* WebCoreObjCExtras.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = WebCoreObjCExtras.c; sourceTree = "<group>"; }; 
     8355                DD05FE0C0B8BA3C6009ACDFE /* WebCoreObjCExtras.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WebCoreObjCExtras.c; sourceTree = "<group>"; }; 
    83468356                DD763BB10992C2C900740B8E /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = /usr/lib/libxml2.dylib; sourceTree = "<absolute>"; }; 
    83478357                E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomXPathNSResolver.h; sourceTree = "<group>"; }; 
    …… 
    1261612626                                6593923509AE4346002C531F /* KURL.cpp */, 
    1261712627                                6593923609AE4346002C531F /* KURL.h */, 
     12628                                BCBD21AA0E417AD400A070F2 /* KURLHash.h */, 
    1261812629                                85EC9AF90A71A2C600EEEAED /* Language.h */, 
    1261912630                                935207BD09BD410A00F2038D /* LocalizedStrings.h */, 
    …… 
    1275812769                        isa = PBXGroup; 
    1275912770                        children = ( 
    12760                                 31611E540E1C4D4A00F6A579 /* WebKitCSSTransformValue.idl */, 
    1276112771                                A80E6CDA0A1989CA007FB8C5 /* Counter.h */, 
    1276212772                                930705C709E0C95F00B17FE4 /* Counter.idl */, 
    …… 
    1284812858                                BC80C9850CD294EE00A0B7B3 /* CSSTimingFunctionValue.cpp */, 
    1284912859                                BC80C9860CD294EE00A0B7B3 /* CSSTimingFunctionValue.h */, 
    12850                                 BC9ADD7F0CC4092200098C4C /* WebKitCSSTransformValue.cpp */, 
    12851                                 BC9ADD220CC4032600098C4C /* WebKitCSSTransformValue.h */, 
    1285212860                                371F53E80D2704F900ECE0D5 /* CSSUnicodeRangeValue.cpp */, 
    1285312861                                371F53E70D2704F900ECE0D5 /* CSSUnicodeRangeValue.h */, 
    …… 
    1291312921                                93CA4CA309DF93FA00DF8677 /* tokenizer.flex */, 
    1291412922                                BC5EC1760A507E3E006007F5 /* view-source.css */, 
     12923                                31288E6E0E3005D6003619AE /* WebKitCSSKeyframeRule.cpp */, 
     12924                                31288E6F0E3005D6003619AE /* WebKitCSSKeyframeRule.h */, 
     12925                                31288E700E3005D6003619AE /* WebKitCSSKeyframesRule.cpp */, 
     12926                                31288E710E3005D6003619AE /* WebKitCSSKeyframesRule.h */, 
     12927                                BC9ADD7F0CC4092200098C4C /* WebKitCSSTransformValue.cpp */, 
     12928                                BC9ADD220CC4032600098C4C /* WebKitCSSTransformValue.h */, 
     12929                                31611E540E1C4D4A00F6A579 /* WebKitCSSTransformValue.idl */, 
    1291512930                        ); 
    1291612931                        path = css; 
    …… 
    1529915314                                BCDFD48E0E305290009D10AD /* XMLHttpRequestUpload.h in Headers */, 
    1530015315                                BCDFD4960E30592F009D10AD /* JSXMLHttpRequestUpload.h in Headers */, 
     15316                                BCBD21AB0E417AD400A070F2 /* KURLHash.h in Headers */, 
     15317                                31288E730E3005D6003619AE /* WebKitCSSKeyframeRule.h in Headers */, 
     15318                                31288E750E3005D6003619AE /* WebKitCSSKeyframesRule.h in Headers */, 
    1530115319                        ); 
    1530215320                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    1706917087                                BCDFD4920E3056BD009D10AD /* JSXMLHttpRequestUploadCustom.cpp in Sources */, 
    1707017088                                BCDFD4950E30592F009D10AD /* JSXMLHttpRequestUpload.cpp in Sources */, 
     17089                                31288E720E3005D6003619AE /* WebKitCSSKeyframeRule.cpp in Sources */, 
     17090                                31288E740E3005D6003619AE /* WebKitCSSKeyframesRule.cpp in Sources */, 
    1707117091                        ); 
    1707217092                        runOnlyForDeploymentPostprocessing = 0;