Changeset 190811 in webkit


Ignore:
Timestamp:
Oct 9, 2015, 11:41:12 AM (10 years ago)
Author:
Lucas Forschler
Message:

Merged r189168.

Location:
branches/safari-601-branch/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-601-branch/Source/WebCore/ChangeLog

    r190774 r190811  
     12015-10-09  Lucas Forschler  <lforschler@apple.com>
     2
     3        Merge r189168
     4
     5    2015-08-31  Alexey Proskuryakov  <ap@apple.com>
     6
     7            Build fix.
     8
     9            * page/EventHandler.h:
     10            (WebCore::EventHandler::immediateActionStage): Don't export an inline function,
     11            to avoid "weak external symbol" errors.
     12
    1132015-10-08  Lucas Forschler  <lforschler@apple.com>
    214

  • branches/safari-601-branch/Source/WebCore/page/EventHandler.h

    r190498 r190811  
    315315
    316316    WEBCORE_EXPORT void setImmediateActionStage(ImmediateActionStage stage);
    317     WEBCORE_EXPORT ImmediateActionStage immediateActionStage() const { return m_immediateActionStage; }
     317    ImmediateActionStage immediateActionStage() const { return m_immediateActionStage; }
    318318
    319319private:
Note: See TracChangeset for help on using the changeset viewer.