2016-07-14 19:16:42 +03:00
|
|
|
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
2013-02-26 01:20:02 +04:00
|
|
|
# vim: set filetype=python:
|
|
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
# 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/.
|
|
|
|
|
2017-04-14 12:54:36 +03:00
|
|
|
with Files("**"):
|
|
|
|
BUG_COMPONENT = ("Core", "Widget")
|
|
|
|
|
|
|
|
with Files("crashtests/*1128214*"):
|
|
|
|
BUG_COMPONENT = ("Core", "Layout")
|
|
|
|
|
|
|
|
with Files("crashtests/*303901*"):
|
|
|
|
BUG_COMPONENT = ("Core", "Graphics")
|
|
|
|
|
|
|
|
with Files("crashtests/*380359*"):
|
|
|
|
BUG_COMPONENT = ("Core", "Widget")
|
|
|
|
|
|
|
|
with Files("reftests/**"):
|
|
|
|
BUG_COMPONENT = ("Core", "Widget: Cocoa")
|
|
|
|
|
|
|
|
with Files("reftests/*fallback*"):
|
|
|
|
BUG_COMPONENT = ("Core", "Layout: Form Controls")
|
|
|
|
|
|
|
|
with Files("*CompositorWidget*"):
|
|
|
|
BUG_COMPONENT = ("Core", "Graphics")
|
|
|
|
|
2017-09-19 03:10:50 +03:00
|
|
|
with Files("*Gfx*"):
|
|
|
|
BUG_COMPONENT = ("Core", "Graphics")
|
|
|
|
|
2017-05-30 05:29:22 +03:00
|
|
|
with Files("*WindowSurface*"):
|
|
|
|
BUG_COMPONENT = ("Core", "Graphics")
|
|
|
|
|
2017-04-14 12:54:36 +03:00
|
|
|
with Files("*FontRange*"):
|
|
|
|
BUG_COMPONENT = ("Core", "Widget: Cocoa")
|
|
|
|
|
2013-02-26 01:20:02 +04:00
|
|
|
toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
|
|
|
|
|
2017-04-18 10:56:09 +03:00
|
|
|
if toolkit in ('cocoa', 'android', 'uikit'):
|
2013-02-26 01:20:02 +04:00
|
|
|
DIRS += [toolkit]
|
|
|
|
|
|
|
|
if toolkit == 'windows':
|
|
|
|
DIRS += ['windows']
|
|
|
|
|
2013-03-12 21:20:41 +04:00
|
|
|
XPIDL_SOURCES += [
|
|
|
|
'nsIJumpListBuilder.idl',
|
|
|
|
'nsIJumpListItem.idl',
|
|
|
|
'nsIPrintSettingsWin.idl',
|
2013-05-17 02:37:18 +04:00
|
|
|
'nsITaskbarOverlayIconController.idl',
|
2013-03-12 21:20:41 +04:00
|
|
|
'nsITaskbarPreview.idl',
|
2013-05-16 21:22:02 +04:00
|
|
|
'nsITaskbarPreviewButton.idl',
|
2013-05-17 02:37:18 +04:00
|
|
|
'nsITaskbarPreviewController.idl',
|
2013-05-16 21:22:02 +04:00
|
|
|
'nsITaskbarProgress.idl',
|
2013-05-17 02:37:18 +04:00
|
|
|
'nsITaskbarTabPreview.idl',
|
|
|
|
'nsITaskbarWindowPreview.idl',
|
2015-06-16 21:51:29 +03:00
|
|
|
'nsIWindowsUIUtils.idl',
|
2013-03-12 21:20:41 +04:00
|
|
|
'nsIWinTaskbar.idl',
|
|
|
|
]
|
|
|
|
elif toolkit == 'cocoa':
|
|
|
|
XPIDL_SOURCES += [
|
|
|
|
'nsIMacDockSupport.idl',
|
2018-03-12 12:16:51 +03:00
|
|
|
'nsIMacSharingService.idl',
|
2013-03-12 21:20:41 +04:00
|
|
|
'nsIMacWebAppUtils.idl',
|
|
|
|
'nsIStandaloneNativeMenu.idl',
|
2014-07-18 23:06:02 +04:00
|
|
|
'nsISystemStatusBar.idl',
|
2013-03-12 21:20:41 +04:00
|
|
|
'nsITaskbarProgress.idl',
|
|
|
|
]
|
2013-04-16 23:24:43 +04:00
|
|
|
EXPORTS += [
|
|
|
|
'nsINativeMenuService.h',
|
|
|
|
]
|
2013-03-12 21:20:41 +04:00
|
|
|
|
2014-07-29 03:55:55 +04:00
|
|
|
TEST_DIRS += ['tests']
|
2013-02-26 01:20:02 +04:00
|
|
|
|
2017-04-04 17:22:00 +03:00
|
|
|
DIRS += ['headless']
|
|
|
|
|
2013-02-26 01:20:02 +04:00
|
|
|
# Don't build the DSO under the 'build' directory as windows does.
|
|
|
|
#
|
|
|
|
# The DSOs get built in the toolkit dir itself. Do this so that
|
|
|
|
# multiple implementations of widget can be built on the same
|
|
|
|
# source tree.
|
|
|
|
#
|
2016-03-16 07:47:26 +03:00
|
|
|
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
|
2013-09-23 17:21:57 +04:00
|
|
|
DIRS += ['gtk']
|
2013-02-26 01:20:02 +04:00
|
|
|
|
|
|
|
if CONFIG['MOZ_X11']:
|
|
|
|
DIRS += ['gtkxtbin']
|
2013-03-12 21:17:46 +04:00
|
|
|
|
2018-03-08 19:43:00 +03:00
|
|
|
XPIDL_SOURCES += [
|
|
|
|
'nsIGtkTaskbarProgress.idl',
|
|
|
|
'nsITaskbarProgress.idl',
|
|
|
|
]
|
|
|
|
|
2013-03-12 21:17:46 +04:00
|
|
|
XPIDL_SOURCES += [
|
|
|
|
'nsIAppShell.idl',
|
|
|
|
'nsIBaseWindow.idl',
|
|
|
|
'nsIBidiKeyboard.idl',
|
|
|
|
'nsIClipboard.idl',
|
|
|
|
'nsIClipboardHelper.idl',
|
|
|
|
'nsIClipboardOwner.idl',
|
2013-07-03 14:17:26 +04:00
|
|
|
'nsIColorPicker.idl',
|
2015-06-05 06:29:30 +03:00
|
|
|
'nsIDisplayInfo.idl',
|
2013-03-12 21:17:46 +04:00
|
|
|
'nsIDragService.idl',
|
|
|
|
'nsIDragSession.idl',
|
|
|
|
'nsIFilePicker.idl',
|
|
|
|
'nsIFormatConverter.idl',
|
|
|
|
'nsIGfxInfo.idl',
|
|
|
|
'nsIGfxInfoDebug.idl',
|
|
|
|
'nsIIdleService.idl',
|
|
|
|
'nsIIdleServiceInternal.idl',
|
2016-10-28 02:31:14 +03:00
|
|
|
'nsIPrinterEnumerator.idl',
|
2013-03-12 21:17:46 +04:00
|
|
|
'nsIPrintSession.idl',
|
|
|
|
'nsIPrintSettings.idl',
|
|
|
|
'nsIPrintSettingsService.idl',
|
|
|
|
'nsIScreen.idl',
|
|
|
|
'nsIScreenManager.idl',
|
|
|
|
'nsISound.idl',
|
|
|
|
'nsITransferable.idl',
|
|
|
|
]
|
|
|
|
|
2013-11-19 06:47:43 +04:00
|
|
|
XPIDL_MODULE = 'widget'
|
2013-03-19 22:47:00 +04:00
|
|
|
|
2013-04-16 23:24:43 +04:00
|
|
|
EXPORTS += [
|
2014-10-23 21:16:45 +04:00
|
|
|
'GfxDriverInfo.h',
|
|
|
|
'GfxInfoBase.h',
|
|
|
|
'GfxInfoCollector.h',
|
2013-04-16 23:24:43 +04:00
|
|
|
'InputData.h',
|
2014-11-12 23:59:19 +03:00
|
|
|
'nsBaseScreen.h',
|
|
|
|
'nsBaseWidget.h',
|
2013-04-16 23:24:43 +04:00
|
|
|
'nsIDeviceContextSpec.h',
|
Bug 1257759 part.5 PluginInstanceChild should post received native key event to chrome process if the key combination may be a shortcut key r=jimm
When PluginInstanceChild receives native key events, it should post the events to the chrome process first for checking if the key combination is reserved. However, posting all key events to the chrome process may make damage to the performance of text input. Therefore, this patch starts to post a key event whose key combination may be a shortcut key. However, for avoiding to shuffle the event order, it posts following key events until all posted key events are handled by the chrome process.
For receiving response from widget, this patch defines nsIKeyEventInPluginCallback. It's specified by nsIWidget::OnWindowedPluginKeyEvent() for ensuring the caller will receive the reply. Basically, the caller of nsIWidget::OnWindowedPluginKeyEvent() should reply to the child process. However, if the widget is a PuppetWidget, it cannot return the result synchronously. Therefore, PuppetWidget::OnWindowedPluginKeyEvent() returns NS_SUCCESS_EVENT_HANDLED_ASYNCHRONOUSLY and stores the callback to mKeyEventInPluginCallbacks. Then, TabParent::HandledWindowedPluginKeyEvent() will call PuppetWidget::HandledWindowedPluginKeyEvent().
MozReview-Commit-ID: G6brOU26NwQ
--HG--
extra : rebase_source : 8140456de278956d2d594e85c7b397ae366b4962
2016-04-19 14:09:37 +03:00
|
|
|
'nsIKeyEventInPluginCallback.h',
|
2013-04-16 23:24:43 +04:00
|
|
|
'nsIPluginWidget.h',
|
2017-10-19 05:04:13 +03:00
|
|
|
'nsIPrintDialogService.h',
|
2013-04-16 23:24:43 +04:00
|
|
|
'nsIRollupListener.h',
|
|
|
|
'nsIWidget.h',
|
|
|
|
'nsIWidgetListener.h',
|
|
|
|
'nsWidgetInitData.h',
|
|
|
|
'nsWidgetsCID.h',
|
2014-11-12 23:59:19 +03:00
|
|
|
'PuppetWidget.h',
|
2013-04-16 23:24:43 +04:00
|
|
|
]
|
|
|
|
|
|
|
|
EXPORTS.mozilla += [
|
2013-09-24 14:04:14 +04:00
|
|
|
'BasicEvents.h',
|
2014-03-14 17:13:30 +04:00
|
|
|
'CommandList.h',
|
2015-06-05 12:28:18 +03:00
|
|
|
'ContentCache.h',
|
2013-09-24 14:04:15 +04:00
|
|
|
'ContentEvents.h',
|
2013-10-18 10:10:20 +04:00
|
|
|
'EventClassList.h',
|
2013-09-24 14:04:14 +04:00
|
|
|
'EventForwards.h',
|
2015-08-22 04:34:51 +03:00
|
|
|
'EventMessageList.h',
|
2015-01-31 10:17:12 +03:00
|
|
|
'FontRange.h',
|
2013-04-16 23:24:43 +04:00
|
|
|
'LookAndFeel.h',
|
2013-09-24 14:04:15 +04:00
|
|
|
'MiscEvents.h',
|
2013-09-24 14:04:15 +04:00
|
|
|
'MouseEvents.h',
|
2015-01-28 09:27:30 +03:00
|
|
|
'TextEventDispatcher.h',
|
2015-01-28 09:27:32 +03:00
|
|
|
'TextEventDispatcherListener.h',
|
2013-09-24 14:04:15 +04:00
|
|
|
'TextEvents.h',
|
2013-10-22 17:27:36 +04:00
|
|
|
'TextRange.h',
|
2013-09-24 14:04:15 +04:00
|
|
|
'TouchEvents.h',
|
2014-11-21 21:52:24 +03:00
|
|
|
'VsyncDispatcher.h',
|
2013-04-16 23:24:43 +04:00
|
|
|
'WidgetUtils.h',
|
|
|
|
]
|
|
|
|
|
2015-04-11 01:18:05 +03:00
|
|
|
EXPORTS.mozilla.widget += [
|
2016-07-01 11:15:16 +03:00
|
|
|
'CompositorWidget.h',
|
2015-08-08 18:47:19 +03:00
|
|
|
'IMEData.h',
|
2016-07-01 11:15:16 +03:00
|
|
|
'InProcessCompositorWidget.h',
|
2017-03-13 17:44:56 +03:00
|
|
|
'nsAutoRollup.h',
|
2015-04-11 01:18:05 +03:00
|
|
|
'PuppetBidiKeyboard.h',
|
2017-03-14 13:44:54 +03:00
|
|
|
'Screen.h',
|
|
|
|
'ScreenManager.h',
|
2015-04-22 17:58:15 +03:00
|
|
|
'WidgetMessageUtils.h',
|
2016-07-11 23:08:43 +03:00
|
|
|
'WindowSurface.h'
|
2015-04-11 01:18:05 +03:00
|
|
|
]
|
|
|
|
|
2014-10-23 21:16:45 +04:00
|
|
|
UNIFIED_SOURCES += [
|
2016-07-01 11:15:16 +03:00
|
|
|
'CompositorWidget.cpp',
|
2015-06-05 12:28:18 +03:00
|
|
|
'ContentCache.cpp',
|
2014-10-23 21:16:45 +04:00
|
|
|
'GfxDriverInfo.cpp',
|
|
|
|
'GfxInfoBase.cpp',
|
|
|
|
'GfxInfoCollector.cpp',
|
2016-07-01 11:15:16 +03:00
|
|
|
'InProcessCompositorWidget.cpp',
|
2014-10-23 21:16:45 +04:00
|
|
|
'InputData.cpp',
|
2017-03-13 17:44:56 +03:00
|
|
|
'nsAutoRollup.cpp',
|
2014-10-23 21:16:45 +04:00
|
|
|
'nsBaseAppShell.cpp',
|
|
|
|
'nsBaseScreen.cpp',
|
|
|
|
'nsClipboardHelper.cpp',
|
|
|
|
'nsClipboardProxy.cpp',
|
|
|
|
'nsColorPickerProxy.cpp',
|
|
|
|
'nsContentProcessWidgetFactory.cpp',
|
2015-04-08 21:48:11 +03:00
|
|
|
'nsDragServiceProxy.cpp',
|
2014-10-23 21:16:45 +04:00
|
|
|
'nsFilePickerProxy.cpp',
|
|
|
|
'nsHTMLFormatConverter.cpp',
|
|
|
|
'nsIdleService.cpp',
|
|
|
|
'nsIWidgetListener.cpp',
|
|
|
|
'nsPrimitiveHelpers.cpp',
|
|
|
|
'nsPrintSettingsImpl.cpp',
|
2018-01-16 15:24:51 +03:00
|
|
|
'nsSoundProxy.cpp',
|
2014-10-23 21:16:45 +04:00
|
|
|
'nsTransferable.cpp',
|
|
|
|
'nsXPLookAndFeel.cpp',
|
2015-04-11 01:18:05 +03:00
|
|
|
'PuppetBidiKeyboard.cpp',
|
2014-10-23 21:16:45 +04:00
|
|
|
'PuppetWidget.cpp',
|
2017-03-14 13:44:54 +03:00
|
|
|
'Screen.cpp',
|
|
|
|
'ScreenManager.cpp',
|
2014-10-23 21:16:45 +04:00
|
|
|
'SharedWidgetUtils.cpp',
|
2015-01-28 09:27:30 +03:00
|
|
|
'TextEventDispatcher.cpp',
|
2014-11-21 21:52:24 +03:00
|
|
|
'VsyncDispatcher.cpp',
|
2014-10-23 21:16:47 +04:00
|
|
|
'WidgetEventImpl.cpp',
|
2014-10-23 21:16:45 +04:00
|
|
|
'WidgetUtils.cpp',
|
|
|
|
]
|
|
|
|
|
2016-07-26 21:23:47 +03:00
|
|
|
if CONFIG['OS_ARCH'] == 'Linux':
|
|
|
|
EXPORTS.mozilla.widget += [
|
|
|
|
'LSBUtils.h'
|
|
|
|
]
|
|
|
|
SOURCES += [
|
|
|
|
'LSBUtils.cpp'
|
|
|
|
]
|
|
|
|
|
2014-11-22 14:15:00 +03:00
|
|
|
if CONFIG['MOZ_XUL'] and CONFIG['NS_PRINTING']:
|
|
|
|
EXPORTS += [
|
2016-05-19 13:25:22 +03:00
|
|
|
'nsDeviceContextSpecProxy.h',
|
2017-12-19 13:06:39 +03:00
|
|
|
'nsPrintSettingsService.h',
|
2014-11-22 14:15:00 +03:00
|
|
|
]
|
|
|
|
UNIFIED_SOURCES += [
|
2016-05-19 13:25:22 +03:00
|
|
|
'nsDeviceContextSpecProxy.cpp',
|
|
|
|
'nsPrintSession.cpp',
|
2017-12-19 13:06:39 +03:00
|
|
|
'nsPrintSettingsService.cpp',
|
2014-11-22 14:15:00 +03:00
|
|
|
]
|
|
|
|
|
2014-10-23 21:16:45 +04:00
|
|
|
# nsBaseWidget.cpp needs to be built separately because of name clashes in the OS X headers
|
2016-05-27 23:46:25 +03:00
|
|
|
# nsBaseDragService.cpp moved out of UNIFIED to fix xgill crash (bug 1259850) after moving widget/ContentHelper -> apz/util/TouchActionHelper
|
2014-10-23 21:16:45 +04:00
|
|
|
SOURCES += [
|
2016-05-27 23:46:25 +03:00
|
|
|
'nsBaseDragService.cpp',
|
2016-10-05 18:36:26 +03:00
|
|
|
'nsBaseWidget.cpp',
|
2014-10-23 21:16:45 +04:00
|
|
|
]
|
|
|
|
|
2013-04-16 23:24:43 +04:00
|
|
|
if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
|
|
|
|
EXPORTS.mozilla += [
|
|
|
|
'WidgetTraceEvent.h',
|
|
|
|
]
|
|
|
|
|
2013-07-10 23:08:23 +04:00
|
|
|
EXPORTS.ipc = ['nsGUIEventIPC.h']
|
2013-04-16 23:24:43 +04:00
|
|
|
|
2014-10-23 21:16:45 +04:00
|
|
|
if CONFIG['MOZ_X11']:
|
2014-10-23 21:16:47 +04:00
|
|
|
DIRS += ['x11']
|
2014-10-23 21:16:45 +04:00
|
|
|
UNIFIED_SOURCES += [
|
|
|
|
'GfxInfoX11.cpp'
|
|
|
|
]
|
2016-02-28 07:16:57 +03:00
|
|
|
SOURCES += [
|
2016-07-11 23:08:43 +03:00
|
|
|
'nsShmImage.cpp',
|
|
|
|
'WindowSurfaceX11SHM.cpp',
|
2016-02-28 07:16:57 +03:00
|
|
|
]
|
2014-10-23 21:16:45 +04:00
|
|
|
|
2017-02-09 19:53:50 +03:00
|
|
|
if toolkit == 'windows':
|
|
|
|
EXPORTS += [
|
|
|
|
'PluginWidgetProxy.h',
|
|
|
|
]
|
|
|
|
SOURCES += [
|
|
|
|
'PluginWidgetProxy.cpp',
|
|
|
|
]
|
|
|
|
|
2014-10-23 21:16:45 +04:00
|
|
|
if toolkit in ('cocoa', 'windows'):
|
|
|
|
UNIFIED_SOURCES += [
|
|
|
|
'nsBaseClipboard.cpp',
|
|
|
|
]
|
|
|
|
|
2018-01-10 12:04:59 +03:00
|
|
|
if toolkit in {'gtk3', 'cocoa', 'windows',
|
2017-04-18 10:56:09 +03:00
|
|
|
'android', 'uikit'}:
|
2014-10-23 21:16:45 +04:00
|
|
|
UNIFIED_SOURCES += [
|
|
|
|
'nsBaseFilePicker.cpp',
|
|
|
|
]
|
|
|
|
|
2018-01-10 12:04:59 +03:00
|
|
|
if toolkit in ('gtk3', 'windows', 'cocoa', 'android'):
|
2014-10-23 21:16:45 +04:00
|
|
|
UNIFIED_SOURCES += [
|
|
|
|
'nsNativeTheme.cpp',
|
|
|
|
]
|
2015-06-08 11:41:00 +03:00
|
|
|
if toolkit == 'gtk3':
|
|
|
|
XPIDL_SOURCES += [
|
|
|
|
'nsIApplicationChooser.idl',
|
|
|
|
]
|
2014-10-23 21:16:45 +04:00
|
|
|
|
2017-08-09 00:41:09 +03:00
|
|
|
DEFINES['MOZ_CROSS_PROCESS_IME'] = True
|
2014-10-23 21:16:45 +04:00
|
|
|
|
|
|
|
include('/ipc/chromium/chromium-config.mozbuild')
|
|
|
|
|
|
|
|
LOCAL_INCLUDES += [
|
2015-04-08 21:48:11 +03:00
|
|
|
'/dom/base',
|
|
|
|
'/dom/ipc',
|
2014-10-23 21:16:45 +04:00
|
|
|
'/layout/base',
|
|
|
|
'/layout/forms',
|
|
|
|
'/layout/generic',
|
2016-11-19 03:37:13 +03:00
|
|
|
'/layout/painting',
|
2014-10-23 21:16:45 +04:00
|
|
|
'/layout/xul',
|
|
|
|
'/view',
|
2014-10-23 21:16:47 +04:00
|
|
|
'/widget',
|
2017-04-04 17:22:00 +03:00
|
|
|
'/widget/headless',
|
2014-10-23 21:16:45 +04:00
|
|
|
]
|
|
|
|
|
2016-07-01 11:15:16 +03:00
|
|
|
if toolkit == 'windows':
|
|
|
|
IPDL_SOURCES = [
|
Bug 1373739 - Make headless compositing Windows-compatible, in addition to Linux. r=dvander
To make the HeadlessCompositorWidget work under Windows as well as Linux, I had
to change the way that I hooked it into the existing CompositorWidget system.
Under GTK, the CompositorWidgetInitData and CompositorWidgetDelegate types
provided the information needed by the headless compositor widget already (the
widget client size). On Windows, however, the definitions of these types
differ, and the client size information is simply retrieved from the platform
APIs when needed.
After this patch, CompositorWidgetDelegate is renamed to
PlatformCompositorWidgetDelegate, and a new base class called
CompositorWidgetDelegate is added with "AsPlatformSpecificDelegate()" and
"AsHeadlessCompositorWidget()" methods. In non-headless mode, widgets use
AsPlatformSpecificDelegate() to access the Windows- and GTK-specific delegate
APIs. In headless mode, AsHeadlessCompositorWidget() is used to access the
singular CompositorWidget implementation for headless. Meanwhile, the
CompositorWidgetInitData IPDL type is made into a union which always contains a
headless-specific HeadlessCompositorWidgetInitData struct and under GTK and
Windows also contains an {X11,Win}CompositorWidgetInitData struct.
This also includes a small patch to ensure that the GPU process and
hardware-accelerated compositing are always disabled under headless mode. These
features weren't activated by default in the Linux environments I tested in, but
did end up activating (and then promptly crashing Firefox) when I tested on
Windows.
MozReview-Commit-ID: CocPoHBDV7H
--HG--
extra : rebase_source : 4581fa63aa3a9f32a8dc2672015a35b9be01b20f
2017-07-07 03:45:34 +03:00
|
|
|
'headless/HeadlessWidgetTypes.ipdlh',
|
2016-07-01 11:15:16 +03:00
|
|
|
'windows/PCompositorWidget.ipdl',
|
2016-07-01 11:15:16 +03:00
|
|
|
'windows/PlatformWidgetTypes.ipdlh',
|
|
|
|
]
|
2016-07-22 20:23:07 +03:00
|
|
|
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT'] and CONFIG['MOZ_X11']:
|
|
|
|
IPDL_SOURCES = [
|
|
|
|
'gtk/PCompositorWidget.ipdl',
|
|
|
|
'gtk/PlatformWidgetTypes.ipdlh',
|
Bug 1373739 - Make headless compositing Windows-compatible, in addition to Linux. r=dvander
To make the HeadlessCompositorWidget work under Windows as well as Linux, I had
to change the way that I hooked it into the existing CompositorWidget system.
Under GTK, the CompositorWidgetInitData and CompositorWidgetDelegate types
provided the information needed by the headless compositor widget already (the
widget client size). On Windows, however, the definitions of these types
differ, and the client size information is simply retrieved from the platform
APIs when needed.
After this patch, CompositorWidgetDelegate is renamed to
PlatformCompositorWidgetDelegate, and a new base class called
CompositorWidgetDelegate is added with "AsPlatformSpecificDelegate()" and
"AsHeadlessCompositorWidget()" methods. In non-headless mode, widgets use
AsPlatformSpecificDelegate() to access the Windows- and GTK-specific delegate
APIs. In headless mode, AsHeadlessCompositorWidget() is used to access the
singular CompositorWidget implementation for headless. Meanwhile, the
CompositorWidgetInitData IPDL type is made into a union which always contains a
headless-specific HeadlessCompositorWidgetInitData struct and under GTK and
Windows also contains an {X11,Win}CompositorWidgetInitData struct.
This also includes a small patch to ensure that the GPU process and
hardware-accelerated compositing are always disabled under headless mode. These
features weren't activated by default in the Linux environments I tested in, but
did end up activating (and then promptly crashing Firefox) when I tested on
Windows.
MozReview-Commit-ID: CocPoHBDV7H
--HG--
extra : rebase_source : 4581fa63aa3a9f32a8dc2672015a35b9be01b20f
2017-07-07 03:45:34 +03:00
|
|
|
'headless/HeadlessWidgetTypes.ipdlh',
|
2016-07-22 20:23:07 +03:00
|
|
|
]
|
2016-07-01 11:15:16 +03:00
|
|
|
else:
|
|
|
|
IPDL_SOURCES = [
|
Bug 1373739 - Make headless compositing Windows-compatible, in addition to Linux. r=dvander
To make the HeadlessCompositorWidget work under Windows as well as Linux, I had
to change the way that I hooked it into the existing CompositorWidget system.
Under GTK, the CompositorWidgetInitData and CompositorWidgetDelegate types
provided the information needed by the headless compositor widget already (the
widget client size). On Windows, however, the definitions of these types
differ, and the client size information is simply retrieved from the platform
APIs when needed.
After this patch, CompositorWidgetDelegate is renamed to
PlatformCompositorWidgetDelegate, and a new base class called
CompositorWidgetDelegate is added with "AsPlatformSpecificDelegate()" and
"AsHeadlessCompositorWidget()" methods. In non-headless mode, widgets use
AsPlatformSpecificDelegate() to access the Windows- and GTK-specific delegate
APIs. In headless mode, AsHeadlessCompositorWidget() is used to access the
singular CompositorWidget implementation for headless. Meanwhile, the
CompositorWidgetInitData IPDL type is made into a union which always contains a
headless-specific HeadlessCompositorWidgetInitData struct and under GTK and
Windows also contains an {X11,Win}CompositorWidgetInitData struct.
This also includes a small patch to ensure that the GPU process and
hardware-accelerated compositing are always disabled under headless mode. These
features weren't activated by default in the Linux environments I tested in, but
did end up activating (and then promptly crashing Firefox) when I tested on
Windows.
MozReview-Commit-ID: CocPoHBDV7H
--HG--
extra : rebase_source : 4581fa63aa3a9f32a8dc2672015a35b9be01b20f
2017-07-07 03:45:34 +03:00
|
|
|
'headless/HeadlessWidgetTypes.ipdlh',
|
2016-07-01 11:15:16 +03:00
|
|
|
'PCompositorWidget.ipdl',
|
2016-07-01 11:15:16 +03:00
|
|
|
'PlatformWidgetTypes.ipdlh',
|
|
|
|
]
|
|
|
|
|
2014-10-23 21:16:45 +04:00
|
|
|
widget_dir = toolkit
|
2018-01-10 12:04:59 +03:00
|
|
|
if widget_dir == 'gtk3':
|
2014-10-23 21:16:45 +04:00
|
|
|
widget_dir = 'gtk'
|
|
|
|
|
|
|
|
LOCAL_INCLUDES += [
|
|
|
|
'/widget/%s' % widget_dir,
|
|
|
|
]
|
|
|
|
FINAL_LIBRARY = 'xul'
|
|
|
|
|
|
|
|
if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
|
|
|
|
DEFINES['MOZ_ENABLE_D3D10_LAYER'] = True
|
|
|
|
|
|
|
|
CXXFLAGS += CONFIG['TK_CFLAGS']
|