Bug 1575420 - Replace MOZ_WIDGET_TOOLKIT value of "gtk3" with "gtk". r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D42765 --HG-- extra : moz-landing-system : lando
2019-08-21 12:25:42 +00:00 · 2019-08-21 12:25:42 +00:00 · 66d7fe943e
--- a/accessible/aom/moz.build
+++ b/accessible/aom/moz.build
@ -17,7 +17,7 @@ LOCAL_INCLUDES += [
    '/accessible/generic',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    LOCAL_INCLUDES += [
        '/accessible/atk',
    ]
--- a/accessible/atk/moz.build
+++ b/accessible/atk/moz.build
@ -46,7 +46,7 @@ LOCAL_INCLUDES += [

 FINAL_LIBRARY = 'xul'

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CFLAGS += CONFIG['TK_CFLAGS']
    CXXFLAGS += CONFIG['TK_CFLAGS']

--- a/accessible/base/moz.build
+++ b/accessible/base/moz.build
@ -90,7 +90,7 @@ LOCAL_INCLUDES += [
    '/layout/xul/tree/',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    LOCAL_INCLUDES += [
        '/accessible/atk',
    ]
--- a/accessible/generic/moz.build
+++ b/accessible/generic/moz.build
@ -47,7 +47,7 @@ else:
        '/accessible/ipc/other',
    ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    LOCAL_INCLUDES += [
        '/accessible/atk',
    ]
--- a/accessible/html/moz.build
+++ b/accessible/html/moz.build
@ -25,7 +25,7 @@ LOCAL_INCLUDES += [
    '/layout/xul',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    LOCAL_INCLUDES += [
        '/accessible/atk',
    ]
--- a/accessible/ipc/moz.build
+++ b/accessible/ipc/moz.build
@ -16,7 +16,7 @@ else:
    LOCAL_INCLUDES += [
        '/accessible/ipc/other',
    ]
-    if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
        LOCAL_INCLUDES += [
            '/accessible/atk',
        ]
--- a/accessible/ipc/other/moz.build
+++ b/accessible/ipc/other/moz.build
@ -25,7 +25,7 @@ if CONFIG['ACCESSIBILITY']:
        '../../xpcom',
    ]

-    if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
        LOCAL_INCLUDES += [
            '/accessible/atk',
        ]
--- a/accessible/moz.build
+++ b/accessible/moz.build
@ -6,7 +6,7 @@

 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']

-if 'gtk' in toolkit:
+if toolkit == 'gtk':
    DIRS += ['atk']
 elif toolkit == 'windows':
    DIRS += ['windows']
--- a/accessible/xpcom/moz.build
+++ b/accessible/xpcom/moz.build
@ -35,7 +35,7 @@ LOCAL_INCLUDES += [
    '/accessible/generic',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    LOCAL_INCLUDES += [
        '/accessible/atk',
    ]
--- a/accessible/xul/moz.build
+++ b/accessible/xul/moz.build
@ -29,7 +29,7 @@ LOCAL_INCLUDES += [
    '/layout/xul/tree',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    LOCAL_INCLUDES += [
        '/accessible/atk',
    ]
--- a/browser/base/content/browser-tabsintitlebar.js
+++ b/browser/base/content/browser-tabsintitlebar.js
@ -36,7 +36,7 @@ var TabsInTitlebar;
        case "cocoa":
          isSupported = true;
          break;
-        case "gtk3":
+        case "gtk":
          isSupported = window.matchMedia("(-moz-gtk-csd-available)").matches;
          break;
      }
--- a/browser/base/content/test/contextMenu/browser.ini
+++ b/browser/base/content/test/contextMenu/browser.ini
@ -23,6 +23,6 @@ skip-if = os == "linux" || os == "mac" #Bug 1444631
 [browser_contextmenu_childprocess.js]
 [browser_contextmenu.js]
 tags = fullscreen clipboard
-skip-if = toolkit == "gtk3" || verify || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1531590
+skip-if = toolkit == "gtk" || verify || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1531590
 [browser_contextmenu_input.js]
-skip-if = toolkit == "gtk3" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
+skip-if = toolkit == "gtk" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
--- a/browser/base/content/test/plugins/browser-rs-blocklist.ini
+++ b/browser/base/content/test/plugins/browser-rs-blocklist.ini
@ -39,7 +39,7 @@ support-files =
 [browser_bug812562.js]
 [browser_clearplugindata.js]
 [browser_CTP_context_menu.js]
-skip-if = fission || toolkit == "gtk3"   # fails intermittently on Linux (bug 909342)
+skip-if = fission || toolkit == "gtk"   # fails intermittently on Linux (bug 909342)
 [browser_CTP_crashreporting.js]
 skip-if = !crashreporter || verify || os == 'win' # bug 1442837
 [browser_CTP_drag_drop.js]
--- a/browser/base/content/test/plugins/browser.ini
+++ b/browser/base/content/test/plugins/browser.ini
@ -57,7 +57,7 @@ tags = blocklist
 [browser_clearplugindata.js]
 tags = blocklist
 [browser_CTP_context_menu.js]
-skip-if = fission || toolkit == "gtk3"   # fails intermittently on Linux (bug 909342)
+skip-if = fission || toolkit == "gtk"   # fails intermittently on Linux (bug 909342)
 tags = blocklist
 [browser_CTP_crashreporting.js]
 skip-if = !crashreporter || verify || os == 'win' # bug 1442837
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@ -64,10 +64,10 @@ DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']

 DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3', 'cocoa'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk', 'cocoa'):
    DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk'):
    DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1

 JAR_MANIFESTS += ['jar.mn']
--- a/browser/branding/branding-common.mozbuild
+++ b/browser/branding/branding-common.mozbuild
@ -23,7 +23,7 @@ def FirefoxBranding():
            'VisualElements_150.png',
            'VisualElements_70.png',
        ]
-    elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
        FINAL_TARGET_FILES.chrome.icons.default += [
            'default128.png',
            'default16.png',
--- a/browser/components/build/components.conf
+++ b/browser/components/build/components.conf
@ -21,7 +21,7 @@ shell_service_contracts = [
    '@mozilla.org/toolkit/shell-service;1',
 ]

-if TOOLKIT == 'gtk3':
+if TOOLKIT == 'gtk':
    Classes += [
        {
            'cid': '{63c7b9f4-0cc8-43f8-b666-0a661655cb73}',
--- a/browser/components/preferences/in-content/moz.build
+++ b/browser/components/preferences/in-content/moz.build
@ -7,7 +7,7 @@
 for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
    DEFINES[var] = CONFIG[var]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3', 'cocoa'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk', 'cocoa'):
    DEFINES['HAVE_SHELL_SERVICE'] = 1

 JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/preferences/moz.build
+++ b/browser/components/preferences/moz.build
@ -16,7 +16,7 @@ BROWSER_CHROME_MANIFESTS += [
 for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
    DEFINES[var] = CONFIG[var]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3', 'cocoa'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk', 'cocoa'):
    DEFINES['HAVE_SHELL_SERVICE'] = 1

 JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build
@ -26,7 +26,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
    SOURCES += [
        'nsMacShellService.cpp',
    ]
-elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    XPIDL_SOURCES += [
        'nsIGNOMEShellService.idl',
    ]
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@ -33,11 +33,8 @@ ifdef MOZ_LAYOUT_DEBUGGER
 DEFINES += -DMOZ_LAYOUT_DEBUGGER=1
 endif

-ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
 DEFINES += -DMOZ_GTK=1
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
-DEFINES += -DMOZ_GTK3=1
-endif
 endif

 ifdef MOZ_SYSTEM_NSPR
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@ -98,7 +98,7 @@
@BINPATH@/ucrtbase.dll
 #endif
 #endif
-#ifdef MOZ_GTK3
+#ifdef MOZ_GTK
@BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
@BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
 #ifdef MOZ_WAYLAND
--- a/browser/themes/moz.build
+++ b/browser/themes/moz.build
@ -11,7 +11,7 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']

 if toolkit == 'cocoa':
    DIRS += ['osx']
-elif toolkit == 'gtk3':
+elif toolkit == 'gtk':
    DIRS += ['linux']
 else:
    DIRS += ['windows']
--- a/chrome/moz.build
+++ b/chrome/moz.build
@ -40,7 +40,7 @@ LOCAL_INCLUDES += [
    '/xpcom/components'
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['TK_CFLAGS']

 with Files("**"):
--- a/config/recurse.mk
+++ b/config/recurse.mk
@ -188,7 +188,7 @@ endif

 # Interdependencies that moz.build world don't know about yet for compilation.
 # Note some others are hardcoded or "guessed" in recursivemake.py and emitter.py
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
 toolkit/library/target: widget/gtk/mozgtk/gtk3/target
 endif
 endif
--- a/dom/geolocation/moz.build
+++ b/dom/geolocation/moz.build
@ -46,7 +46,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
    LOCAL_INCLUDES += [
        '/dom/system/windows',
    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    if CONFIG['MOZ_GPSD']:
        LOCAL_INCLUDES += [
            '/dom/system/linux',
--- a/dom/ipc/tests/mochitest.ini
+++ b/dom/ipc/tests/mochitest.ini
@ -15,7 +15,7 @@ skip-if = e10s || toolkit == 'android'
 [test_child_docshell.html]
 skip-if = toolkit == 'cocoa' # cocoa: disabled due to hangs, see changeset 6852e7c47edf
 [test_CrashService_crash.html]
-skip-if = !(crashreporter && !e10s && (toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows'))
+skip-if = !(crashreporter && !e10s && (toolkit == 'gtk' || toolkit == 'cocoa' || toolkit == 'windows'))
 [test_temporaryfile_stream.html]
 skip-if = !e10s || toolkit == 'android' || (os == "win" && processor == "aarch64") # Bug 1525959, aarch64 due to 1531150
 support-files =
--- a/dom/moz.build
+++ b/dom/moz.build
@ -119,7 +119,7 @@ TEST_DIRS += [
    'imptests',
 ]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'cocoa', 'windows'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'cocoa', 'windows'):
    TEST_DIRS += ['plugins/test']

 SPHINX_TREES['dom'] = 'docs'
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@ -140,7 +140,7 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':

 DEFINES['FORCE_PR_LOG'] = True

-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gtk':
    CXXFLAGS += CONFIG['TK_CFLAGS']
 else:
    # Force build against gtk+2 for struct offsets and such.
--- a/dom/plugins/test/mochitest/mochitest.ini
+++ b/dom/plugins/test/mochitest/mochitest.ini
@ -71,9 +71,9 @@ support-files = cocoa_focus.html
 skip-if = toolkit != "cocoa" # Bug 1194534
 support-files = cocoa_window_focus.html
 [test_copyText.html]
-skip-if = toolkit != "gtk3"
+skip-if = toolkit != "gtk"
 [test_crash_nested_loop.html]
-skip-if = toolkit != "gtk3"
+skip-if = toolkit != "gtk"
 [test_crashing.html]
 skip-if = !crashreporter
 [test_crashing2.html]
@ -149,6 +149,6 @@ skip-if = !(os == "win" && processor == "x86_64") || verify
 [test_windowless_ime.html]
 skip-if = os != "win" || (os == "win" && processor == "aarch64") # aarch64 due to 1536350
 [test_x11_error_crash.html]
-skip-if = !crashreporter || e10s || toolkit != "gtk3"
+skip-if = !crashreporter || e10s || toolkit != "gtk"
 [test_zero_opacity.html]
 skip-if = os == "win" && webrender # win/webrender bug 1296400
--- a/dom/plugins/test/moz.build
+++ b/dom/plugins/test/moz.build
@ -8,7 +8,7 @@ DIRS += ['testplugin']

 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'cocoa', 'windows'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'cocoa', 'windows'):
    MOCHITEST_MANIFESTS += ['mochitest/mochitest.ini']
    MOCHITEST_CHROME_MANIFESTS += ['mochitest/chrome.ini']
    BROWSER_CHROME_MANIFESTS += ['mochitest/browser.ini']
--- a/dom/plugins/test/testplugin/testplugin.mozbuild
+++ b/dom/plugins/test/testplugin/testplugin.mozbuild
@ -18,7 +18,7 @@ if toolkit == 'cocoa':
    UNIFIED_SOURCES += [
        'nptest_macosx.mm'
    ]
-elif toolkit == 'gtk3':
+elif toolkit == 'gtk':
    UNIFIED_SOURCES += [
        'nptest_gtk2.cpp',
    ]
@ -47,7 +47,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and CONFIG['TARGET_CPU'] == 'x86_64':
    OS_LIBS += ['-framework Carbon']

-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
    CFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
    OS_LIBS += CONFIG['MOZ_GTK2_LIBS']
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@ -49,7 +49,7 @@ elif toolkit == 'cocoa':
    DIRS += ['mac']
 elif toolkit == 'android':
    DIRS += ['android']
-elif toolkit == 'gtk3':
+elif toolkit == 'gtk':
    DIRS += ['linux']

 if toolkit != 'cocoa':
--- a/dom/xbl/builtin/moz.build
+++ b/dom/xbl/builtin/moz.build
@ -10,7 +10,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
    DIRS += ['mac']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
    DIRS += ['android']
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    DIRS += ['unix']
 else:
    DIRS += ['emacs']
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@ -102,7 +102,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
        'JobScheduler_posix.cpp',
    ]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk'):
    EXPORTS.mozilla.gfx += [
        'UnscaledFontFreeType.h',
    ]
@ -111,7 +111,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
        'UnscaledFontFreeType.cpp',
    ]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    SOURCES += [
        'ScaledFontFontconfig.cpp',
    ]
@ -240,12 +240,12 @@ FINAL_LIBRARY = 'xul'
 for var in ('USE_CAIRO', 'MOZ2D_HAS_MOZ_CAIRO'):
    DEFINES[var] = True

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk'):
    DEFINES['MOZ_ENABLE_FREETYPE'] = True

 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk'):
    CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

 LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@ -70,7 +70,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'beos':
    SOURCES += [
        'cairo-beos-surface.cpp',
    ]
-elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    EXPORTS.cairo += [
        'cairo-ps.h',
    ]
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@ -12,7 +12,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
    gl_provider = 'CGL'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
    gl_provider = 'EAGL'
-elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    if CONFIG['MOZ_EGL_XRENDER_COMPOSITE']:
        gl_provider = 'EGL'
    else:
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@ -83,7 +83,7 @@ UNIFIED_SOURCES += [
    'hb-warning.cc',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    EXPORTS.harfbuzz += [
        'hb-glib.h',
    ]
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@ -117,11 +117,11 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
        '-Wno-unused-private-field',
    ]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
    CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
    CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

 if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
@ -401,7 +401,7 @@ def write_mozbuild(sources):
  f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):\n")
  write_sources(f, sources['mac'], 4)

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

  f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':\n")
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@ -367,7 +367,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
    SOURCES += [
        'skia/src/ports/SkFontHost_mac.cpp',
    ]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    UNIFIED_SOURCES += [
        'skia/src/ports/SkDebug_stdio.cpp',
        'skia/src/ports/SkOSFile_posix.cpp',
@ -493,11 +493,11 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
        '-Wno-unused-private-field',
    ]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
    CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
    CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

 if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@ -92,5 +92,5 @@ FINAL_LIBRARY = 'xul'
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 CXXFLAGS += CONFIG['TK_CFLAGS']

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@ -109,7 +109,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
        'gfxQuartzSurface.cpp',
        'PrintTargetCG.mm',
    ]
-elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    EXPORTS += [
        'gfxFT2FontBase.h',
        'gfxGdkNativeRenderer.h',
@ -260,7 +260,7 @@ LOCAL_INCLUDES += [
    '/dom/xml',
 ]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk'):
    DEFINES['MOZ_ENABLE_FREETYPE'] = True

 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
@ -276,7 +276,7 @@ CFLAGS += CONFIG['TK_CFLAGS']
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
    CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

 if CONFIG['MOZ_WAYLAND']:
--- a/gfx/webrender_bindings/moz.build
+++ b/gfx/webrender_bindings/moz.build
@ -78,7 +78,7 @@ if CONFIG['MOZ_WAYLAND']:
        'RenderCompositorEGL.cpp',
    ]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk'):
    CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
    CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

--- a/image/decoders/icon/moz.build
+++ b/image/decoders/icon/moz.build
@ -23,7 +23,7 @@ EXPORTS += [

 platform = None

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    platform = 'gtk'

 if CONFIG['OS_ARCH'] == 'WINNT':
--- a/image/decoders/moz.build
+++ b/image/decoders/moz.build
@ -8,7 +8,7 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']

 # The Icon Channel stuff really shouldn't live in decoders/icon, but we'll
 # fix that another time.
-if 'gtk' in toolkit:
+if toolkit == 'gtk':
    DIRS += ['icon/gtk', 'icon']

 if CONFIG['OS_ARCH'] == 'WINNT':
--- a/intl/locale/moz.build
+++ b/intl/locale/moz.build
@ -12,7 +12,7 @@ if toolkit == 'windows':
    DIRS += ['windows']
 elif toolkit == 'cocoa':
    DIRS += ['mac']
-elif 'gtk' in toolkit:
+elif toolkit == 'gtk':
    DIRS += ['gtk']
 elif toolkit == 'android':
    DIRS += ['android']
--- a/intl/lwbrk/moz.build
+++ b/intl/lwbrk/moz.build
@ -16,7 +16,7 @@ UNIFIED_SOURCES += [
    'WordBreaker.cpp',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    SOURCES += [
        'nsPangoBreaker.cpp',
    ]
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@ -105,7 +105,7 @@ if os_linux:
        DEFINES['_POSIX_MONOTONIC_CLOCK'] = 0

 if os_bsd or os_linux:
-    if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
        SOURCES += [
            'src/base/message_pump_glib.cc',
        ]
--- a/layout/base/tests/mochitest.ini
+++ b/layout/base/tests/mochitest.ini
@ -130,7 +130,7 @@ support-files = bug1080361_inner.html
 [test_bug1093686.html]
 support-files = bug1093686_inner.html
 [test_bug1120705.html]
-skip-if = toolkit == 'android' || os == 'mac' || toolkit == 'gtk3' # android does not have clickable scrollbars, mac does not have scrollbar down and up buttons, gtk may or may not have scrollbar buttons depending on theme
+skip-if = toolkit == 'android' || os == 'mac' || toolkit == 'gtk' # android does not have clickable scrollbars, mac does not have scrollbar down and up buttons, gtk may or may not have scrollbar buttons depending on theme
 [test_bug1153130.html]
 skip-if = toolkit == 'android' # We don't support pointer event on android
 support-files = bug1153130_inner.html
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@ -263,7 +263,7 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']

 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['TK_CFLAGS']

 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@ -117,7 +117,7 @@ skip-if = toolkit == 'android' || headless # Headless:Bug 1405871
 # Disable the caret movement by word test on Linux because the shortcut keys
 # are defined in system level.  So, it depends on the environment.
 # Disable on Windows for too many intermittent failures (bug 916143).
-skip-if = (toolkit == "gtk3") || (os == "win")
+skip-if = (toolkit == "gtk") || (os == "win")
 [test_overflow_event.html]
 [test_page_scroll_with_fixed_pos.html]
 support-files = page_scroll_with_fixed_pos_window.html
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@ -143,7 +143,7 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 712600-3.html 712600-3-r
 == 817406-3.html 817406-1-ref.html
 == 817406-4.html 817406-4-ref.html
 == 847242-1.html 847242-1-ref.html
-pref(layout.css.xul-tree-pseudos.content.enabled,true) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",0-1,0-11) == chrome://reftest/content/bidi/869833-1.xul chrome://reftest/content/bidi/869833-1-ref.xul
+pref(layout.css.xul-tree-pseudos.content.enabled,true) fuzzy-if(xulRuntime.widgetToolkit=="gtk",0-1,0-11) == chrome://reftest/content/bidi/869833-1.xul chrome://reftest/content/bidi/869833-1-ref.xul
 == 922530-1.html 922530-1-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 922550-1.html 922550-1-ref.html # Bug 1392106
 == 989994-1.html 989994-1-ref.html
--- a/layout/reftests/scrolling/reftest.list
+++ b/layout/reftests/scrolling/reftest.list
@ -1,5 +1,5 @@
 HTTP == deferred-anchor.xhtml#d deferred-anchor-ref.xhtml#d
-fuzzy-if(xulRuntime.widgetToolkit=="gtk3",0-1,0-23) == deferred-anchor2.xhtml deferred-anchor-ref.xhtml#d # bug 1182632
+fuzzy-if(xulRuntime.widgetToolkit=="gtk",0-1,0-23) == deferred-anchor2.xhtml deferred-anchor-ref.xhtml#d # bug 1182632
 HTTP == fixed-1.html fixed-1.html?ref
 fuzzy-if(skiaContent,0-1,0-32200) HTTP == fixed-table-1.html fixed-table-1.html?ref
 HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
--- a/layout/reftests/xul/reftest.list
+++ b/layout/reftests/xul/reftest.list
@ -7,7 +7,7 @@ random-if(Android) == chrome://reftest/content/xul/menulist-shrinkwrap-2.xul chr
 == chrome://reftest/content/xul/textbox-overflow-1.xul chrome://reftest/content/xul/textbox-overflow-1-ref.xul # for bug 749658
 # accesskeys are not normally displayed on Mac, so set a pref to enable them
 pref(ui.key.menuAccessKey,18) == chrome://reftest/content/xul/accesskey.xul chrome://reftest/content/xul/accesskey-ref.xul
-pref(layout.css.xul-tree-pseudos.content.enabled,true) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",0-1,0-11) == chrome://reftest/content/xul/tree-row-outline-1.xul chrome://reftest/content/xul/tree-row-outline-1-ref.xul # win8: bug 1254832
+pref(layout.css.xul-tree-pseudos.content.enabled,true) fuzzy-if(xulRuntime.widgetToolkit=="gtk",0-1,0-11) == chrome://reftest/content/xul/tree-row-outline-1.xul chrome://reftest/content/xul/tree-row-outline-1-ref.xul # win8: bug 1254832
 skip-if(!cocoaWidget) fails-if(webrender&&cocoaWidget) == chrome://reftest/content/xul/mac-tab-toolbar.xul chrome://reftest/content/xul/mac-tab-toolbar-ref.xul
 pref(layout.css.xul-tree-pseudos.content.enabled,true) != chrome://reftest/content/xul/tree-row-outline-1.xul chrome://reftest/content/xul/tree-row-outline-1-notref.xul
 == chrome://reftest/content/xul/text-crop.xul chrome://reftest/content/xul/text-crop-ref.xul
--- a/layout/tools/reftest/manifest.jsm
+++ b/layout/tools/reftest/manifest.jsm
@ -466,7 +466,7 @@ function BuildConditionSandbox(aURL) {
    // Shortcuts for widget toolkits.
    sandbox.Android = xr.OS == "Android";
    sandbox.cocoaWidget = xr.widgetToolkit == "cocoa";
-    sandbox.gtkWidget = xr.widgetToolkit == "gtk3";
+    sandbox.gtkWidget = xr.widgetToolkit == "gtk";
    sandbox.qtWidget = xr.widgetToolkit == "qt";
    sandbox.winWidget = xr.widgetToolkit == "windows";

@ -477,7 +477,7 @@ function BuildConditionSandbox(aURL) {
    sandbox.geckoview = (sandbox.Android && g.browserIsRemote);

    // Scrollbars that are semi-transparent. See bug 1169666.
-    sandbox.transparentScrollbars = xr.widgetToolkit == "gtk3";
+    sandbox.transparentScrollbars = xr.widgetToolkit == "gtk";

    if (sandbox.Android) {
        var sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@ -39,7 +39,7 @@ LOCAL_INCLUDES += [
    '/netwerk/streamconv/converters',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    LOCAL_INCLUDES += [
        '/netwerk/protocol/gio',
    ]
--- a/netwerk/protocol/moz.build
+++ b/netwerk/protocol/moz.build
@ -5,6 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DIRS += ['about', 'data', 'file', 'ftp']
-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    DIRS += ['gio']
 DIRS += ['http', 'res', 'viewsource', 'websocket' ]
--- a/old-configure.in
+++ b/old-configure.in
@ -1785,7 +1785,7 @@ gtk*)
 esac

 if test "$COMPILE_ENVIRONMENT"; then
-  if test "$MOZ_WIDGET_TOOLKIT" = gtk3; then
+  if test "$MOZ_WIDGET_TOOLKIT" = gtk; then
    PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES)
    MOZ_GTK3_CFLAGS="-I${_topsrcdir}/widget/gtk/compat-gtk3 $MOZ_GTK3_CFLAGS"
    TK_CFLAGS=$MOZ_GTK3_CFLAGS
--- a/python/mozbuild/mozbuild/test/test_mozinfo.py
+++ b/python/mozbuild/mozbuild/test/test_mozinfo.py
@ -60,21 +60,21 @@ class TestBuildDict(unittest.TestCase, Base):
        d = build_dict(self._config(dict(
            OS_TARGET='Linux',
            TARGET_CPU='i386',
-            MOZ_WIDGET_TOOLKIT='gtk3',
+            MOZ_WIDGET_TOOLKIT='gtk',
        )))
        self.assertEqual('linux', d['os'])
        self.assertEqual('x86', d['processor'])
-        self.assertEqual('gtk3', d['toolkit'])
+        self.assertEqual('gtk', d['toolkit'])
        self.assertEqual(32, d['bits'])

        d = build_dict(self._config(dict(
            OS_TARGET='Linux',
            TARGET_CPU='x86_64',
-            MOZ_WIDGET_TOOLKIT='gtk3',
+            MOZ_WIDGET_TOOLKIT='gtk',
        )))
        self.assertEqual('linux', d['os'])
        self.assertEqual('x86_64', d['processor'])
-        self.assertEqual('gtk3', d['toolkit'])
+        self.assertEqual('gtk', d['toolkit'])
        self.assertEqual(64, d['bits'])

    def test_mac(self):
@ -134,14 +134,14 @@ class TestBuildDict(unittest.TestCase, Base):
        d = build_dict(self._config(dict(
            OS_TARGET='Linux',
            TARGET_CPU='arm',
-            MOZ_WIDGET_TOOLKIT='gtk3',
+            MOZ_WIDGET_TOOLKIT='gtk',
        )))
        self.assertEqual('arm', d['processor'])

        d = build_dict(self._config(dict(
            OS_TARGET='Linux',
            TARGET_CPU='armv7',
-            MOZ_WIDGET_TOOLKIT='gtk3',
+            MOZ_WIDGET_TOOLKIT='gtk',
        )))
        self.assertEqual('arm', d['processor'])

@ -167,14 +167,14 @@ class TestBuildDict(unittest.TestCase, Base):
        d = build_dict(self._config(dict(
            OS_TARGET='Linux',
            TARGET_CPU='i386',
-            MOZ_WIDGET_TOOLKIT='gtk3',
+            MOZ_WIDGET_TOOLKIT='gtk',
        )))
        self.assertEqual(False, d['debug'])

        d = build_dict(self._config(dict(
            OS_TARGET='Linux',
            TARGET_CPU='i386',
-            MOZ_WIDGET_TOOLKIT='gtk3',
+            MOZ_WIDGET_TOOLKIT='gtk',
            MOZ_DEBUG='1',
        )))
        self.assertEqual(True, d['debug'])
@ -186,14 +186,14 @@ class TestBuildDict(unittest.TestCase, Base):
        d = build_dict(self._config(dict(
            OS_TARGET='Linux',
            TARGET_CPU='i386',
-            MOZ_WIDGET_TOOLKIT='gtk3',
+            MOZ_WIDGET_TOOLKIT='gtk',
        )))
        self.assertEqual(False, d['crashreporter'])

        d = build_dict(self._config(dict(
            OS_TARGET='Linux',
            TARGET_CPU='i386',
-            MOZ_WIDGET_TOOLKIT='gtk3',
+            MOZ_WIDGET_TOOLKIT='gtk',
            MOZ_CRASHREPORTER='1',
        )))
        self.assertEqual(True, d['crashreporter'])
--- a/security/manager/ssl/moz.build
+++ b/security/manager/ssl/moz.build
@ -138,7 +138,7 @@ UNIFIED_SOURCES += [
    'TransportSecurityInfo.cpp',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    UNIFIED_SOURCES += [
        'LibSecret.cpp',
    ]
--- a/security/sandbox/linux/broker/moz.build
+++ b/security/sandbox/linux/broker/moz.build
@ -30,7 +30,7 @@ LOCAL_INCLUDES += [
    '/security/sandbox/chromium',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['GLIB_CFLAGS']
    CXXFLAGS += CONFIG['TK_CFLAGS']

--- a/testing/mozbase/manifestparser/tests/test_testmanifest.py
+++ b/testing/mozbase/manifestparser/tests/test_testmanifest.py
@ -34,7 +34,7 @@ class TestTestManifest(unittest.TestCase):
                         ['fleem'])

        # You should be able to expect failures:
-        last = manifest.active_tests(exists=False, toolkit='gtk3')[-1]
+        last = manifest.active_tests(exists=False, toolkit='gtk')[-1]
        self.assertEqual(last['name'], 'linuxtest')
        self.assertEqual(last['expected'], 'pass')
        last = manifest.active_tests(exists=False, toolkit='cocoa')[-1]
--- a/testing/tools/screenshot/moz.build
+++ b/testing/tools/screenshot/moz.build
@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT'] and CONFIG['MOZ_X11']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk' and CONFIG['MOZ_X11']:
    Program('screentopng')
    SOURCES += [
        'gdk-screenshot.cpp',
--- a/toolkit/components/remote/moz.build
+++ b/toolkit/components/remote/moz.build
@ -11,7 +11,7 @@ SOURCES += [
    'nsRemoteService.cpp',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    SOURCES += [
        'nsGTKRemoteServer.cpp',
        'nsUnixRemoteServer.cpp',
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@ -71,7 +71,7 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
        'breakpad_solaris_common_s',
    ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    UNIFIED_SOURCES += [
        'crashreporter_gtk_common.cpp',
        'crashreporter_linux.cpp',
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@ -159,7 +159,7 @@ if CONFIG['USE_ICU']:
        'icu',
    ]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    USE_LIBS += [
        'mozgtk_stub',
    ]
@ -174,7 +174,7 @@ if CONFIG['MOZ_JPROF']:
        'jprof',
    ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT'] or \
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk' or \
        CONFIG['MOZ_TREE_FREETYPE']:
    USE_LIBS += [
        'freetype',
@ -282,12 +282,9 @@ if CONFIG['OS_ARCH'] == 'OpenBSD':
 if CONFIG['MOZ_ENABLE_DBUS']:
    OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS']

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
-        OS_LIBS += [l for l in CONFIG['TK_LIBS']
-            if l not in ('-lgtk-3', '-lgdk-3')]
-    else:
-        OS_LIBS += CONFIG['TK_LIBS']
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
+    OS_LIBS += [l for l in CONFIG['TK_LIBS']
+        if l not in ('-lgtk-3', '-lgdk-3')]
    OS_LIBS += CONFIG['XLDFLAGS']
    OS_LIBS += CONFIG['XLIBS']
    OS_LIBS += CONFIG['XEXT_LIBS']
--- a/toolkit/locales/moz.build
+++ b/toolkit/locales/moz.build
@ -10,7 +10,7 @@ with Files('**'):
 if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
  DEFINES['MOZ_FENNEC'] = True

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
  DEFINES['MOZ_GTK'] = True

 JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@ -246,10 +246,10 @@ EXTRA_JS_MODULES.sessionstore += [
    'sessionstore/Utils.jsm',
 ]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk'):
    DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3', 'cocoa'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk', 'cocoa'):
    DEFINES['HAVE_SHELL_SERVICE'] = 1

 EXTRA_PP_JS_MODULES += [
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@ -44,7 +44,7 @@ DIRS += ['xre']

 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
    DIRS += ['mozapps/handling']
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    DIRS += ['system/unixproxy']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
    DIRS += ['system/osxproxy']
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@ -230,8 +230,8 @@ def full_toolkit(value):

@depends(full_toolkit)
 def toolkit(toolkit):
-    if toolkit == 'cairo-gtk3-wayland':
-        widget_toolkit = 'gtk3'
+    if toolkit.startswith('cairo-gtk3'):
+        widget_toolkit = 'gtk'
    else:
        widget_toolkit = toolkit.replace('cairo-', '')
    return widget_toolkit
@ -241,8 +241,6 @@ add_old_configure_assignment('MOZ_WIDGET_TOOLKIT', toolkit)

@depends(toolkit)
 def toolkit_define(toolkit):
-    if toolkit == 'gtk3':
-        toolkit = 'gtk'
    if toolkit != 'windows':
        return 'MOZ_WIDGET_%s' % toolkit.upper()

@ -250,7 +248,7 @@ set_define(toolkit_define, True)

@depends(toolkit)
 def toolkit_gtk(toolkit):
-    return toolkit == 'gtk3'
+    return toolkit == 'gtk'

 set_config('MOZ_X11', True, when=toolkit_gtk)
 set_define('MOZ_X11', True, when=toolkit_gtk)
@ -314,7 +312,7 @@ set_define(gl_provider_define, True)
 # ==============================================================
@depends(toolkit)
 def pdf_printing(toolkit):
-    if toolkit in ('windows', 'gtk3', 'android'):
+    if toolkit in ('windows', 'gtk', 'android'):
        return True

@depends(pdf_printing)
@ -336,7 +334,7 @@ option(env='MOZ_INSTRUMENT_EVENT_LOOP',

@depends('MOZ_INSTRUMENT_EVENT_LOOP', toolkit)
 def instrument_event_loop(value, toolkit):
-    if value or (toolkit in ('windows', 'gtk3', 'cocoa', 'android') and
+    if value or (toolkit in ('windows', 'gtk', 'cocoa', 'android') and
                 value.origin == 'default'):
        return True

@ -351,7 +349,7 @@ option(env='USE_FC_FREETYPE',

@depends('USE_FC_FREETYPE', toolkit)
 def fc_freetype(value, toolkit):
-    if value or (toolkit == 'gtk3' and
+    if value or (toolkit == 'gtk' and
                 value.origin == 'default'):
        return True

@ -761,7 +759,7 @@ set_define('NS_PRINT_PREVIEW', printing)
 # ==============================================================
@depends(toolkit)
 def no_speechd_on_non_gtk(toolkit):
-    if toolkit != 'gtk3':
+    if toolkit != 'gtk':
        return False

 imply_option('--enable-synth-speechd', no_speechd_on_non_gtk,
@ -1751,7 +1749,7 @@ with only_when(compile_environment & target_is_windows):

@depends(toolkit)
 def has_remote(toolkit):
-    if 'gtk' in toolkit or toolkit == 'windows':
+    if toolkit in ('gtk', 'windows'):
        return True

 set_config('MOZ_HAS_REMOTE', has_remote)
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@ -12,7 +12,7 @@ ifndef MOZ_PKG_FORMAT
            ifeq (SunOS,$(OS_ARCH))
                MOZ_PKG_FORMAT  = BZ2
            else
-                ifeq (gtk3,$(MOZ_WIDGET_TOOLKIT))
+                ifeq (gtk,$(MOZ_WIDGET_TOOLKIT))
                    MOZ_PKG_FORMAT  = BZ2
                else
                    ifeq (android,$(MOZ_WIDGET_TOOLKIT))
--- a/toolkit/mozapps/update/updater/moz.build
+++ b/toolkit/mozapps/update/updater/moz.build
@ -65,5 +65,5 @@ dep1_cert.inputs += ['dep1.der']
 dep2_cert.inputs += ['dep2.der']
 xpcshell_cert.inputs += ['xpcshellCertificate.der']

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    FINAL_TARGET_FILES.icons += ['updater.png']
--- a/toolkit/mozapps/update/updater/updater-common.build
+++ b/toolkit/mozapps/update/updater/updater-common.build
@ -47,7 +47,7 @@ USE_LIBS += [
    'xz-embedded',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    have_progressui = 1
    srcs += [
        'progressui_gtk.cpp',
@ -100,7 +100,7 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
 elif CONFIG['OS_ARCH'] == 'WINNT':
    WIN32_EXE_LDFLAGS += ['-municode']

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['TK_CFLAGS']
    OS_LIBS += CONFIG['TK_LIBS']

--- a/toolkit/themes/moz.build
+++ b/toolkit/themes/moz.build
@ -20,7 +20,7 @@ app = CONFIG['MOZ_BUILD_APP']

 if toolkit == 'cocoa':
    DIRS += ['osx']
-elif toolkit == 'gtk3':
+elif toolkit == 'gtk':
    DIRS += ['linux']
 elif app == 'mobile/android':
    DIRS += ['mobile']
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@ -156,7 +156,7 @@ DIRS += [
    '/other-licenses/snappy',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    DIRS += [
        '/toolkit/system/gnome',
    ]
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@ -87,7 +87,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
        'nsNativeAppSupportDefault.cpp',
        'UIKitDirProvider.mm',
    ]
-elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    UNIFIED_SOURCES += [
        'nsNativeAppSupportUnix.cpp',
    ]
@ -101,7 +101,7 @@ if CONFIG['MOZ_HAS_REMOTE']:
        '../components/remote',
    ]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    UNIFIED_SOURCES += [
        'nsGDKErrorHandler.cpp',
    ]
@ -245,7 +245,7 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
 CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
 CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

 DEFINES['TOPOBJDIR'] = TOPOBJDIR
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@ -86,7 +86,7 @@ else:
    if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
        CXXFLAGS += ['-Wno-error=shadow']

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    UNIFIED_SOURCES += [
        'unix/nsGNOMERegistry.cpp',
        'unix/nsMIMEInfoUnix.cpp',
@ -144,6 +144,6 @@ if CONFIG['MOZ_ENABLE_DBUS']:
    CXXFLAGS += CONFIG['TK_CFLAGS']
    CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']

-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['TK_CFLAGS']
    CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@ -13,7 +13,7 @@ with Files("*CompositorWidget*"):
 with Files("*WindowSurface*"):
    BUG_COMPONENT = ("Core", "Graphics")

-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    DIRS += ['mozgtk']

 if CONFIG['MOZ_WAYLAND']:
@ -153,7 +153,7 @@ CFLAGS += CONFIG['MOZ_STARTUP_NOTIFICATION_CFLAGS']
 # use only system Cairo symbols that GTK3 uses. This allows that
 # any Cairo objects created can be freely passed back and forth
 # between the widget code and GTK3.
-if not (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3' and CONFIG['MOZ_TREE_CAIRO']):
+if not (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk' and CONFIG['MOZ_TREE_CAIRO']):
    CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

 CXXFLAGS += CONFIG['MOZ_STARTUP_NOTIFICATION_CFLAGS']
--- a/widget/headless/moz.build
+++ b/widget/headless/moz.build
@ -15,8 +15,6 @@ LOCAL_INCLUDES += [
 ]

 widget_dir = CONFIG['MOZ_WIDGET_TOOLKIT']
-if widget_dir == 'gtk3':
-    widget_dir = 'gtk'

 LOCAL_INCLUDES += [
    '/widget/%s' % widget_dir,
--- a/widget/headless/tests/xpcshell.ini
+++ b/widget/headless/tests/xpcshell.ini
@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = toolkit != "gtk3" && toolkit != "windows"
+skip-if = toolkit != "gtk" && toolkit != "windows"
 headless = true

 [test_headless_clipboard.js]
--- a/widget/moz.build
+++ b/widget/moz.build
@ -83,7 +83,7 @@ DIRS += ['headless']
 # multiple implementations of widget can be built on the same
 # source tree.
 #
-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    DIRS += ['gtk']

    if CONFIG['MOZ_X11']:
@ -270,17 +270,17 @@ if toolkit in ('cocoa', 'windows'):
        'nsBaseClipboard.cpp',
    ]

-if toolkit in {'gtk3', 'cocoa', 'windows',
+if toolkit in {'gtk', 'cocoa', 'windows',
               'android', 'uikit'}:
    UNIFIED_SOURCES += [
        'nsBaseFilePicker.cpp',
    ]

-if toolkit in ('gtk3', 'windows', 'cocoa', 'android'):
+if toolkit in ('gtk', 'windows', 'cocoa', 'android'):
    UNIFIED_SOURCES += [
        'nsNativeTheme.cpp',
    ]
-if toolkit == 'gtk3':
+if toolkit == 'gtk':
    XPIDL_SOURCES += [
        'nsIApplicationChooser.idl',
    ]
@ -309,7 +309,7 @@ if toolkit == 'windows':
        'windows/PCompositorWidget.ipdl',
        'windows/PlatformWidgetTypes.ipdlh',
    ]
-elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT'] and CONFIG['MOZ_X11']:
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk' and CONFIG['MOZ_X11']:
    IPDL_SOURCES = [
        'gtk/PCompositorWidget.ipdl',
        'gtk/PlatformWidgetTypes.ipdlh',
@ -322,12 +322,8 @@ else:
        'PlatformWidgetTypes.ipdlh',
    ]

-widget_dir = toolkit
-if widget_dir == 'gtk3':
-    widget_dir = 'gtk'
-
 LOCAL_INCLUDES += [
-    '/widget/%s' % widget_dir,
+    '/widget/%s' % toolkit,
 ]
 FINAL_LIBRARY = 'xul'

--- a/widget/tests/chrome.ini
+++ b/widget/tests/chrome.ini
@ -92,7 +92,7 @@ skip-if = toolkit != "cocoa"

 [test_system_font_changes.xul]
 support-files = system_font_changes.xul
-run-if = toolkit == 'gtk3' # Currently the test works on only gtk3
+run-if = toolkit == 'gtk' # Currently the test works on only gtk3

 # Windows
 # taskbar_previews.xul
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@ -246,5 +246,5 @@ LOCAL_INCLUDES += [
    '/xpcom/ds',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['TK_CFLAGS']
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@ -73,7 +73,7 @@ LOCAL_INCLUDES += [
    '/modules/libjar',
 ]

-if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['TK_CFLAGS']

 if CONFIG['MOZ_LAYOUT_DEBUGGER']:
--- a/xpcom/glue/standalone/moz.build
+++ b/xpcom/glue/standalone/moz.build
@ -32,5 +32,5 @@ DisableStlWrapping()

 DIST_INSTALL = True

-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
    CXXFLAGS += CONFIG['GLIB_CFLAGS']