Changeset 77287 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Feb 1, 2011, 1:45:38 PM (14 years ago)

Author:

[email protected]

Message:

Part 2 for <rdar://problem/8492788>
Adopt WKScrollbarPainterController

Reviewed by Beth Dakin.

Use header detection to define scrollbar painting controller #define.

Source/JavaScriptCore:

• DerivedSources.make:
• JavaScriptCore.xcodeproj/project.pbxproj:

Source/WebCore:

• WebCore.exp.in:
• platform/mac/ScrollAnimatorMac.h:
• platform/mac/ScrollbarThemeMac.h:
• platform/mac/WebCoreSystemInterface.h:
• platform/mac/WebCoreSystemInterface.mm:

Source/WebKit/mac:

• WebCoreSupport/WebSystemInterface.mm:

(InitWebCoreSystemInterface):

Source/WebKit2:

• WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:

(InitWebCoreSystemInterface):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• DerivedSources.make (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-02-01  Sam Weinig  <[email protected]>
+
+        Reviewed by Beth Dakin.
+
+        Part 2 for <rdar://problem/8492788>
+        Adopt WKScrollbarPainterController
+
+        Use header detection to define scrollbar painting controller #define.
+
+        * DerivedSources.make:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+
 2011-02-01  Geoffrey Garen  <[email protected]>
 

trunk/Source/JavaScriptCore/DerivedSources.make

@@ -88 +88 @@
 # header detection
 
-HeaderDetection.h : DerivedSources.make
-        if [ -f $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders/pthread_machdep.h ]; then echo "#define HAVE_PTHREAD_MACHDEP_H 1" > $@; else echo > $@; fi
+HeaderDetection.h : DerivedSources.make /System/Library/CoreServices/SystemVersion.plist
+        rm -f $@
+        echo "/* This is a generated file. Do not edit. */" > $@
+        if [ -f $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders/pthread_machdep.h ]; then echo "#define HAVE_PTHREAD_MACHDEP_H 1" >> $@; else echo >> $@; fi
+        if [ -f $(SDKROOT)/System/Library/Frameworks/AppKit.framework/PrivateHeaders/NSScrollerImpPair_Private.h ]; then echo "#define USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER 1" >> $@; else echo >> $@; fi

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -535 +535 @@
                 BC756FC90E2031B200DE7D12 /* JSGlobalObjectFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = BC756FC70E2031B200DE7D12 /* JSGlobalObjectFunctions.h */; };
                 BC7F8FB90E19D1C3008632C0 /* JSNumberCell.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7F8FB80E19D1C3008632C0 /* JSNumberCell.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                BC8149EF12F8A1AE007B2C32 /* HeaderDetection.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8149AF12F89F53007B2C32 /* HeaderDetection.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 BC87CDB910712AD4000614CF /* JSONObject.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = BC87CDB810712ACA000614CF /* JSONObject.lut.h */; };
                 BC9041480EB9250900FE26FA /* StructureTransitionTable.h in Headers */ = {isa = PBXBuildFile; fileRef = BC9041470EB9250900FE26FA /* StructureTransitionTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1132 +1133 @@
                 BC7F8FB80E19D1C3008632C0 /* JSNumberCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNumberCell.h; sourceTree = "<group>"; };
                 BC7F8FBA0E19D1EF008632C0 /* JSCell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCell.cpp; sourceTree = "<group>"; };
+                BC8149AF12F89F53007B2C32 /* HeaderDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeaderDetection.h; sourceTree = "<group>"; };
                 BC87CDB810712ACA000614CF /* JSONObject.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONObject.lut.h; sourceTree = "<group>"; };
                 BC8F3CCF0DAF17BA00577A80 /* ConstructData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConstructData.h; sourceTree = "<group>"; };
@@ -1501 +1503 @@
                                 65B174BE09D1000200820339 /* chartables.c */,
                                 BCD203E70E1718F4002C7E82 /* DatePrototype.lut.h */,
+                                BC8149AF12F89F53007B2C32 /* HeaderDetection.h */,
                                 BC87CDB810712ACA000614CF /* JSONObject.lut.h */,
                                 BC18C52D0E16FCE100B34460 /* Lexer.lut.h */,
@@ -2438 +2441 @@
                                 E49DC16C12EF294E00184A1F /* SourceProviderCache.h in Headers */,
                                 E49DC16D12EF295300184A1F /* SourceProviderCacheItem.h in Headers */,
+                                BC8149EF12F8A1AE007B2C32 /* HeaderDetection.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;