Fix the build after r181660

* page/EventHandler.cpp:
(WebCore::EventHandler::setImmediateActionStage):
* page/EventHandler.h:
(WebCore::EventHandler::setImmediateActionStage):
Un-inline setImmediateActionStage, because it is exported to WebCore, and
exporting inline thing causes random weak symbol errors on some platforms.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181687 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 051ad3e..2113272 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2015-03-18  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the build after r181660
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::setImmediateActionStage):
+        * page/EventHandler.h:
+        (WebCore::EventHandler::setImmediateActionStage):
+        Un-inline setImmediateActionStage, because it is exported to WebCore, and
+        exporting inline thing causes random weak symbol errors on some platforms.
+
 2015-03-17  Conrad Shultz  <conrad_shultz@apple.com>
 
         Ignore some deprecation warnings

diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index 83a44b7..898bba5 100644 (file)
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -4012,4 +4012,9 @@ void EventHandler::setLastKnownMousePosition(const PlatformMouseEvent& event)
     m_lastKnownMouseGlobalPosition = event.globalPosition();
 }
 
+void EventHandler::setImmediateActionStage(ImmediateActionStage stage)
+{
+    m_immediateActionStage = stage;
+}
+
 } // namespace WebCore

diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h
index 5447072..f221b09 100644 (file)
--- a/Source/WebCore/page/EventHandler.h
+++ b/Source/WebCore/page/EventHandler.h
@@ -312,7 +312,7 @@ public:
 
     bool isHandlingWheelEvent() const { return m_isHandlingWheelEvent; }
 
-    WEBCORE_EXPORT void setImmediateActionStage(ImmediateActionStage stage) { m_immediateActionStage = stage; }
+    WEBCORE_EXPORT void setImmediateActionStage(ImmediateActionStage stage);
 
 private:
 #if ENABLE(DRAG_SUPPORT)