Changeset 207403 in webkit
- Timestamp:
- Oct 17, 2016 2:06:17 AM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r207401 r207403 1 2016-10-17 Alberto Garcia <berto@igalia.com> 2 3 [GTK] gobject-introspection on package build with webkit2gtk fails without active X session 4 https://bugs.webkit.org/show_bug.cgi?id=163105 5 6 Reviewed by Carlos Garcia Campos. 7 8 Don't call XCompositeQueryExtension() or XDamageQueryExtension() 9 if m_display is NULL. 10 11 * platform/graphics/x11/PlatformDisplayX11.cpp: 12 (WebCore::PlatformDisplayX11::supportsXComposite): 13 (WebCore::PlatformDisplayX11::supportsXDamage): 14 1 15 2016-10-16 Nan Wang <n_wang@apple.com> 2 16 -
trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
r205852 r207403 77 77 { 78 78 if (!m_supportsXComposite) { 79 int eventBase, errorBase; 80 m_supportsXComposite = XCompositeQueryExtension(m_display, &eventBase, &errorBase); 79 if (m_display) { 80 int eventBase, errorBase; 81 m_supportsXComposite = XCompositeQueryExtension(m_display, &eventBase, &errorBase); 82 } else 83 m_supportsXComposite = false; 81 84 } 82 85 return m_supportsXComposite.value(); … … 86 89 { 87 90 if (!m_supportsXDamage) { 91 m_supportsXDamage = false; 88 92 #if PLATFORM(GTK) 89 i nt eventBase, errorBase;90 m_supportsXDamage = XDamageQueryExtension(m_display, &eventBase, &errorBase);91 if (m_supportsXDamage.value())92 m_damageEventBase = eventBase;93 #else 94 m_supportsXDamage = false;93 if (m_display) { 94 int eventBase, errorBase; 95 m_supportsXDamage = XDamageQueryExtension(m_display, &eventBase, &errorBase); 96 if (m_supportsXDamage.value()) 97 m_damageEventBase = eventBase; 98 } 95 99 #endif 96 100 }
Note: See TracChangeset
for help on using the changeset viewer.