No subject

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:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href=3D"#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href=3D"#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></=
li>
<li><a href=3D"#trunkSourceWTFWTFpri">trunk/Source/WTF/WTF.pri</a></li>
<li><a href=3D"#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform=
.h</a></li>
<li><a href=3D"#trunkSourceWTFwtfgobjectGOwnPtrcpp">trunk/Source/WTF/wtf/=
gobject/GOwnPtr.cpp</a></li>
<li><a href=3D"#trunkSourceWTFwtfgobjectGOwnPtrh">trunk/Source/WTF/wtf/go=
bject/GOwnPtr.h</a></li>
<li><a href=3D"#trunkSourceWTFwtfgobjectGRefPtrcpp">trunk/Source/WTF/wtf/=
gobject/GRefPtr.cpp</a></li>
<li><a href=3D"#trunkSourceWTFwtfgobjectGRefPtrh">trunk/Source/WTF/wtf/go=
bject/GRefPtr.h</a></li>
<li><a href=3D"#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeL=
og</a></li>
<li><a href=3D"#trunkSourceWebCoreWebCorepri">trunk/Source/WebCore/WebCor=
e.pri</a></li>
<li><a href=3D"#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/Ch=
angeLog</a></li>
<li><a href=3D"#trunkSourceWebKitgtkgypConfigurationgypi">trunk/Source/We=
bKit/gtk/gyp/Configuration.gypi</a></li>
<li><a href=3D"#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/Ch=
angeLog</a></li>
<li><a href=3D"#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit=
/mac/WebView/WebView.mm</a></li>
<li><a href=3D"#trunkSourceWebKitmacWebViewWebViewDatah">trunk/Source/Web=
Kit/mac/WebView/WebViewData.h</a></li>
<li><a href=3D"#trunkSourceWebKitmacWebViewWebViewInternalh">trunk/Source=
/WebKit/mac/WebView/WebViewInternal.h</a></li>
<li><a href=3D"#trunkSourceautotoolsSetupAutoconfHeaderm4">trunk/Source/a=
utotools/SetupAutoconfHeader.m4</a></li>
<li><a href=3D"#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/Optio=
nsEfl.cmake</a></li>
</ul>

