Changeset 207403 in webkit

Timestamp:

Oct 17, 2016 2:06:17 AM (8 years ago)

Author:

berto@igalia.com

Message:

[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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/x11/PlatformDisplayX11.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-17  Alberto Garcia  <berto@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  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp

@@ -77 +77 @@
 {
     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();
@@ -86 +89 @@
 {
     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
     }