Changeset 166636 in webkit


Ignore:
Timestamp:
Apr 2, 2014 2:14:36 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

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

Patch by Alex Christensen <​achristensen@webkit.org> 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.

Location:
trunk/Source/WTF
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r166593 r166636  
     12014-04-02  Alex Christensen  <achristensen@webkit.org>
     2
     3        [WinCairo] Build fix with GMainLoopSource.
     4        https://bugs.webkit.org/show_bug.cgi?id=131089
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * wtf/gobject/GMainLoopSource.cpp:
     9        Only compile if glib is used, which fixes compile errors with video disabled in WinCairo.
     10        * wtf/gobject/GMainLoopSource.h:
     11        Export the GMainLoopSource functions to WTF.dll to link with where they are called in the GStreamer code.
     12        Also removed spaces to appease style bot.
     13
    1142014-04-01  Zsolt Borbely  <zsborbely.u-szeged@partner.samsung.com>
    215

  • trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp

    r165952 r166636  
    2525
    2626#include "config.h"
     27
     28#if USE(GLIB)
     29
    2730#include "GMainLoopSource.h"
    2831
    … …  
    266269} // namespace WTF
    267270
     271#endif // USE(GLIB)

  • trunk/Source/WTF/wtf/gobject/GMainLoopSource.h

    r165973 r166636  
    4242    static GMainLoopSource& createAndDeleteOnDestroy();
    4343
    44     GMainLoopSource();
    45     ~GMainLoopSource();
     44    WTF_EXPORT_PRIVATE GMainLoopSource();
     45    WTF_EXPORT_PRIVATE ~GMainLoopSource();
    4646
    4747    static const bool Stop = false;
    4848    static const bool Continue = true;
    4949
    50     bool isScheduled() const;
    51     bool isActive() const;
     50    WTF_EXPORT_PRIVATE bool isScheduled() const;
     51    WTF_EXPORT_PRIVATE bool isActive() const;
    5252
    53     void schedule(const char* name, std::function<void ()>, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
    54     void schedule(const char* name, std::function<bool ()>, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
    55     void schedule(const char* name, std::function<bool (GIOCondition)>, GSocket*, GIOCondition, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
    56     void scheduleAfterDelay(const char* name, std::function<void ()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
    57     void scheduleAfterDelay(const char* name, std::function<bool ()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
    58     void scheduleAfterDelay(const char* name, std::function<void ()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
    59     void scheduleAfterDelay(const char* name, std::function<bool ()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void ()> destroyFunction = nullptr, GMainContext* = nullptr);
    60     void cancel();
     53    WTF_EXPORT_PRIVATE void schedule(const char* name, std::function<void()>, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
     54    WTF_EXPORT_PRIVATE void schedule(const char* name, std::function<bool()>, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
     55    WTF_EXPORT_PRIVATE void schedule(const char* name, std::function<bool(GIOCondition)>, GSocket*, GIOCondition, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
     56    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);
     57    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);
     58    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);
     59    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);
     60    WTF_EXPORT_PRIVATE void cancel();
    6161
    6262private:
Note: See TracChangeset for help on using the changeset viewer.