Title: [205342] trunk/Source/WebKit2
- Revision
- 205342
- Author
- [email protected]
- Date
- 2016-09-02 00:23:48 -0700 (Fri, 02 Sep 2016)
Log Message
Fix GObject bindings build breakage when compiling with ENABLE_USER_TIMING disabled.
Rubber-stamped by Carlos Garcia Campos.
Add additional ENABLE(USER_TIMING) build guards to WebKitDOMPerformance bindings,
avoiding build errors when building with that feature disabled. Previously this
wasn't a problem because the four amended binding functions weren't generated
when the feature was disabled due to the similar use of guards in the Performance.idl
file.
* WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMPerformance.cpp:
(webkit_dom_performance_webkit_mark):
(webkit_dom_performance_webkit_clear_marks):
(webkit_dom_performance_webkit_measure):
(webkit_dom_performance_webkit_clear_measures):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (205341 => 205342)
--- trunk/Source/WebKit2/ChangeLog 2016-09-02 07:17:26 UTC (rev 205341)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-02 07:23:48 UTC (rev 205342)
@@ -1,5 +1,23 @@
2016-09-02 Zan Dobersek <[email protected]>
+ Fix GObject bindings build breakage when compiling with ENABLE_USER_TIMING disabled.
+
+ Rubber-stamped by Carlos Garcia Campos.
+
+ Add additional ENABLE(USER_TIMING) build guards to WebKitDOMPerformance bindings,
+ avoiding build errors when building with that feature disabled. Previously this
+ wasn't a problem because the four amended binding functions weren't generated
+ when the feature was disabled due to the similar use of guards in the Performance.idl
+ file.
+
+ * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMPerformance.cpp:
+ (webkit_dom_performance_webkit_mark):
+ (webkit_dom_performance_webkit_clear_marks):
+ (webkit_dom_performance_webkit_measure):
+ (webkit_dom_performance_webkit_clear_measures):
+
+2016-09-02 Zan Dobersek <[email protected]>
+
Unreviewed GTK+ build fix when compiling with Clang.
* WebProcess/WebPage/gtk/AcceleratedSurface.cpp: Include WebPage.h.
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMPerformance.cpp (205341 => 205342)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMPerformance.cpp 2016-09-02 07:17:26 UTC (rev 205341)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMPerformance.cpp 2016-09-02 07:23:48 UTC (rev 205342)
@@ -248,7 +248,7 @@
void webkit_dom_performance_webkit_mark(WebKitDOMPerformance* self, const gchar* markName, GError** error)
{
-#if ENABLE(WEB_TIMING)
+#if ENABLE(WEB_TIMING) && ENABLE(USER_TIMING)
WebCore::JSMainThreadNullState state;
g_return_if_fail(WEBKIT_DOM_IS_PERFORMANCE(self));
g_return_if_fail(markName);
@@ -271,7 +271,7 @@
void webkit_dom_performance_webkit_clear_marks(WebKitDOMPerformance* self, const gchar* markName)
{
-#if ENABLE(WEB_TIMING)
+#if ENABLE(WEB_TIMING) && ENABLE(USER_TIMING)
WebCore::JSMainThreadNullState state;
g_return_if_fail(WEBKIT_DOM_IS_PERFORMANCE(self));
g_return_if_fail(markName);
@@ -287,7 +287,7 @@
void webkit_dom_performance_webkit_measure(WebKitDOMPerformance* self, const gchar* measureName, const gchar* startMark, const gchar* endMark, GError** error)
{
-#if ENABLE(WEB_TIMING)
+#if ENABLE(WEB_TIMING) && ENABLE(USER_TIMING)
WebCore::JSMainThreadNullState state;
g_return_if_fail(WEBKIT_DOM_IS_PERFORMANCE(self));
g_return_if_fail(measureName);
@@ -316,7 +316,7 @@
void webkit_dom_performance_webkit_clear_measures(WebKitDOMPerformance* self, const gchar* measureName)
{
-#if ENABLE(WEB_TIMING)
+#if ENABLE(WEB_TIMING) && ENABLE(USER_TIMING)
WebCore::JSMainThreadNullState state;
g_return_if_fail(WEBKIT_DOM_IS_PERFORMANCE(self));
g_return_if_fail(measureName);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
