diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp index 55350e6c2..08cdbe82a 100644 --- a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp @@ -93,7 +93,8 @@ public: class WindowProperties { public: WindowProperties() - : m_toolbarVisible(true) + : m_isNull(true) + , m_toolbarVisible(true) , m_statusbarVisible(true) , m_scrollbarsVisible(true) , m_menubarVisible(true) @@ -105,7 +106,8 @@ public: } WindowProperties(WebKitWindowProperties* windowProperties) - : m_toolbarVisible(webkit_window_properties_get_toolbar_visible(windowProperties)) + : m_isNull(false) + , m_toolbarVisible(webkit_window_properties_get_toolbar_visible(windowProperties)) , m_statusbarVisible(webkit_window_properties_get_statusbar_visible(windowProperties)) , m_scrollbarsVisible(webkit_window_properties_get_scrollbars_visible(windowProperties)) , m_menubarVisible(webkit_window_properties_get_menubar_visible(windowProperties)) @@ -118,7 +120,8 @@ public: WindowProperties(GdkRectangle* geometry, bool toolbarVisible, bool statusbarVisible, bool scrollbarsVisible, bool menubarVisible, bool locationbarVisible, bool resizable, bool fullscreen) - : m_geometry(*geometry) + : m_isNull(false) + , m_geometry(*geometry) , m_toolbarVisible(toolbarVisible) , m_statusbarVisible(statusbarVisible) , m_scrollbarsVisible(scrollbarsVisible) @@ -129,10 +132,12 @@ public: { } + bool isNull() const { return m_isNull; } + void assertEqual(const WindowProperties& other) const { - // FIXME: We should assert x and y are equal, but we are getting an incorrect - // value from WebCore (280 instead of 150). + g_assert_cmpint(m_geometry.x, ==, other.m_geometry.x); + g_assert_cmpint(m_geometry.y, ==, other.m_geometry.y); g_assert_cmpint(m_geometry.width, ==, other.m_geometry.width); g_assert_cmpint(m_geometry.height, ==, other.m_geometry.height); g_assert_cmpint(static_cast<int>(m_toolbarVisible), ==, static_cast<int>(other.m_toolbarVisible)); @@ -145,6 +150,8 @@ public: } private: + bool m_isNull; + GdkRectangle m_geometry; bool m_toolbarVisible; @@ -312,7 +319,8 @@ public: WebKitWindowProperties* windowProperties = webkit_web_view_get_window_properties(webView); g_assert(windowProperties); - WindowProperties(windowProperties).assertEqual(m_windowProperties); + if (!m_windowProperties.isNull()) + WindowProperties(windowProperties).assertEqual(m_windowProperties); m_webViewEvents.append(ReadyToShow); } |