[webkit-changes] [190811] branches/safari-601-branch/Source/WebCore

[lforschler]

Title: [190811] branches/safari-601-branch/Source/WebCore

Revision

190811

Author

lforsch...@apple.com

Date

2015-10-09 11:41:12 -0700 (Fri, 09 Oct 2015)

Log Message

Merged r189168.  

Modified Paths

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

Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (190810 => 190811)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-10-09 18:36:49 UTC (rev 190810)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-10-09 18:41:12 UTC (rev 190811)
@@ -1,3 +1,15 @@
+2015-10-09  Lucas Forschler  <lforsch...@apple.com>
+
+        Merge r189168
+
+    2015-08-31  Alexey Proskuryakov  <a...@apple.com>
+
+            Build fix.
+
+            * page/EventHandler.h:
+            (WebCore::EventHandler::immediateActionStage): Don't export an inline function,
+            to avoid "weak external symbol" errors.
+
 2015-10-08  Lucas Forschler  <lforsch...@apple.com>
 
         Merge r190602. rdar://problem/22995830

Modified: branches/safari-601-branch/Source/WebCore/page/EventHandler.h (190810 => 190811)

--- branches/safari-601-branch/Source/WebCore/page/EventHandler.h	2015-10-09 18:36:49 UTC (rev 190810)
+++ branches/safari-601-branch/Source/WebCore/page/EventHandler.h	2015-10-09 18:41:12 UTC (rev 190811)
@@ -314,7 +314,7 @@
     bool isHandlingWheelEvent() const { return m_isHandlingWheelEvent; }
 
     WEBCORE_EXPORT void setImmediateActionStage(ImmediateActionStage stage);
-    WEBCORE_EXPORT ImmediateActionStage immediateActionStage() const { return m_immediateActionStage; }
+    ImmediateActionStage immediateActionStage() const { return m_immediateActionStage; }
 
 private:
 #if ENABLE(DRAG_SUPPORT)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes