Title: [235028] releases/WebKitGTK/webkit-2.22/Source/WebKit
- Revision
- 235028
- Author
- [email protected]
- Date
- 2018-08-20 02:30:37 -0700 (Mon, 20 Aug 2018)
Log Message
Merge r234921 - Unreviewed, WPE build fix after r234920.
* UIProcess/API/wpe/PageClientImpl.cpp:
(WebKit::PageClientImpl::isViewWindowActive):
(WebKit::PageClientImpl::isViewFocused):
(WebKit::PageClientImpl::isViewVisible):
(WebKit::PageClientImpl::isViewInWindow):
* UIProcess/API/wpe/WPEView.cpp:
(WKWPE::View::setViewState):
* UIProcess/API/wpe/WPEView.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog (235027 => 235028)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-08-20 09:30:27 UTC (rev 235027)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-08-20 09:30:37 UTC (rev 235028)
@@ -1,3 +1,16 @@
+2018-08-16 Philippe Normand <[email protected]>
+
+ Unreviewed, WPE build fix after r234920.
+
+ * UIProcess/API/wpe/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::isViewWindowActive):
+ (WebKit::PageClientImpl::isViewFocused):
+ (WebKit::PageClientImpl::isViewVisible):
+ (WebKit::PageClientImpl::isViewInWindow):
+ * UIProcess/API/wpe/WPEView.cpp:
+ (WKWPE::View::setViewState):
+ * UIProcess/API/wpe/WPEView.h:
+
2018-08-16 Antti Koivisto <[email protected]>
Use OptionSet for ActivityState::Flags
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp (235027 => 235028)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp 2018-08-20 09:30:27 UTC (rev 235027)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp 2018-08-20 09:30:37 UTC (rev 235028)
@@ -76,22 +76,22 @@
bool PageClientImpl::isViewWindowActive()
{
- return m_view.viewState() & WebCore::ActivityState::WindowIsActive;
+ return m_view.viewState().contains(WebCore::ActivityState::WindowIsActive);
}
bool PageClientImpl::isViewFocused()
{
- return m_view.viewState() & WebCore::ActivityState::IsFocused;
+ return m_view.viewState().contains(WebCore::ActivityState::IsFocused);
}
bool PageClientImpl::isViewVisible()
{
- return m_view.viewState() & WebCore::ActivityState::IsVisible;
+ return m_view.viewState().contains(WebCore::ActivityState::IsVisible);
}
bool PageClientImpl::isViewInWindow()
{
- return m_view.viewState() & WebCore::ActivityState::IsInWindow;
+ return m_view.viewState().contains(WebCore::ActivityState::IsInWindow);
}
void PageClientImpl::processDidExit()
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/wpe/WPEView.cpp (235027 => 235028)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2018-08-20 09:30:27 UTC (rev 235027)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2018-08-20 09:30:37 UTC (rev 235028)
@@ -45,7 +45,7 @@
: m_client(std::make_unique<API::ViewClient>())
, m_pageClient(std::make_unique<PageClientImpl>(*this))
, m_size { 800, 600 }
- , m_viewStateFlags(WebCore::ActivityState::WindowIsActive | WebCore::ActivityState::IsFocused | WebCore::ActivityState::IsVisible | WebCore::ActivityState::IsInWindow)
+ , m_viewStateFlags { WebCore::ActivityState::WindowIsActive, WebCore::ActivityState::IsFocused, WebCore::ActivityState::IsVisible, WebCore::ActivityState::IsInWindow }
, m_compositingManagerProxy(*this)
, m_backend(backend)
{
@@ -176,7 +176,7 @@
{
static const OptionSet<WebCore::ActivityState::Flag> defaultFlags { WebCore::ActivityState::WindowIsActive, WebCore::ActivityState::IsFocused };
- auto = m_viewStateFlags ^ (defaultFlags | flags);
+ auto changedFlags = m_viewStateFlags ^ (defaultFlags | flags);
m_viewStateFlags = defaultFlags | flags;
if (changedFlags)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/wpe/WPEView.h (235027 => 235028)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/wpe/WPEView.h 2018-08-20 09:30:27 UTC (rev 235027)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/wpe/WPEView.h 2018-08-20 09:30:37 UTC (rev 235028)
@@ -31,6 +31,7 @@
#include "WebPageProxy.h"
#include <WebCore/ActivityState.h>
#include <memory>
+#include <wtf/OptionSet.h>
#include <wtf/RefPtr.h>
typedef struct OpaqueJSContext* JSGlobalContextRef;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
