Title: [158032] trunk/Source/WebKit2
- Revision
- 158032
- Author
- [email protected]
- Date
- 2013-10-25 12:07:07 -0700 (Fri, 25 Oct 2013)
Log Message
URTBF from non-Mac platforms after r158028.
* GNUmakefile.list.am:
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(toplevelWindowFocusInEvent):
(toplevelWindowFocusOutEvent):
(toplevelWindowVisibilityEvent):
(webkitWebViewBaseSetToplevelOnScreenWindow):
(webkitWebViewBaseSetFocus):
* UIProcess/CoordinatedGraphics/WebView.cpp:
(WebKit::WebView::setActive):
(WebKit::WebView::setFocused):
(WebKit::WebView::setVisible):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (158031 => 158032)
--- trunk/Source/WebKit2/ChangeLog 2013-10-25 19:06:48 UTC (rev 158031)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-25 19:07:07 UTC (rev 158032)
@@ -1,3 +1,19 @@
+2013-10-25 Csaba Osztrogonác <[email protected]>
+
+ URTBF from non-Mac platforms after r158028.
+
+ * GNUmakefile.list.am:
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (toplevelWindowFocusInEvent):
+ (toplevelWindowFocusOutEvent):
+ (toplevelWindowVisibilityEvent):
+ (webkitWebViewBaseSetToplevelOnScreenWindow):
+ (webkitWebViewBaseSetFocus):
+ * UIProcess/CoordinatedGraphics/WebView.cpp:
+ (WebKit::WebView::setActive):
+ (WebKit::WebView::setFocused):
+ (WebKit::WebView::setVisible):
+
2013-10-25 Gavin Barraclough <[email protected]>
Move ViewStateFlags out of WebPageProxy
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (158031 => 158032)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2013-10-25 19:06:48 UTC (rev 158031)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2013-10-25 19:07:07 UTC (rev 158032)
@@ -322,6 +322,7 @@
Source/WebKit2/Shared/FontInfo.h \
Source/WebKit2/Shared/HTTPCookieAcceptPolicy.h \
Source/WebKit2/Shared/ResourceCachesToClear.h \
+ Source/WebKit2/Shared/ViewState.h \
Source/WebKit2/Shared/WebMemorySampler.h \
Source/WebKit2/Shared/APIClient.h \
Source/WebKit2/Shared/APIClientTraits.cpp \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (158031 => 158032)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-10-25 19:06:48 UTC (rev 158031)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-10-25 19:07:07 UTC (rev 158032)
@@ -32,6 +32,7 @@
#include "NativeWebMouseEvent.h"
#include "NativeWebWheelEvent.h"
#include "PageClientImpl.h"
+#include "ViewState.h"
#include "WebContext.h"
#include "WebEventFactory.h"
#include "WebFullScreenClientGtk.h"
@@ -170,7 +171,7 @@
WebKitWebViewBasePrivate* priv = webViewBase->priv;
if (!priv->isInWindowActive) {
priv->isInWindowActive = true;
- priv->pageProxy->viewStateDidChange(WebPageProxy::ViewWindowIsActive);
+ priv->pageProxy->viewStateDidChange(ViewState::WindowIsActive);
}
return FALSE;
@@ -181,7 +182,7 @@
WebKitWebViewBasePrivate* priv = webViewBase->priv;
if (priv->isInWindowActive) {
priv->isInWindowActive = false;
- priv->pageProxy->viewStateDidChange(WebPageProxy::ViewWindowIsActive);
+ priv->pageProxy->viewStateDidChange(ViewState::WindowIsActive);
}
return FALSE;
@@ -193,7 +194,7 @@
bool isWindowVisible = visibilityEvent->state != GDK_VISIBILITY_FULLY_OBSCURED;
if (priv->isWindowVisible != isWindowVisible) {
priv->isWindowVisible = isWindowVisible;
- priv->pageProxy->viewStateDidChange(WebPageProxy::WindowIsVisible);
+ priv->pageProxy->viewStateDidChange(ViewState::WindowIsVisible);
}
return FALSE;
@@ -223,7 +224,7 @@
}
priv->toplevelOnScreenWindow = window;
- priv->pageProxy->viewStateDidChange(WebPageProxy::ViewIsInWindow);
+ priv->pageProxy->viewStateDidChange(ViewState::IsInWindow);
if (!priv->toplevelOnScreenWindow)
return;
@@ -1086,7 +1087,7 @@
if (priv->isFocused == focused)
return;
- unsigned viewStateFlags = WebPageProxy::ViewIsFocused;
+ unsigned viewStateFlags = ViewState::IsFocused;
priv->isFocused = focused;
// If the view has received the focus and the window is not active
@@ -1096,7 +1097,7 @@
// can't be focused.
if (priv->isFocused && !priv->isInWindowActive) {
priv->isInWindowActive = true;
- viewStateFlags |= WebPageProxy::ViewWindowIsActive;
+ viewStateFlags |= ViewState::WindowIsActive;
}
priv->pageProxy->viewStateDidChange(viewStateFlags);
}
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (158031 => 158032)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2013-10-25 19:06:48 UTC (rev 158031)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2013-10-25 19:07:07 UTC (rev 158032)
@@ -32,6 +32,7 @@
#include "CoordinatedDrawingAreaProxy.h"
#include "CoordinatedLayerTreeHostProxy.h"
#include "NotImplemented.h"
+#include "ViewState.h"
#include "WebContextMenuProxy.h"
#include "WebPageProxy.h"
#include <WebCore/CoordinatedGraphicsScene.h>
@@ -83,7 +84,7 @@
return;
scene->setActive(active);
- m_page->viewStateDidChange(WebPageProxy::ViewWindowIsActive);
+ m_page->viewStateDidChange(ViewState::WindowIsActive);
}
void WebView::setSize(const WebCore::IntSize& size)
@@ -102,7 +103,7 @@
return;
m_focused = focused;
- m_page->viewStateDidChange(WebPageProxy::ViewIsFocused | WebPageProxy::ViewWindowIsActive);
+ m_page->viewStateDidChange(ViewState::IsFocused | ViewState::WindowIsActive);
}
void WebView::setVisible(bool visible)
@@ -111,7 +112,7 @@
return;
m_visible = visible;
- m_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
+ m_page->viewStateDidChange(ViewState::IsVisible);
#if USE(ACCELERATED_COMPOSITING)
if (CoordinatedDrawingAreaProxy* drawingArea = static_cast<CoordinatedDrawingAreaProxy*>(page()->drawingArea()))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
