Title: [234805] trunk/Source/WebKit
- Revision
- 234805
- Author
- [email protected]
- Date
- 2018-08-13 09:46:49 -0700 (Mon, 13 Aug 2018)
Log Message
Unreviewed, silence "enumeral and non-enumeral type in conditional _expression_" warning
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::dispatchActivityStateChange):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (234804 => 234805)
--- trunk/Source/WebKit/ChangeLog 2018-08-13 16:46:07 UTC (rev 234804)
+++ trunk/Source/WebKit/ChangeLog 2018-08-13 16:46:49 UTC (rev 234805)
@@ -1,3 +1,10 @@
+2018-08-13 Michael Catanzaro <[email protected]>
+
+ Unreviewed, silence "enumeral and non-enumeral type in conditional _expression_" warning
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::dispatchActivityStateChange):
+
2018-08-12 Aditya Keerthi <[email protected]>
[macOS] Color wells should appear pressed when presenting a color picker
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (234804 => 234805)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-08-13 16:46:07 UTC (rev 234804)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-08-13 16:46:49 UTC (rev 234805)
@@ -1596,7 +1596,7 @@
if (!(m_activityState & ActivityState::IsVisible))
m_activityStateChangeWantsSynchronousReply = false;
- auto activityStateChangeID = m_activityStateChangeWantsSynchronousReply ? takeNextActivityStateChangeID() : ActivityStateChangeAsynchronous;
+ auto activityStateChangeID = m_activityStateChangeWantsSynchronousReply ? takeNextActivityStateChangeID() : static_cast<ActivityStateChangeID>(ActivityStateChangeAsynchronous);
if (changed || activityStateChangeID != ActivityStateChangeAsynchronous || !m_nextActivityStateChangeCallbacks.isEmpty())
m_process->send(Messages::WebPage::SetActivityState(m_activityState, activityStateChangeID, m_nextActivityStateChangeCallbacks), m_pageID);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
