[webkit-changes] [166636] trunk/Source/WTF

Wed, 02 Apr 2014 02:15:32 -0700

Title: [166636] trunk/Source/WTF
Revision
166636
Author
[email protected]
Date
2014-04-02 02:14:36 -0700 (Wed, 02 Apr 2014)

Log Message

[WinCairo] Build fix with GMainLoopSource.
https://bugs.webkit.org/show_bug.cgi?id=131089

Patch by Alex Christensen <[email protected]> on 2014-04-02
Reviewed by Carlos Garcia Campos.

* wtf/gobject/GMainLoopSource.cpp:
Only compile if glib is used, which fixes compile errors with video disabled in WinCairo.
* wtf/gobject/GMainLoopSource.h:
Export the GMainLoopSource functions to WTF.dll to link with where they are called in the GStreamer code.
Also removed spaces to appease style bot.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (166635 => 166636)


--- trunk/Source/WTF/ChangeLog	2014-04-02 07:38:02 UTC (rev 166635)
+++ trunk/Source/WTF/ChangeLog	2014-04-02 09:14:36 UTC (rev 166636)
@@ -1,3 +1,16 @@
+2014-04-02  Alex Christensen  <[email protected]>
+
+        [WinCairo] Build fix with GMainLoopSource.
+        https://bugs.webkit.org/show_bug.cgi?id=131089
+
+        Reviewed by Carlos Garcia Campos.
+
+        * wtf/gobject/GMainLoopSource.cpp:
+        Only compile if glib is used, which fixes compile errors with video disabled in WinCairo.
+        * wtf/gobject/GMainLoopSource.h:
+        Export the GMainLoopSource functions to WTF.dll to link with where they are called in the GStreamer code.
+        Also removed spaces to appease style bot.
+
 2014-04-01  Zsolt Borbely  <[email protected]>
 
         [EFL] REGRESSION(166569): It made DoYouEvenBench/Full.html, CSS/QuerySelector.html and Dromaeo performance tests crash

Modified: trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp (166635 => 166636)


--- trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp	2014-04-02 07:38:02 UTC (rev 166635)
+++ trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp	2014-04-02 09:14:36 UTC (rev 166636)
@@ -24,6 +24,9 @@
  */
 
 #include "config.h"
+
+#if USE(GLIB)
+
 #include "GMainLoopSource.h"
 
 #include <gio/gio.h>
@@ -265,3 +268,4 @@
 
 } // namespace WTF
 
+#endif // USE(GLIB)

Modified: trunk/Source/WTF/wtf/gobject/GMainLoopSource.h (166635 => 166636)


--- trunk/Source/WTF/wtf/gobject/GMainLoopSource.h	2014-04-02 07:38:02 UTC (rev 166635)
+++ trunk/Source/WTF/wtf/gobject/GMainLoopSource.h	2014-04-02 09:14:36 UTC (rev 166636)
@@ -41,23 +41,23 @@
 public:
     static GMainLoopSource& createAndDeleteOnDestroy();
 
-    GMainLoopSource();
-    ~GMainLoopSource();
+    WTF_EXPORT_PRIVATE GMainLoopSource();
+    WTF_EXPORT_PRIVATE ~GMainLoopSource();
 
     static const bool Stop = false;
     static const bool Continue = true;
 
-    bool isScheduled() const;
-    bool isActive() const;
+    WTF_EXPORT_PRIVATE bool isScheduled() const;
+    WTF_EXPORT_PRIVATE bool isActive() const;
 
-    void schedule(const char* name, std::function<void ()>, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
-    void schedule(const char* name, std::function<bool ()>, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
-    void schedule(const char* name, std::function<bool (GIOCondition)>, GSocket*, GIOCondition, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
-    void scheduleAfterDelay(const char* name, std::function<void ()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
-    void scheduleAfterDelay(const char* name, std::function<bool ()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
-    void scheduleAfterDelay(const char* name, std::function<void ()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
-    void scheduleAfterDelay(const char* name, std::function<bool ()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
-    void cancel();
+    WTF_EXPORT_PRIVATE void schedule(const char* name, std::function<void()>, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+    WTF_EXPORT_PRIVATE void schedule(const char* name, std::function<bool()>, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+    WTF_EXPORT_PRIVATE void schedule(const char* name, std::function<bool(GIOCondition)>, GSocket*, GIOCondition, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+    WTF_EXPORT_PRIVATE void scheduleAfterDelay(const char* name, std::function<void()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+    WTF_EXPORT_PRIVATE void scheduleAfterDelay(const char* name, std::function<bool()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+    WTF_EXPORT_PRIVATE void scheduleAfterDelay(const char* name, std::function<void()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+    WTF_EXPORT_PRIVATE void scheduleAfterDelay(const char* name, std::function<bool()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+    WTF_EXPORT_PRIVATE void cancel();
 
 private:
     enum DeleteOnDestroyType { DeleteOnDestroy, DoNotDeleteOnDestroy };

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to