Title: [181687] trunk/Source/WebCore
Revision
181687
Author
[email protected]
Date
2015-03-18 00:19:16 -0700 (Wed, 18 Mar 2015)

Log Message

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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (181686 => 181687)


--- trunk/Source/WebCore/ChangeLog	2015-03-18 07:05:48 UTC (rev 181686)
+++ trunk/Source/WebCore/ChangeLog	2015-03-18 07:19:16 UTC (rev 181687)
@@ -1,3 +1,14 @@
+2015-03-18  Tim Horton  <[email protected]>
+
+        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  <[email protected]>
 
         Ignore some deprecation warnings

Modified: trunk/Source/WebCore/page/EventHandler.cpp (181686 => 181687)


--- trunk/Source/WebCore/page/EventHandler.cpp	2015-03-18 07:05:48 UTC (rev 181686)
+++ trunk/Source/WebCore/page/EventHandler.cpp	2015-03-18 07:19:16 UTC (rev 181687)
@@ -4012,4 +4012,9 @@
     m_lastKnownMouseGlobalPosition = event.globalPosition();
 }
 
+void EventHandler::setImmediateActionStage(ImmediateActionStage stage)
+{
+    m_immediateActionStage = stage;
+}
+
 } // namespace WebCore

Modified: trunk/Source/WebCore/page/EventHandler.h (181686 => 181687)


--- trunk/Source/WebCore/page/EventHandler.h	2015-03-18 07:05:48 UTC (rev 181686)
+++ trunk/Source/WebCore/page/EventHandler.h	2015-03-18 07:19:16 UTC (rev 181687)
@@ -312,7 +312,7 @@
 
     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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to