Title: [207969] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 207969
- Author
- carlo...@webkit.org
- Date
- 2016-10-27 02:35:28 -0700 (Thu, 27 Oct 2016)
Log Message
Merge r207403 - [GTK] gobject-introspection on package build with webkit2gtk fails without active X session
https://bugs.webkit.org/show_bug.cgi?id=163105
Reviewed by Carlos Garcia Campos.
Don't call XCompositeQueryExtension() or XDamageQueryExtension()
if m_display is NULL.
* platform/graphics/x11/PlatformDisplayX11.cpp:
(WebCore::PlatformDisplayX11::supportsXComposite):
(WebCore::PlatformDisplayX11::supportsXDamage):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207968 => 207969)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-27 09:34:40 UTC (rev 207968)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-27 09:35:28 UTC (rev 207969)
@@ -1,3 +1,17 @@
+2016-10-17 Alberto Garcia <be...@igalia.com>
+
+ [GTK] gobject-introspection on package build with webkit2gtk fails without active X session
+ https://bugs.webkit.org/show_bug.cgi?id=163105
+
+ Reviewed by Carlos Garcia Campos.
+
+ Don't call XCompositeQueryExtension() or XDamageQueryExtension()
+ if m_display is NULL.
+
+ * platform/graphics/x11/PlatformDisplayX11.cpp:
+ (WebCore::PlatformDisplayX11::supportsXComposite):
+ (WebCore::PlatformDisplayX11::supportsXDamage):
+
2016-10-16 Carlos Garcia Campos <cgar...@igalia.com>
Document request not updated after willSendRequest is called for a redirect
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp (207968 => 207969)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-10-27 09:34:40 UTC (rev 207968)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-10-27 09:35:28 UTC (rev 207969)
@@ -76,8 +76,11 @@
bool PlatformDisplayX11::supportsXComposite() const
{
if (!m_supportsXComposite) {
- int eventBase, errorBase;
- m_supportsXComposite = XCompositeQueryExtension(m_display, &eventBase, &errorBase);
+ if (m_display) {
+ int eventBase, errorBase;
+ m_supportsXComposite = XCompositeQueryExtension(m_display, &eventBase, &errorBase);
+ } else
+ m_supportsXComposite = false;
}
return m_supportsXComposite.value();
}
@@ -85,13 +88,14 @@
bool PlatformDisplayX11::supportsXDamage(Optional<int>& damageEventBase) const
{
if (!m_supportsXDamage) {
+ m_supportsXDamage = false;
#if PLATFORM(GTK)
- int eventBase, errorBase;
- m_supportsXDamage = XDamageQueryExtension(m_display, &eventBase, &errorBase);
- if (m_supportsXDamage.value())
- m_damageEventBase = eventBase;
-#else
- m_supportsXDamage = false;
+ if (m_display) {
+ int eventBase, errorBase;
+ m_supportsXDamage = XDamageQueryExtension(m_display, &eventBase, &errorBase);
+ if (m_supportsXDamage.value())
+ m_damageEventBase = eventBase;
+ }
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