</div>
<div id=3D"patch">
<h3>Diff</h3>
<a id=3D"trunkChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/ChangeLog (142394 =3D> 142395)=
</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/ChangeLog	2013-02-10 10:44:48 UTC (rev 142=
394)
+++ trunk/ChangeLog	2013-02-10 11:23:23 UTC (rev 142395)
</span><span class=3D"lines">@@ -1,3 +1,20 @@
</span><ins>+2013-02-10  Jae Hyun Park  &lt;jae.park08 at gmail.com&gt;
+
+        Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
+        https://bugs.webkit.org/show_bug.cgi?id=3D104266
+
+        Reviewed by Philippe Normand.
+
+        Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consiste=
nt with
+        the existing macro naming conventions.
+
+        From Platform.h
+        USE() - use a particular third-party library or optional OS serv=
ice
+        ENABLE() - turn on a specific feature of WebKit
+
+        * Source/autotools/SetupAutoconfHeader.m4:
+        * Source/cmake/OptionsEfl.cmake:
+
</ins><span class=3D"cx"> 2013-02-09  Philippe Normand  &lt;pnormand at igal=
ia.com&gt;
</span><span class=3D"cx">=20
</span><span class=3D"cx">         Unreviewed, another GTK+ build fix aft=
er r142343.
</span></span></pre></div>
<a id=3D"trunkSourceWTFChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (142394 =3D=
> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WTF/ChangeLog	2013-02-10 10:44:48 U=
TC (rev 142394)
+++ trunk/Source/WTF/ChangeLog	2013-02-10 11:23:23 UTC (rev 142395)
</span><span class=3D"lines">@@ -1,3 +1,24 @@
</span><ins>+2013-02-10  Jae Hyun Park  &lt;jae.park08 at gmail.com&gt;
+
+        Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
+        https://bugs.webkit.org/show_bug.cgi?id=3D104266
+
+        Reviewed by Philippe Normand.
+
+        Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consiste=
nt with
+        the existing macro naming conventions.
+
+        From Platform.h
+        USE() - use a particular third-party library or optional OS serv=
ice
+        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:
+
</ins><span class=3D"cx"> 2013-02-08  Michael Saboff  &lt;msaboff at apple.c=
om&gt;
</span><span class=3D"cx">=20
</span><span class=3D"cx">         ARM_NEON Inline Assembly for copyLChar=
sFromUCharSource() inefficient for aligned destinations
</span></span></pre></div>
<a id=3D"trunkSourceWTFWTFpri"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WTF/WTF.pri (142394 =3D=
> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WTF/WTF.pri	2013-02-10 10:44:48 UTC=
 (rev 142394)
+++ trunk/Source/WTF/WTF.pri	2013-02-10 11:23:23 UTC (rev 142395)
</span><span class=3D"lines">@@ -21,7 +21,7 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> linux-*:use?(GSTREAMER) {
</span><del>-    DEFINES +=3D ENABLE_GLIB_SUPPORT=3D1
</del><ins>+    DEFINES +=3D WTF_USE_GLIB=3D1
</ins><span class=3D"cx">     PKGCONFIG +=3D glib-2.0 gio-2.0
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkSourceWTFwtfPlatformh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (142=
394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WTF/wtf/Platform.h	2013-02-10 10:44=
:48 UTC (rev 142394)
+++ trunk/Source/WTF/wtf/Platform.h	2013-02-10 11:23:23 UTC (rev 142395)
</span><span class=3D"lines">@@ -1121,7 +1121,7 @@
</span><span class=3D"cx"> #define ENABLE_THREADING_GENERIC 1
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx"> #include &lt;wtf/gobject/GTypedefs.h&gt;
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkSourceWTFwtfgobjectGOwnPtrcpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WTF/wtf/gobject/GOwnPtr=
.cpp (142394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WTF/wtf/gobject/GOwnPtr.cpp	2013-02=
-10 10:44:48 UTC (rev 142394)
+++ trunk/Source/WTF/wtf/gobject/GOwnPtr.cpp	2013-02-10 11:23:23 UTC (rev=
 142395)
</span><span class=3D"lines">@@ -19,7 +19,7 @@
</span><span class=3D"cx"> #include &quot;config.h&quot;
</span><span class=3D"cx"> #include &quot;GOwnPtr.h&quot;
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> #include &lt;gio/gio.h&gt;
</span><span class=3D"cx"> #include &lt;glib.h&gt;
</span><span class=3D"lines">@@ -68,4 +68,4 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> } // namespace WTF
</span><span class=3D"cx">=20
</span><del>-#endif // ENABLE(GLIB_SUPPORT)
</del><ins>+#endif // USE(GLIB)
</ins></span></pre></div>
<a id=3D"trunkSourceWTFwtfgobjectGOwnPtrh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WTF/wtf/gobject/GOwnPtr=
.h (142394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WTF/wtf/gobject/GOwnPtr.h	2013-02-1=
0 10:44:48 UTC (rev 142394)
+++ trunk/Source/WTF/wtf/gobject/GOwnPtr.h	2013-02-10 11:23:23 UTC (rev 1=
42395)
</span><span class=3D"lines">@@ -22,7 +22,7 @@
</span><span class=3D"cx"> #ifndef GOwnPtr_h
</span><span class=3D"cx"> #define GOwnPtr_h
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> #include &lt;algorithm&gt;
</span><span class=3D"cx"> #include &lt;wtf/Assertions.h&gt;
</span><span class=3D"lines">@@ -138,7 +138,7 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> using WTF::GOwnPtr;
</span><span class=3D"cx">=20
</span><del>-#endif // ENABLE(GLIB_SUPPORT)
</del><ins>+#endif // USE(GLIB)
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> #endif // GOwnPtr_h
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkSourceWTFwtfgobjectGRefPtrcpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WTF/wtf/gobject/GRefPtr=
.cpp (142394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WTF/wtf/gobject/GRefPtr.cpp	2013-02=
-10 10:44:48 UTC (rev 142394)
+++ trunk/Source/WTF/wtf/gobject/GRefPtr.cpp	2013-02-10 11:23:23 UTC (rev=
 142395)
</span><span class=3D"lines">@@ -19,7 +19,7 @@
</span><span class=3D"cx"> #include &quot;config.h&quot;
</span><span class=3D"cx"> #include &quot;GRefPtr.h&quot;
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> #include &lt;glib.h&gt;
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -166,4 +166,4 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> } // namespace WTF
</span><span class=3D"cx">=20
</span><del>-#endif // ENABLE(GLIB_SUPPORT)
</del><ins>+#endif // USE(GLIB)
</ins></span></pre></div>
<a id=3D"trunkSourceWTFwtfgobjectGRefPtrh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WTF/wtf/gobject/GRefPtr=
.h (142394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WTF/wtf/gobject/GRefPtr.h	2013-02-1=
0 10:44:48 UTC (rev 142394)
+++ trunk/Source/WTF/wtf/gobject/GRefPtr.h	2013-02-10 11:23:23 UTC (rev 1=
42395)
</span><span class=3D"lines">@@ -23,7 +23,7 @@
</span><span class=3D"cx"> #ifndef WTF_GRefPtr_h
</span><span class=3D"cx"> #define WTF_GRefPtr_h
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> #include &lt;wtf/AlwaysInline.h&gt;
</span><span class=3D"cx"> #include &lt;wtf/RefPtr.h&gt;
</span><span class=3D"lines">@@ -233,6 +233,6 @@
</span><span class=3D"cx"> using WTF::GRefPtr;
</span><span class=3D"cx"> using WTF::adoptGRef;
</span><span class=3D"cx">=20
</span><del>-#endif // ENABLE(GLIB_SUPPORT)
</del><ins>+#endif // USE(GLIB)
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> #endif // WTF_GRefPtr_h
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (1423=
94 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/ChangeLog	2013-02-10 10:44:=
48 UTC (rev 142394)
+++ trunk/Source/WebCore/ChangeLog	2013-02-10 11:23:23 UTC (rev 142395)
</span><span class=3D"lines">@@ -1,3 +1,21 @@
</span><ins>+2013-02-10  Jae Hyun Park  &lt;jae.park08 at gmail.com&gt;
+
+        Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
+        https://bugs.webkit.org/show_bug.cgi?id=3D104266
+
+        Reviewed by Philippe Normand.
+
+        Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consiste=
nt with
+        the existing macro naming conventions.
+
+        From Platform.h
+        USE() - use a particular third-party library or optional OS serv=
ice
+        ENABLE() - turn on a specific feature of WebKit
+
+        No new tests, no new functionality.
+
+        * WebCore.pri:
+
</ins><span class=3D"cx"> 2013-02-10  Zan Dobersek  &lt;zdobersek at igalia.=
com&gt;
</span><span class=3D"cx">=20
</span><span class=3D"cx">         [GTK] Build errors in TextureMapperSha=
derProgram.cpp when compiling with Clang
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreWebCorepri"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/WebCore.pri (14=
2394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/WebCore.pri	2013-02-10 10:4=
4:48 UTC (rev 142394)
+++ trunk/Source/WebCore/WebCore.pri	2013-02-10 11:23:23 UTC (rev 142395)
</span><span class=3D"lines">@@ -169,7 +169,7 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> use?(GSTREAMER) {
</span><del>-    DEFINES +=3D ENABLE_GLIB_SUPPORT=3D1
</del><ins>+    DEFINES +=3D WTF_USE_GLIB=3D1
</ins><span class=3D"cx">     PKGCONFIG +=3D glib-2.0 gio-2.0 gstreamer-0=
.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstr=
eamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkSourceWebKitgtkChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (1=
42394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit/gtk/ChangeLog	2013-02-10 10:=
44:48 UTC (rev 142394)
+++ trunk/Source/WebKit/gtk/ChangeLog	2013-02-10 11:23:23 UTC (rev 142395=
)
</span><span class=3D"lines">@@ -1,3 +1,19 @@
</span><ins>+2013-02-10  Jae Hyun Park  &lt;jae.park08 at gmail.com&gt;
+
+        Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
+        https://bugs.webkit.org/show_bug.cgi?id=3D104266
+
+        Reviewed by Philippe Normand.
+
+        Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consiste=
nt with
+        the existing macro naming conventions.
+
+        From Platform.h
+        USE() - use a particular third-party library or optional OS serv=
ice
+        ENABLE() - turn on a specific feature of WebKit
+
+        * gyp/Configuration.gypi:
+
</ins><span class=3D"cx"> 2013-02-08  Benjamin Poulain  &lt;bpoulain at appl=
e.com&gt;
</span><span class=3D"cx">=20
</span><span class=3D"cx">         Move workerThreadCount from TestRunner=
 to WebCore Internals
</span></span></pre></div>
<a id=3D"trunkSourceWebKitgtkgypConfigurationgypi"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit/gtk/gyp/Configur=
ation.gypi (142394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit/gtk/gyp/Configuration.gypi	2=
013-02-10 10:44:48 UTC (rev 142394)
+++ trunk/Source/WebKit/gtk/gyp/Configuration.gypi	2013-02-10 11:23:23 UT=
C (rev 142395)
</span><span class=3D"lines">@@ -5,7 +5,7 @@
</span><span class=3D"cx">     'library_version': '3.0',
</span><span class=3D"cx">     'javascriptcore_soname_version': '0.13.8',
</span><span class=3D"cx">     'default_defines': [
</span><del>-      'ENABLE_GLIB_SUPPORT=3D1',
</del><ins>+      'WTF_USE_GLIB=3D1',
</ins><span class=3D"cx">       'BUILDING_CAIRO__=3D1',
</span><span class=3D"cx">       'BUILDING_GTK__=3D1',
</span><span class=3D"cx">       'WTF_CHANGES',
</span></span></pre></div>
<a id=3D"trunkSourceWebKitmacChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (1=
42394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit/mac/ChangeLog	2013-02-10 10:=
44:48 UTC (rev 142394)
+++ trunk/Source/WebKit/mac/ChangeLog	2013-02-10 11:23:23 UTC (rev 142395=
)
</span><span class=3D"lines">@@ -1,3 +1,23 @@
</span><ins>+2013-02-10  Jae Hyun Park  &lt;jae.park08 at gmail.com&gt;
+
+        Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
+        https://bugs.webkit.org/show_bug.cgi?id=3D104266
+
+        Reviewed by Philippe Normand.
+
+        Using USE(GLIB) instead of ENABLE(GLIB_SUPPORT) is more consiste=
nt with
+        the existing macro naming conventions.
+
+        From Platform.h
+        USE() - use a particular third-party library or optional OS serv=
ice
+        ENABLE() - turn on a specific feature of WebKit
+
+        * WebView/WebView.mm:
+        (-[WebView _commonInitializationWithFrameName:groupName:]):
+        (-[WebView _close]):
+        * WebView/WebViewData.h:
+        * WebView/WebViewInternal.h:
+
</ins><span class=3D"cx"> 2013-02-08  Benjamin Poulain  &lt;bpoulain at appl=
e.com&gt;
</span><span class=3D"cx">=20
</span><span class=3D"cx">         Move workerThreadCount from TestRunner=
 to WebCore Internals
</span></span></pre></div>
<a id=3D"trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebV=
iew.mm (142394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit/mac/WebView/WebView.mm	2013-=
02-10 10:44:48 UTC (rev 142394)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2013-02-10 11:23:23 UTC (r=
ev 142395)
</span><span class=3D"lines">@@ -200,7 +200,7 @@
</span><span class=3D"cx"> #import &lt;WebKit/WebDashboardRegion.h&gt;
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx"> #import &lt;glib.h&gt;
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -434,7 +434,7 @@
</span><span class=3D"cx"> + (void)_preflightSpellChecker;
</span><span class=3D"cx"> - (BOOL)_continuousCheckingAllowed;
</span><span class=3D"cx"> - (NSResponder *)_responderForResponderOperati=
ons;
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx"> - (void)_clearGlibLoopObserver;
</span><span class=3D"cx"> #endif
</span><span class=3D"cx"> @end
</span><span class=3D"lines">@@ -833,7 +833,7 @@
</span><span class=3D"cx">     if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VE=
RSION_WITHOUT_CONTENT_SNIFFING_FOR_FILE_URLS))
</span><span class=3D"cx">         ResourceHandle::forceContentSniffing()=
;
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx">     [self _scheduleGlibContextIterations];
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -1148,7 +1148,7 @@
</span><span class=3D"cx">     }
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">    =20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx">     [self _clearGlibLoopObserver];
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -6205,7 +6205,7 @@
</span><span class=3D"cx"> #endif
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx"> - (void)_clearGlibLoopObserver
</span><span class=3D"cx"> {
</span><span class=3D"cx">     if (!_private-&gt;glibRunLoopObserver)
</span><span class=3D"lines">@@ -6523,7 +6523,7 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> static void glibContextIterationCallback(CFRun=
LoopObserverRef, CFRunLoopActivity, void*)
</span><span class=3D"cx"> {
</span></span></pre></div>
<a id=3D"trunkSourceWebKitmacWebViewWebViewDatah"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebV=
iewData.h (142394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit/mac/WebView/WebViewData.h	20=
13-02-10 10:44:48 UTC (rev 142394)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.h	2013-02-10 11:23:23 UTC=
 (rev 142395)
</span><span class=3D"lines">@@ -188,7 +188,7 @@
</span><span class=3D"cx">     WebFullScreenController *newFullscreenCont=
roller;
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx">     CFRunLoopObserverRef glibRunLoopObserver;
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">     id&lt;WebGeolocationProvider&gt; _geolocat=
ionProvider;
</span></span></pre></div>
<a id=3D"trunkSourceWebKitmacWebViewWebViewInternalh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebV=
iewInternal.h (142394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebKit/mac/WebView/WebViewInternal.=
h	2013-02-10 10:44:48 UTC (rev 142394)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h	2013-02-10 11:23:23=
 UTC (rev 142395)
</span><span class=3D"lines">@@ -105,7 +105,7 @@
</span><span class=3D"cx"> - (void)_scheduleCompositingLayerFlush;
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><del>-#if ENABLE(GLIB_SUPPORT)
</del><ins>+#if USE(GLIB)
</ins><span class=3D"cx"> - (void)_scheduleGlibContextIterations;
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkSourceautotoolsSetupAutoconfHeaderm4"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/autotools/SetupAutoconf=
Header.m4 (142394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/autotools/SetupAutoconfHeader.m4	20=
13-02-10 10:44:48 UTC (rev 142394)
+++ trunk/Source/autotools/SetupAutoconfHeader.m4	2013-02-10 11:23:23 UTC=
 (rev 142395)
</span><span class=3D"lines">@@ -1,5 +1,5 @@
</span><span class=3D"cx"> # Configuration flags that are used throughout=
 WebKitGTK+.
</span><del>-AC_DEFINE([ENABLE_GLIB_SUPPORT], [1], [ ])
</del><ins>+AC_DEFINE([WTF_USE_GLIB], [1], [ ])
</ins><span class=3D"cx"> AC_DEFINE([WTF_USE_FREETYPE], [1], [ ])
</span><span class=3D"cx"> AC_DEFINE([WTF_USE_HARFBUZZ], [1], [ ])
</span><span class=3D"cx"> AC_DEFINE([WTF_USE_SOUP], [1], [ ])
</span></span></pre></div>
<a id=3D"trunkSourcecmakeOptionsEflcmake"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake =
(142394 =3D> 142395)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/cmake/OptionsEfl.cmake	2013-02-10 1=
0:44:48 UTC (rev 142394)
+++ trunk/Source/cmake/OptionsEfl.cmake	2013-02-10 11:23:23 UTC (rev 1423=
95)
</span><span class=3D"lines">@@ -29,7 +29,7 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> set(WTF_USE_SOUP 1)
</span><span class=3D"cx">=20
</span><del>-add_definitions(-DENABLE_GLIB_SUPPORT=3D1)
</del><ins>+add_definitions(-DWTF_USE_GLIB=3D1)
</ins><span class=3D"cx"> add_definitions(-DWTF_USE_SOUP=3D1)
</span><span class=3D"cx"> add_definitions(-DWTF_USE_PTHREADS=3D1)
</span><span class=3D"cx"> add_definitions(-DWTF_USE_ICU_UNICODE=3D1)
</span></span></pre>
</div>
</div>

</body>
</html>