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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@77287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 714535b3fd2d2ca68753afb6ceaf2d19656e984c..7a2d1cd99345dd5a17d7b3756de88104ac785b14 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01  Sam Weinig  <sam@webkit.org>
+
+        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  <ggaren@apple.com>
 
         Reviewed by Oliver Hunt.

diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make
index 748e2543dce236a4313b9ed9c057c7644ee97f19..8262761549ada246d40a6a8e9326f7b356dddfa5 100644 (file)
--- a/Source/JavaScriptCore/DerivedSources.make
+++ b/Source/JavaScriptCore/DerivedSources.make
@@ -87,5 +87,8 @@ JavaScriptCore.JSVALUE64.exp: JavaScriptCore.exp JavaScriptCore.JSVALUE64only.ex
 
 # 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

diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 0c5034bc66694cec09ea4a415e382e237939f4a6..b7cb8dc9268dfd80debf08163376060266cb5126 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -534,6 +534,7 @@
                BC6AAAE50E1F426500AD87D8 /* ClassInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6AAAE40E1F426500AD87D8 /* ClassInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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, ); }; };
                BC95437D0EBA70FD0072B6D3 /* PropertyMapHashTable.h in Headers */ = {isa = PBXBuildFile; fileRef = BC95437C0EBA70FD0072B6D3 /* PropertyMapHashTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1131,6 +1132,7 @@
                BC7952350E15EB5600A898AB /* BooleanPrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BooleanPrototype.h; sourceTree = "<group>"; };
                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>"; };
                BC9041470EB9250900FE26FA /* StructureTransitionTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StructureTransitionTable.h; sourceTree = "<group>"; };
@@ -1500,6 +1502,7 @@
                                BC18C5230E16FC8A00B34460 /* ArrayPrototype.lut.h */,
                                65B174BE09D1000200820339 /* chartables.c */,
                                BCD203E70E1718F4002C7E82 /* DatePrototype.lut.h */,
+                               BC8149AF12F89F53007B2C32 /* HeaderDetection.h */,
                                BC87CDB810712ACA000614CF /* JSONObject.lut.h */,
                                BC18C52D0E16FCE100B34460 /* Lexer.lut.h */,
                                BC18C5290E16FCC200B34460 /* MathObject.lut.h */,
@@ -2437,6 +2440,7 @@
                                A7DCB97312E5193F00911940 /* WriteBarrier.h in Headers */,
                                E49DC16C12EF294E00184A1F /* SourceProviderCache.h in Headers */,
                                E49DC16D12EF295300184A1F /* SourceProviderCacheItem.h in Headers */,
+                               BC8149EF12F8A1AE007B2C32 /* HeaderDetection.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 748f99b38d73ae3f55042bb0f772cdc39173a742..0d70b736eeee6ed2b0240f2dd6a7be99e320f67b 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-02-01  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Beth Dakin.
+
+        Part 2 for <rdar://problem/8492788>
+        Adopt WKScrollbarPainterController
+
+        Use header detection to define scrollbar painting controller #define.
+
+        * WebCore.exp.in:
+        * platform/mac/ScrollAnimatorMac.h:
+        * platform/mac/ScrollbarThemeMac.h:
+        * platform/mac/WebCoreSystemInterface.h:
+        * platform/mac/WebCoreSystemInterface.mm:
+
 2011-02-01  David Hyatt  <hyatt@apple.com>
 
         Reviewed by Oliver Hunt.

diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index 459cb83d36b365c230f5efb19f709a72fa702f2c..8978a8b529490d8f6c7324e24c51e2f6c70130c8 100644 (file)
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -1312,7 +1312,6 @@ _wkScrollbarThickness
 _wkSetScrollbarPainterKnobAlpha
 _wkMakeScrollbarPainter
 _wkMakeScrollbarReplacementPainter
-#if defined(USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER)
 _wkContentAreaDidHide
 _wkContentAreaDidShow
 _wkContentAreaResized
@@ -1329,7 +1328,6 @@ _wkVerticalScrollbarPainterForController
 _wkWillEndLiveResize
 _wkWillStartLiveResize
 #endif
-#endif
 
 #if ENABLE(3D_RENDERING)
 _WebCoreHas3DRendering

diff --git a/Source/WebCore/platform/mac/ScrollAnimatorMac.h b/Source/WebCore/platform/mac/ScrollAnimatorMac.h
index c969acabd7d11abe34dcbdef3ba9119241e76866..ccb8f29a47faa25747a7bd7937bde13dad835fc3 100644 (file)
--- a/Source/WebCore/platform/mac/ScrollAnimatorMac.h
+++ b/Source/WebCore/platform/mac/ScrollAnimatorMac.h
@@ -33,6 +33,7 @@
 #include "ScrollAnimator.h"
 #include "Timer.h"
 #include "WebCoreSystemInterface.h"
+#include <JavaScriptCore/HeaderDetection.h>
 #include <wtf/RetainPtr.h>
 
 #ifdef __OBJC__

diff --git a/Source/WebCore/platform/mac/ScrollbarThemeMac.h b/Source/WebCore/platform/mac/ScrollbarThemeMac.h
index b9894cdb3d117b6a66ced39694a4901408a62b3c..7bc66ab5706796813d1b0ee9fe11b7b831bcfbcf 100644 (file)
--- a/Source/WebCore/platform/mac/ScrollbarThemeMac.h
+++ b/Source/WebCore/platform/mac/ScrollbarThemeMac.h
@@ -28,6 +28,7 @@
 
 #include "ScrollbarThemeComposite.h"
 #include "WebCoreSystemInterface.h"
+#include <JavaScriptCore/HeaderDetection.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.h b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
index a50a8632550938f2c22cce169c0544bf296318b6..a4bd0135cb006d137b60ddda151a933fccc5f4c1 100644 (file)
--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.h
+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
@@ -202,7 +202,6 @@ extern void (*wkSetScrollbarPainterKnobAlpha)(WKScrollbarPainterRef, CGFloat);
 extern bool (*wkScrollbarPainterIsHorizontal)(WKScrollbarPainterRef);
 extern void (*wkScrollbarPainterSetOverlayState)(WKScrollbarPainterRef, int overlayScrollerState);
 
-#if defined(USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER)
 typedef struct __WKScrollbarPainterController *WKScrollbarPainterControllerRef;
 extern WKScrollbarPainterControllerRef (*wkMakeScrollbarPainterController)(id painterControllerDelegate);
 extern void (*wkSetPainterForPainterController)(WKScrollbarPainterControllerRef, WKScrollbarPainterRef, bool isHorizontal);
@@ -219,7 +218,6 @@ extern void (*wkContentAreaResized)(WKScrollbarPainterControllerRef);
 extern void (*wkWillEndLiveResize)(WKScrollbarPainterControllerRef);
 extern void (*wkContentAreaDidShow)(WKScrollbarPainterControllerRef);
 extern void (*wkContentAreaDidHide)(WKScrollbarPainterControllerRef);
-#endif
 
 extern bool (*wkScrollbarPainterUsesOverlayScrollers)(void);
 #endif

diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
index 01840d3342008184d5c8753b2ec29fa2ce9fc228..2c71db9f62253e2ee6c999c93625032f00bd2332 100644 (file)
--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
@@ -140,7 +140,6 @@ void (*wkSetScrollbarPainterKnobAlpha)(WKScrollbarPainterRef, CGFloat);
 bool (*wkScrollbarPainterIsHorizontal)(WKScrollbarPainterRef);
 void (*wkScrollbarPainterSetOverlayState)(WKScrollbarPainterRef, int overlayScrollerState);
 
-#if defined(USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER)
 WKScrollbarPainterControllerRef (*wkMakeScrollbarPainterController)(id painterControllerDelegate);
 void (*wkSetPainterForPainterController)(WKScrollbarPainterControllerRef, WKScrollbarPainterRef, bool isHorizontal);
 WKScrollbarPainterRef (*wkVerticalScrollbarPainterForController)(WKScrollbarPainterControllerRef);
@@ -156,7 +155,6 @@ void (*wkContentAreaResized)(WKScrollbarPainterControllerRef);
 void (*wkWillEndLiveResize)(WKScrollbarPainterControllerRef);
 void (*wkContentAreaDidShow)(WKScrollbarPainterControllerRef);
 void (*wkContentAreaDidHide)(WKScrollbarPainterControllerRef);
-#endif
 
 bool (*wkScrollbarPainterUsesOverlayScrollers)(void);
 #endif

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 41a0afadcfabb1fead827b3c7c199eab9ec5d491..71a714daecc45d10ac8db2649d637984cc121a66 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Beth Dakin.
+
+        Part 2 for <rdar://problem/8492788>
+        Adopt WKScrollbarPainterController
+
+        Use header detection to define scrollbar painting controller #define.
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
 2011-02-01  David Hyatt  <hyatt@apple.com>
 
         Reviewed by Oliver Hunt.

diff --git a/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm b/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
index ce32671303c5b3f867143c000f01c3f96c42b754..2f68d9dcbb1693360004a623176ff4d61c6af9e2 100644 (file)
--- a/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
@@ -133,7 +133,6 @@ void InitWebCoreSystemInterface(void)
     INIT(SetScrollbarPainterKnobAlpha);
     INIT(ScrollbarPainterIsHorizontal);
     INIT(ScrollbarPainterSetOverlayState);
-#if defined(USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER)
     INIT(MakeScrollbarPainterController);
     INIT(MakeScrollbarReplacementPainter);
     INIT(SetPainterForPainterController);
@@ -150,7 +149,6 @@ void InitWebCoreSystemInterface(void)
     INIT(WillEndLiveResize);
     INIT(ContentAreaDidShow);
     INIT(ContentAreaDidHide);
-#endif
     INIT(ScrollbarPainterUsesOverlayScrollers);
 #endif
 

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 8aadb0b2aaee3a9ba1cc9f7fb5769b0c61039366..0f2cf390c75d9d1d2c1e739d0f6a50d050b2f6b8 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Beth Dakin.
+
+        Part 2 for <rdar://problem/8492788>
+        Adopt WKScrollbarPainterController
+
+        Use header detection to define scrollbar painting controller #define.
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
 2011-02-01  David Hyatt  <hyatt@apple.com>
 
         Reviewed by Oliver Hunt.

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm b/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
index 8746cf7856e24dd38d05d0dd389427299ce5383c..c4b26c157d7c39d062032bd4b5f349a56c1bf2e6 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
@@ -107,7 +107,6 @@ void InitWebCoreSystemInterface(void)
         INIT(ScrollbarPainterIsHorizontal);
         INIT(ScrollbarPainterSetOverlayState);
         INIT(MakeScrollbarReplacementPainter);
-#if defined(USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER)
         INIT(MakeScrollbarPainterController);
         INIT(SetPainterForPainterController);
         INIT(VerticalScrollbarPainterForController);
@@ -123,7 +122,6 @@ void InitWebCoreSystemInterface(void)
         INIT(WillEndLiveResize);
         INIT(ContentAreaDidShow);
         INIT(ContentAreaDidHide);
-#endif
         INIT(ScrollbarPainterUsesOverlayScrollers);
 #else
         INIT(GetHyphenationLocationBeforeIndex);