799813 - cairo-qt fails to build

Status: RESOLVED FIXED

(Core :: Graphics: Layers, defect)

Description

[Jan Beich]

regressed after this commit
https://hg.mozilla.org/mozilla-central/rev/062549aab268

mozilla-central-dd61540f237c/gfx/layers/opengl/CanvasLayerOGL.cpp: In member function 'virtual void mozilla::layers::CanvasLayerOGL::Initialize(const mozilla::layers::CanvasLayer::Data&)':
mozilla-central-dd61540f237c/gfx/layers/opengl/CanvasLayerOGL.cpp:135: error: 'class gfxXlibSurface' has no member named 'GetGLXPixmap'

Comment 1

[Jan Beich]

Got the order wrong.
https://hg.mozilla.org/mozilla-central/rev/4e1c9887f87d

Comment 2

[Jan Beich]

Attachment: Bug 799813 - Apply bug 788042 under gfx/thebes to fix cairo-qt build on Linux.

More easy to read with clang:

  gfx/layers/opengl/CanvasLayerOGL.cpp:135:26: error:
	no member named 'GetGLXPixmap' in 'gfxXlibSurface'
	  mPixmap = xsurf->GetGLXPixmap();
		    ~~~~~  ^
  1 error generated.

Comment 3

[Karl Tomlinson (:karlt)]

Comment on attachment 669855 [details] [diff] [review]
Bug 799813 - Apply bug 788042 under gfx/thebes to fix cairo-qt build on Linux.

These files are only built when MOZ_X11 is set, so no need to include defined(MOZ_X11).

(I guess these tests perhaps should all be based on MOZ_GL_PROVIDER, but currently that's hard to use and I imagine we'll eventually want to generalize the interface to GetGLSurface or similar, so just the !defined(MOZ_PLATFORM_MAEMO) is good for now.  I don't even know if anyone still builds for Maemo.)

Comment 4

[Jan Beich]

Attachment: Bug 799813 - Qt/Linux needs GetGLXPixmap() after bug 788042. r=karlt

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/6307602406c1

Comment 6

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/6307602406c1

Comment 7

[Jan Beich]

Comment on attachment 669943 [details] [diff] [review]
Bug 799813 - Qt/Linux needs GetGLXPixmap() after bug 788042. r=karlt

[Approval Request Comment]
User impact if declined: broken cairo-qt on Linux (non-Maemo) or other X11 platforms
Risk to taking this patch: broken build for cairo-gtk2 on Linux

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/8f3c3170cc8c