Include AvailabilityMacros.h only where it is used.

Include AvailabilityMacros.h only where it is used.

This is part of a larger effort to try to get rid of wtf/Platform.h.

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=152901

[lgombos, 2013-06-21 01:50:41]

After this CL the only remaining include in Platform.h is Compiler.h, which will
be addressed in a follow-up patch.

[abarth-chromium, 2013-06-21 02:32:00]

Lgtm

On Thursday, June 20, 2013,  <l.gombos@samsung.com> wrote:
> Reviewers: abarth,
>
> Message:
> After this CL the only remaining include in Platform.h is Compiler.h,
which will
> be addressed in a follow-up patch.
>
>
> Description:
> Include AvailabilityMacros.h only where it is used.
>
> This is part of a larger effort to try to get rid of wtf/Platform.h.
>
> Please review this at https://codereview.chromium.org/16963006/
>
> SVN Base: https://chromium.googlesource.com/chromium/blink.git@master
>
> Affected files:
>   M Source/WebKit/chromium/src/mac/WebInputEventFactory.mm
>   M Source/core/platform/graphics/cocoa/FontPlatformDataCocoa.mm
>   M Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
>   M Source/core/platform/mac/EmptyProtocolDefinitions.h
>   M Source/core/platform/mac/NSScrollerImpDetails.h
>   M Source/core/platform/text/cf/HyphenationCF.cpp
>   M Source/core/rendering/RenderThemeChromiumMac.mm
>   M Source/wtf/Assertions.cpp
>   M Source/wtf/FastMalloc.cpp
>   M Source/wtf/Platform.h
>   M Tools/DumpRenderTree/chromium/LayoutTestHelper.mm
>
>
> Index: Source/WebKit/chromium/src/mac/WebInputEventFactory.mm
> diff --git a/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm
b/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm
> index
05546cc5d0332c572ff31f093d03398dc042eab9..dfd185ec2c17166dc096981d9b717af4cf55964b
100644
> --- a/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm
> +++ b/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm
> @@ -28,6 +28,7 @@
>  #include "WebInputEventFactory.h"
>
>  #include <ApplicationServices/ApplicationServices.h>
> +#import <AvailabilityMacros.h>
>  #import <Cocoa/Cocoa.h>
>
>  #include "WebInputEvent.h"
> Index: Source/core/platform/graphics/cocoa/FontPlatformDataCocoa.mm
> diff --git a/Source/core/platform/graphics/cocoa/FontPlatformDataCocoa.mm
b/Source/core/platform/graphics/cocoa/FontPlatformDataCocoa.mm
> index
ac239fa24ac43995573ee29dd379c9833b5f1263..aa7a5e72bbafa542c7a8ebc2d04235b123075013
100644
> --- a/Source/core/platform/graphics/cocoa/FontPlatformDataCocoa.mm
> +++ b/Source/core/platform/graphics/cocoa/FontPlatformDataCocoa.mm
> @@ -25,6 +25,7 @@
>  #import "core/platform/graphics/FontPlatformData.h"
>
>  #import <AppKit/NSFont.h>
> +#import <AvailabilityMacros.h>
>  #import <wtf/text/WTFString.h>
>
>  #if OS(DARWIN)
> Index: Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
> diff --git
a/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
b/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
> index
c0f2606f4e474e95382614be9ce8eeba14084cfc..e5c514b058809bf0868d3f78205704a8e435f4dd
100644
> --- a/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
> +++ b/Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm
> @@ -31,6 +31,7 @@
>  #include "core/platform/graphics/TextRun.h"
>
>  #include <ApplicationServices/ApplicationServices.h>
> +#import <AvailabilityMacros.h>
>
>  // Forward declare Mac SPIs.
>  extern "C" {
> Index: Source/core/platform/mac/EmptyProtocolDefinitions.h
> diff --git a/Source/core/platform/mac/EmptyProtocolDefinitions.h
b/Source/core/platform/mac/EmptyProtocolDefinitions.h
> index
016adb50e378096e47f49e2b51fcb5317e8be5c3..46e265b859930de32cd49388534d1c7c1437bb94
100644
> --- a/Source/core/platform/mac/EmptyProtocolDefinitions.h
> +++ b/Source/core/platform/mac/EmptyProtocolDefinitions.h
> @@ -25,6 +25,8 @@
>
>  #if defined(__OBJC__)
>
> +#import <AvailabilityMacros.h>
> +
>  #define EMPTY_PROTOCOL(NAME) \
>  @protocol NAME <NSObject> \
>  @end
> Index: Source/core/platform/mac/NSScrollerImpDetails.h
> diff --git a/Source/core/platform/mac/NSScrollerImpDetails.h
b/Source/core/platform/mac/NSScrollerImpDetails.h
> index
08744f2b9438b98078afdfe5b50d2103fdc8922f..309e2d25960970edd0fcfcf5bb2998f65e1d0a5e
100644
> --- a/Source/core/platform/mac/NSScrollerImpDetails.h
> +++ b/Source/core/platform/mac/NSScrollerImpDetails.h
> @@ -27,6 +27,7 @@
>  #define WebCore_NSScrollerImpDetails_h
>
>  #include "config.h"
> +#import <AvailabilityMacros.h>
>
>  // Public APIs not available on versions of Mac on which we build
>  #if __MAC_OS_X_VERSION_MAX_ALLOWED == 1060
> Index: Source/core/platform/text/cf/HyphenationCF.cpp
> diff --git a/Source/core/platform/text/cf/HyphenationCF.cpp
b/Source/core/platform/text/cf/HyphenationCF.cpp
> index
16ca003ab0cd5225f49910c8c543c269cae329d2..821dbc8aa056c20a795bdff77b79ef6f93589c2f
100644
> --- a/Source/core/platform/text/cf/HyphenationCF.cpp
> +++ b/Source/core/platform/text/cf/HyphenationCF.cpp
> @@ -25,6 +25,7 @@
>
>  #include "config.h"
>  #include "core/platform/text/Hyphenation.h"
> +#include <AvailabilityMacros.h>
>
>  #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
>
> Index: Source/core/rendering/RenderThemeChromiumMac.mm
> diff --git a/Source/core/rendering/RenderThemeChromiumMac.mm
b/Source/core/rendering/RenderThemeChromiumMac.mm
> index
d1995793d08be66eb6eb2a1a4335c1e5fa060aa0..b2920c1f1adcc4cfd298f0c192c18d684e39fc77
100644
> --- a/Source/core/rendering/RenderThemeChromiumMac.mm
> +++ b/Source/core/rendering/RenderThemeChromiumMac.mm
> @@ -58,6 +58,7 @@
>  #import "core/rendering/RenderSlider.h"
>  #import "core/rendering/RenderView.h"
>
> +#import <AvailabilityMacros.h>
>  #import <Carbon/Carbon.h>
>  #import <Cocoa/Cocoa.h>
>  #import <math.h>
> Index: Source/wtf/Assertions.cpp
> diff --git a/Source/wtf/Assertions.cpp b/Source/wtf/Assertions.cpp
> index
ab44a09495095f212b0eb65006c8557108c29419..acf6be01a635b8c1b95b89d4309ecd73db2cddc9
100644
> --- a/Source/wtf/Assertions.cpp
> +++ b/Source/wtf/Assertions.cpp
> @@ -46,6 +46,7 @@
>  #endif
>
>  #if USE(CF)
> +#include <AvailabilityMacros.h>
>  #include <CoreFoundation/CFString.h>
>  #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
>  #define WTF_USE_APPLE_SYSTEM_LOG 1
> Index: Source/wtf/FastMalloc.cpp
> diff --git a/Source/wtf/FastMalloc.cpp b/Source/wtf/FastMalloc.cpp
> index
a6dd5cfa82dced617bb0e711540724fa7e89831c..ffc6973e1ceb5bb626078f061003f79fadba2b18
100644
> --- a/Source/wtf/FastMalloc.cpp
> +++ b/Source/wtf/FastMalloc.cpp
> @@ -82,6 +82,10 @@
>  #include "wtf/StdLibExtras.h"
>  #include "wtf/UnusedParam.h"
>
> +#if OS(DARWIN)
> +#include <AvailabilityMacros.h>
> +#endif
> +
>  #include <limits>
>  #if OS(WINDOWS)
>  #include <windows.h>
> Index: Source/wtf/Platform.h
> diff --git a/Source/wtf/Platform.h b/Source/wtf/Platform.h
> index
adc3495a7119b53828b2fabced98d2203e779360..138b28b106f6e2729071961ab2aadc2288e52ffa
100644
> --- a/Source/wtf/Platform.h
> +++ b/Source/wtf/Platform.h
> @@ -57,8 +57,6 @@
>  /* OS(DARWIN) - Any Darwin-based OS, including Mac OS X and iPhone OS */
>  #ifdef __APPLE__
>  #define WTF_OS_DARWIN 1
> -
> -#include <AvailabilityMacros.h>
>  #endif
>
>  /* OS(FREEBSD) - FreeBSD */
> Index: Tools/DumpRenderTree/chromium/LayoutTestHelper.mm
> diff --git a/Tools/DumpRenderTree/chromium/LayoutTestHelper.mm
b/Tools/DumpRenderTree/chromium/LayoutTestHelper.mm
> index
5ecac6692482f2e98351cb07adecdd30319f057f..9dc00c2f4432c3a4233422aa9559bbbb02fe23f2
100644
> --- a/Tools/DumpRenderTree/chromium/LayoutTestHelper.mm
> +++ b/Tools/DumpRenderTree/chromium/LayoutTestHelper.mm
> @@ -29,6 +29,7 @@
>   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   */
>
> +#import <AvailabilityMacros.h>
>  #import <AppKit/AppKit.h>
>  #include <signal.h>
>  #include <stdio.h>
>
>
>

[commit-bot: I haz the power, 2013-06-21 17:37:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/l.gombos@samsung.com/16963006/1

[commit-bot: I haz the power, 2013-06-21 19:37:28]

Change committed as 152901