Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)

https://bugs.webkit.org/show_bug.cgi?id=104266

Patch by Jae Hyun Park <jae.park08@gmail.com> on 2013-02-10
Reviewed by Philippe Normand.

Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consistent with
the existing macro naming conventions.

From Platform.h
USE() - use a particular third-party library or optional OS service
ENABLE() - turn on a specific feature of WebKit

.:

* Source/autotools/SetupAutoconfHeader.m4:
* Source/cmake/OptionsEfl.cmake:

Source/WebCore:

No new tests, no new functionality.

* WebCore.pri:

Source/WebKit/gtk:

* gyp/Configuration.gypi:

Source/WebKit/mac:

* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView _close]):
* WebView/WebViewData.h:
* WebView/WebViewInternal.h:

Source/WTF:

* WTF.pri:
* wtf/Platform.h:
* wtf/gobject/GOwnPtr.cpp:
* wtf/gobject/GOwnPtr.h:
* wtf/gobject/GRefPtr.cpp:
* wtf/gobject/GRefPtr.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@142395 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 72f1b612
2013-02-10 Jae Hyun Park <jae.park08@gmail.com>
Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
https://bugs.webkit.org/show_bug.cgi?id=104266
Reviewed by Philippe Normand.
Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consistent with
the existing macro naming conventions.
From Platform.h
USE() - use a particular third-party library or optional OS service
ENABLE() - turn on a specific feature of WebKit
* Source/autotools/SetupAutoconfHeader.m4:
* Source/cmake/OptionsEfl.cmake:
2013-02-09 Philippe Normand <pnormand@igalia.com>
Unreviewed, another GTK+ build fix after r142343.
......
2013-02-10 Jae Hyun Park <jae.park08@gmail.com>
Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
https://bugs.webkit.org/show_bug.cgi?id=104266
Reviewed by Philippe Normand.
Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consistent with
the existing macro naming conventions.
From Platform.h
USE() - use a particular third-party library or optional OS service
ENABLE() - turn on a specific feature of WebKit
* WTF.pri:
* wtf/Platform.h:
* wtf/gobject/GOwnPtr.cpp:
* wtf/gobject/GOwnPtr.h:
* wtf/gobject/GRefPtr.cpp:
* wtf/gobject/GRefPtr.h:
2013-02-08 Michael Saboff <msaboff@apple.com>
ARM_NEON Inline Assembly for copyLCharsFromUCharSource() inefficient for aligned destinations
......
......@@ -21,7 +21,7 @@ mac {
}
linux-*:use?(GSTREAMER) {
DEFINES += ENABLE_GLIB_SUPPORT=1
DEFINES += WTF_USE_GLIB=1
PKGCONFIG += glib-2.0 gio-2.0
}
......
......@@ -1121,7 +1121,7 @@
#define ENABLE_THREADING_GENERIC 1
#endif
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
#include <wtf/gobject/GTypedefs.h>
#endif
......
......@@ -19,7 +19,7 @@
#include "config.h"
#include "GOwnPtr.h"
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
#include <gio/gio.h>
#include <glib.h>
......@@ -68,4 +68,4 @@ template <> void freeOwnedGPtr<GKeyFile>(GKeyFile* ptr)
} // namespace WTF
#endif // ENABLE(GLIB_SUPPORT)
#endif // USE(GLIB)
......@@ -22,7 +22,7 @@
#ifndef GOwnPtr_h
#define GOwnPtr_h
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
#include <algorithm>
#include <wtf/Assertions.h>
......@@ -138,7 +138,7 @@ template <typename T> inline void freeOwnedGPtr(T* ptr)
using WTF::GOwnPtr;
#endif // ENABLE(GLIB_SUPPORT)
#endif // USE(GLIB)
#endif // GOwnPtr_h
......@@ -19,7 +19,7 @@
#include "config.h"
#include "GRefPtr.h"
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
#include <glib.h>
......@@ -166,4 +166,4 @@ template <> void derefGPtr(GByteArray* ptr)
} // namespace WTF
#endif // ENABLE(GLIB_SUPPORT)
#endif // USE(GLIB)
......@@ -23,7 +23,7 @@
#ifndef WTF_GRefPtr_h
#define WTF_GRefPtr_h
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
#include <wtf/AlwaysInline.h>
#include <wtf/RefPtr.h>
......@@ -233,6 +233,6 @@ template <typename T> inline void derefGPtr(T* ptr)
using WTF::GRefPtr;
using WTF::adoptGRef;
#endif // ENABLE(GLIB_SUPPORT)
#endif // USE(GLIB)
#endif // WTF_GRefPtr_h
2013-02-10 Jae Hyun Park <jae.park08@gmail.com>
Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
https://bugs.webkit.org/show_bug.cgi?id=104266
Reviewed by Philippe Normand.
Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consistent with
the existing macro naming conventions.
From Platform.h
USE() - use a particular third-party library or optional OS service
ENABLE() - turn on a specific feature of WebKit
No new tests, no new functionality.
* WebCore.pri:
2013-02-10 Zan Dobersek <zdobersek@igalia.com>
[GTK] Build errors in TextureMapperShaderProgram.cpp when compiling with Clang
......@@ -169,7 +169,7 @@ enable?(GAMEPAD) {
}
use?(GSTREAMER) {
DEFINES += ENABLE_GLIB_SUPPORT=1
DEFINES += WTF_USE_GLIB=1
PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
}
......
2013-02-10 Jae Hyun Park <jae.park08@gmail.com>
Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
https://bugs.webkit.org/show_bug.cgi?id=104266
Reviewed by Philippe Normand.
Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consistent with
the existing macro naming conventions.
From Platform.h
USE() - use a particular third-party library or optional OS service
ENABLE() - turn on a specific feature of WebKit
* gyp/Configuration.gypi:
2013-02-08 Benjamin Poulain <bpoulain@apple.com>
Move workerThreadCount from TestRunner to WebCore Internals
......
......@@ -5,7 +5,7 @@
'library_version': '3.0',
'javascriptcore_soname_version': '0.13.8',
'default_defines': [
'ENABLE_GLIB_SUPPORT=1',
'WTF_USE_GLIB=1',
'BUILDING_CAIRO__=1',
'BUILDING_GTK__=1',
'WTF_CHANGES',
......
2013-02-10 Jae Hyun Park <jae.park08@gmail.com>
Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
https://bugs.webkit.org/show_bug.cgi?id=104266
Reviewed by Philippe Normand.
Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consistent with
the existing macro naming conventions.
From Platform.h
USE() - use a particular third-party library or optional OS service
ENABLE() - turn on a specific feature of WebKit
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView _close]):
* WebView/WebViewData.h:
* WebView/WebViewInternal.h:
2013-02-08 Benjamin Poulain <bpoulain@apple.com>
Move workerThreadCount from TestRunner to WebCore Internals
......
......@@ -200,7 +200,7 @@
#import <WebKit/WebDashboardRegion.h>
#endif
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
#import <glib.h>
#endif
......@@ -434,7 +434,7 @@ static PageVisibilityState core(WebPageVisibilityState visibilityState)
+ (void)_preflightSpellChecker;
- (BOOL)_continuousCheckingAllowed;
- (NSResponder *)_responderForResponderOperations;
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
- (void)_clearGlibLoopObserver;
#endif
@end
......@@ -833,7 +833,7 @@ static bool shouldRespectPriorityInCSSAttributeSetters()
if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITHOUT_CONTENT_SNIFFING_FOR_FILE_URLS))
ResourceHandle::forceContentSniffing();
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
[self _scheduleGlibContextIterations];
#endif
......@@ -1148,7 +1148,7 @@ static bool fastDocumentTeardownEnabled()
}
#endif
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
[self _clearGlibLoopObserver];
#endif
......@@ -6205,7 +6205,7 @@ static inline uint64_t roundUpToPowerOf2(uint64_t num)
#endif
}
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
- (void)_clearGlibLoopObserver
{
if (!_private->glibRunLoopObserver)
......@@ -6523,7 +6523,7 @@ bool LayerFlushController::flushLayers()
}
#endif
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
static void glibContextIterationCallback(CFRunLoopObserverRef, CFRunLoopActivity, void*)
{
......
......@@ -188,7 +188,7 @@ private:
WebFullScreenController *newFullscreenController;
#endif
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
CFRunLoopObserverRef glibRunLoopObserver;
#endif
id<WebGeolocationProvider> _geolocationProvider;
......
......@@ -105,7 +105,7 @@ OBJC_CLASS NSTextAlternatives;
- (void)_scheduleCompositingLayerFlush;
#endif
#if ENABLE(GLIB_SUPPORT)
#if USE(GLIB)
- (void)_scheduleGlibContextIterations;
#endif
......
# Configuration flags that are used throughout WebKitGTK+.
AC_DEFINE([ENABLE_GLIB_SUPPORT], [1], [ ])
AC_DEFINE([WTF_USE_GLIB], [1], [ ])
AC_DEFINE([WTF_USE_FREETYPE], [1], [ ])
AC_DEFINE([WTF_USE_HARFBUZZ], [1], [ ])
AC_DEFINE([WTF_USE_SOUP], [1], [ ])
......
......@@ -29,7 +29,7 @@ find_package(LibSoup 2.39.4.1 REQUIRED)
set(WTF_USE_SOUP 1)
add_definitions(-DENABLE_GLIB_SUPPORT=1)
add_definitions(-DWTF_USE_GLIB=1)
add_definitions(-DWTF_USE_SOUP=1)
add_definitions(-DWTF_USE_PTHREADS=1)
add_definitions(-DWTF_USE_ICU_UNICODE=1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment