Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1286317 - part 1 - remove Qt widget usage from gfx. r=jrmuizel
  • Loading branch information
lsalzman committed Jul 13, 2016
1 parent 06ee3b6 commit 16ca322
Show file tree
Hide file tree
Showing 21 changed files with 12 additions and 512 deletions.
4 changes: 1 addition & 3 deletions accessible/base/TextAttrs.cpp
Expand Up @@ -659,9 +659,7 @@ TextAttrsMgr::FontWeightTextAttr::
// font->GetStyle()->weight will give the absolute weight requested of the
// font face. The gfxPangoFontGroup code uses the gfxFontEntry constructor
// which doesn't initialize the weight field.
#if defined(MOZ_WIDGET_QT)
useFontEntryWeight = false;
#elif defined(MOZ_WIDGET_GTK)
#if defined(MOZ_WIDGET_GTK)
useFontEntryWeight = gfxPlatformGtk::UseFcFontList();
#endif

Expand Down
4 changes: 2 additions & 2 deletions gfx/2d/moz.build
Expand Up @@ -202,12 +202,12 @@ FINAL_LIBRARY = 'xul'
for var in ('USE_CAIRO', 'MOZ2D_HAS_MOZ_CAIRO'):
DEFINES[var] = True

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk'):
DEFINES['MOZ_ENABLE_FREETYPE'] = True

CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
2 changes: 0 additions & 2 deletions gfx/gl/GLContextProviderEGL.cpp
Expand Up @@ -7,8 +7,6 @@
#include <gdk/gdkx.h>
// we're using default display for now
#define GET_NATIVE_WINDOW(aWidget) ((EGLNativeWindowType)GDK_WINDOW_XID((GdkWindow*)aWidget->GetNativeData(NS_NATIVE_WINDOW)))
#elif defined(MOZ_WIDGET_QT)
#define GET_NATIVE_WINDOW(aWidget) ((EGLNativeWindowType)aWidget->GetNativeData(NS_NATIVE_SHAREABLE_WINDOW))
#else
#define GET_NATIVE_WINDOW(aWidget) ((EGLNativeWindowType)aWidget->GetNativeData(NS_NATIVE_WINDOW))
#endif
Expand Down
2 changes: 0 additions & 2 deletions gfx/gl/GLContextProviderGLX.cpp
Expand Up @@ -7,8 +7,6 @@
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#define GET_NATIVE_WINDOW(aWidget) GDK_WINDOW_XID((GdkWindow*) aWidget->GetNativeData(NS_NATIVE_WINDOW))
#elif defined(MOZ_WIDGET_QT)
#define GET_NATIVE_WINDOW(aWidget) (Window)(aWidget->GetNativeData(NS_NATIVE_SHAREABLE_WINDOW))
#endif

#include <X11/Xlib.h>
Expand Down
2 changes: 0 additions & 2 deletions gfx/gl/moz.build
Expand Up @@ -17,8 +17,6 @@ elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
gl_provider = 'EGL'
else:
gl_provider = 'GLX'
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
gl_provider = 'GLX'
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
gl_provider = 'EGL'
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
Expand Down
8 changes: 2 additions & 6 deletions gfx/skia/generate_mozbuild.py
Expand Up @@ -66,7 +66,6 @@
'gtk3',
'uikit',
'gonk',
'qt',
}:
DEFINES['SK_FONTHOST_DOES_NOT_USE_FONTMGR'] = 1
Expand Down Expand Up @@ -138,11 +137,11 @@
'-Wno-unused-private-field',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
"""

Expand Down Expand Up @@ -419,9 +418,6 @@ def write_mozbuild(sources):
f.write("if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:\n")
write_sources(f, sources['linux'], 4)

f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':\n")
write_sources(f, sources['linux'], 4)

f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':\n")
# Windows-specific files don't get unification because of nasty headers.
# Luckily there are not many files in this.
Expand Down
17 changes: 2 additions & 15 deletions gfx/skia/moz.build
Expand Up @@ -488,18 +488,6 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
'skia/src/ports/SkFontHost_cairo.cpp',
'skia/src/ports/SkFontHost_FreeType_common.cpp',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
UNIFIED_SOURCES += [
'skia/src/ports/SkDebug_stdio.cpp',
'skia/src/ports/SkOSFile_posix.cpp',
'skia/src/ports/SkOSLibrary_posix.cpp',
'skia/src/ports/SkTLS_pthread.cpp',
'skia/src/utils/SkThreadUtils_pthread.cpp',
]
SOURCES += [
'skia/src/ports/SkFontHost_cairo.cpp',
'skia/src/ports/SkFontHost_FreeType_common.cpp',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
SOURCES += [
'skia/src/ports/SkDebug_win.cpp',
Expand Down Expand Up @@ -602,7 +590,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
'gtk3',
'uikit',
'gonk',
'qt',
}:
DEFINES['SK_FONTHOST_DOES_NOT_USE_FONTMGR'] = 1

Expand Down Expand Up @@ -674,9 +661,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
'-Wno-unused-private-field',
]

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
8 changes: 1 addition & 7 deletions gfx/src/X11Util.h
Expand Up @@ -13,13 +13,9 @@
#if defined(MOZ_WIDGET_GTK)
# include <gdk/gdk.h>
# include <gdk/gdkx.h>
#elif defined(MOZ_WIDGET_QT)
#include "gfxQtPlatform.h"
#undef CursorShape
# include <X11/Xlib.h>
#else
# error Unknown toolkit
#endif
#endif

#include <string.h> // for memset
#include "mozilla/Scoped.h" // for SCOPED_TEMPLATE
Expand All @@ -34,8 +30,6 @@ DefaultXDisplay()
{
#if defined(MOZ_WIDGET_GTK)
return GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
#elif defined(MOZ_WIDGET_QT)
return gfxQtPlatform::GetXDisplay();
#endif
}

Expand Down
2 changes: 0 additions & 2 deletions gfx/thebes/gfxASurface.cpp
Expand Up @@ -151,8 +151,6 @@ gfxASurface::Wrap (cairo_surface_t *csurf, const IntSize& aSize)
/* No wrapper; figure out the surface type and create it */
cairo_surface_type_t stype = cairo_surface_get_type(csurf);

MOZ_ASSERT(stype != CAIRO_SURFACE_TYPE_QT);

if (stype == CAIRO_SURFACE_TYPE_IMAGE) {
result = new gfxImageSurface(csurf);
}
Expand Down
4 changes: 0 additions & 4 deletions gfx/thebes/gfxFT2Fonts.cpp
Expand Up @@ -6,10 +6,6 @@
#if defined(MOZ_WIDGET_GTK)
#include "gfxPlatformGtk.h"
#define gfxToolkitPlatform gfxPlatformGtk
#elif defined(MOZ_WIDGET_QT)
#include <qfontinfo.h>
#include "gfxQtPlatform.h"
#define gfxToolkitPlatform gfxQtPlatform
#elif defined(XP_WIN)
#include "gfxWindowsPlatform.h"
#define gfxToolkitPlatform gfxWindowsPlatform
Expand Down
2 changes: 1 addition & 1 deletion gfx/thebes/gfxFont.h
Expand Up @@ -57,7 +57,7 @@ class gfxTextContextPaint;
// we use a platform-dependent value to harmonize with the platform's own APIs.
#ifdef XP_WIN
#define OBLIQUE_SKEW_FACTOR 0.3
#elif defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
#elif defined(MOZ_WIDGET_GTK)
#define OBLIQUE_SKEW_FACTOR 0.2
#else
#define OBLIQUE_SKEW_FACTOR 0.25
Expand Down
3 changes: 0 additions & 3 deletions gfx/thebes/gfxFontconfigFonts.cpp
Expand Up @@ -12,9 +12,6 @@
#ifdef MOZ_WIDGET_GTK
#include "gfxPlatformGtk.h"
#endif
#ifdef MOZ_WIDGET_QT
#include "gfxQtPlatform.h"
#endif
#include "gfxFontconfigFonts.h"
#include "gfxFT2FontBase.h"
#include "gfxFT2Utils.h"
Expand Down
6 changes: 0 additions & 6 deletions gfx/thebes/gfxPlatform.cpp
Expand Up @@ -43,8 +43,6 @@
#include "gfxQuartzSurface.h"
#elif defined(MOZ_WIDGET_GTK)
#include "gfxPlatformGtk.h"
#elif defined(MOZ_WIDGET_QT)
#include "gfxQtPlatform.h"
#elif defined(ANDROID)
#include "gfxAndroidPlatform.h"
#endif
Expand Down Expand Up @@ -664,8 +662,6 @@ gfxPlatform::Init()
gPlatform = new gfxPlatformMac;
#elif defined(MOZ_WIDGET_GTK)
gPlatform = new gfxPlatformGtk;
#elif defined(MOZ_WIDGET_QT)
gPlatform = new gfxQtPlatform;
#elif defined(ANDROID)
gPlatform = new gfxAndroidPlatform;
#else
Expand All @@ -691,8 +687,6 @@ gfxPlatform::Init()
bool usePlatformFontList = true;
#if defined(MOZ_WIDGET_GTK)
usePlatformFontList = gfxPlatformGtk::UseFcFontList();
#elif defined(MOZ_WIDGET_QT)
usePlatformFontList = false;
#endif

if (usePlatformFontList) {
Expand Down
48 changes: 0 additions & 48 deletions gfx/thebes/gfxQtNativeRenderer.cpp

This file was deleted.

68 changes: 0 additions & 68 deletions gfx/thebes/gfxQtNativeRenderer.h

This file was deleted.

0 comments on commit 16ca322

Please sign in to comment.