From 3e6694dfa62e6cedbf9b102a47d709484a52129e Mon Sep 17 00:00:00 2001 From: Roy Tam Date: Sat, 11 Jan 2020 09:59:56 +0800 Subject: [PATCH] import changes from rmottola/Arctic-Fox: - Goanna->Gecko: GoannaMediaPluginService & GoannaTouchDispatcher (1e10799bf) - Goanna->Gecko: GoannaProcess (dd671240a) - Goanna->Gecko: goannamediaplugin (2a9423ba6) - Goanna->Gecko: GoannaContentController (62e7c2f5f) - Goanna->Gecko: GoannaProfiler & GoannaTaskTracer (376c45a3c) --- accessible/base/nsAccessibilityService.h | 2 +- accessible/base/nsCoreUtils.cpp | 2 +- accessible/mac/mozAccessible.mm | 6 +- accessible/windows/msaa/nsWinUtils.cpp | 2 +- b2g/installer/package-manifest.in | 2 +- browser/installer/package-manifest.in | 4 +- build/automationutils.py | 4 +- caps/DomainPolicy.cpp | 12 +- caps/nsScriptSecurityManager.cpp | 4 +- chrome/nsChromeRegistry.cpp | 2 +- docshell/base/TimelineMarker.h | 2 +- docshell/base/nsDefaultURIFixup.cpp | 2 +- docshell/base/nsDocShell.cpp | 14 +- docshell/base/nsDocShell.h | 2 +- dom/asmjscache/AsmJSCache.cpp | 2 +- dom/audiochannel/AudioChannelService.cpp | 18 +-- dom/base/Crypto.cpp | 2 +- dom/base/Navigator.cpp | 4 +- dom/base/nsCCUncollectableMarker.cpp | 2 +- dom/base/nsContentPermissionHelper.cpp | 2 +- dom/base/nsDOMWindowUtils.cpp | 2 +- dom/base/nsDocument.cpp | 4 +- dom/base/nsFocusManager.cpp | 4 +- dom/base/nsFrameLoader.cpp | 8 +- dom/base/nsFrameMessageManager.cpp | 8 +- dom/base/nsGlobalWindow.cpp | 4 +- dom/base/nsJSEnvironment.cpp | 2 +- dom/base/nsJSUtils.cpp | 2 +- dom/base/nsObjectLoadingContent.cpp | 2 +- dom/base/nsWindowMemoryReporter.cpp | 2 +- dom/base/nsXMLHttpRequest.cpp | 4 +- dom/bluetooth/BluetoothAdapter.cpp | 2 +- dom/bluetooth/BluetoothService.cpp | 2 +- dom/bluetooth2/BluetoothAdapter.cpp | 2 +- dom/bluetooth2/BluetoothUtils.cpp | 2 +- dom/cellbroadcast/CellBroadcast.cpp | 2 +- dom/datastore/DataStoreService.cpp | 2 +- dom/devicestorage/nsDeviceStorage.cpp | 36 ++--- dom/events/EventDispatcher.cpp | 2 +- dom/events/EventStateManager.cpp | 4 +- dom/events/IMEStateManager.cpp | 2 +- dom/filehandle/FileStreamWrappers.cpp | 2 +- dom/filesystem/FileSystemUtils.cpp | 2 +- dom/fmradio/FMRadioService.cpp | 4 +- dom/fmradio/ipc/FMRadioChild.cpp | 2 +- dom/geolocation/nsGeolocation.cpp | 10 +- dom/geolocation/nsGeolocationSettings.cpp | 2 +- dom/html/HTMLInputElement.cpp | 4 +- dom/html/PluginDocument.cpp | 2 +- dom/html/nsGenericHTMLFrameElement.cpp | 4 +- dom/indexedDB/ActorsChild.cpp | 2 +- dom/indexedDB/FileSnapshot.cpp | 2 +- dom/indexedDB/IndexedDatabaseManager.cpp | 4 +- dom/indexedDB/PermissionRequestBase.cpp | 2 +- dom/indexedDB/ProfilerHelpers.h | 2 +- dom/ipc/Blob.cpp | 50 +++---- dom/ipc/ContentChild.cpp | 6 +- dom/ipc/ContentParent.cpp | 22 +-- dom/ipc/ContentParent.h | 8 +- dom/ipc/ContentProcessManager.cpp | 2 +- dom/ipc/PBrowser.ipdl | 6 +- dom/ipc/ProcessHangMonitor.cpp | 2 +- dom/ipc/ProcessPriorityManager.cpp | 16 +- dom/ipc/TabParent.cpp | 4 +- dom/media/MediaManager.cpp | 2 +- dom/media/MediaRecorder.cpp | 2 +- dom/media/MediaStreamGraph.cpp | 2 +- dom/media/TrackUnionStream.cpp | 2 +- dom/media/encoder/MediaEncoder.cpp | 2 +- dom/media/encoder/OmxTrackEncoder.cpp | 2 +- dom/media/encoder/OpusTrackEncoder.cpp | 2 +- dom/media/encoder/VP8TrackEncoder.cpp | 2 +- dom/media/encoder/VorbisTrackEncoder.cpp | 2 +- .../encoder/fmp4_muxer/ISOMediaWriter.cpp | 2 +- dom/media/gmp/GMPParent.cpp | 16 +- dom/media/gmp/GMPParent.h | 4 +- dom/media/gmp/GMPProcessParent.cpp | 4 +- dom/media/gmp/GMPProcessParent.h | 10 +- dom/media/gmp/GMPService.cpp | 138 +++++++++--------- dom/media/gmp/GMPService.h | 18 +-- dom/media/gmp/GMPStorageParent.cpp | 10 +- dom/media/gmp/moz.build | 4 +- ...ce.idl => mozIGeckoMediaPluginService.idl} | 4 +- dom/media/ogg/OggWriter.cpp | 2 +- .../agnostic/gmp/GMPAudioDecoder.cpp | 4 +- .../platforms/agnostic/gmp/GMPAudioDecoder.h | 4 +- .../agnostic/gmp/GMPDecoderModule.cpp | 4 +- .../agnostic/gmp/GMPVideoDecoder.cpp | 2 +- .../platforms/agnostic/gmp/GMPVideoDecoder.h | 4 +- dom/media/webm/WebMWriter.cpp | 2 +- dom/media/webspeech/synth/nsSpeechTask.cpp | 12 +- .../webspeech/synth/nsSynthVoiceRegistry.cpp | 12 +- .../webspeech/synth/pico/nsPicoService.cpp | 2 +- .../MobileConnectionArray.cpp | 2 +- dom/mobilemessage/MobileMessageManager.cpp | 6 +- dom/network/UDPSocket.cpp | 2 +- dom/nfc/gonk/NfcService.cpp | 2 +- dom/offline/nsDOMOfflineResourceList.cpp | 2 +- dom/plugins/base/nsNPAPIPlugin.cpp | 4 +- dom/plugins/base/nsPluginHost.cpp | 36 ++--- dom/plugins/base/nsPluginInstanceOwner.cpp | 8 +- dom/plugins/base/nsPluginNativeWindowGtk.cpp | 2 +- dom/plugins/base/nsPluginNativeWindowWin.cpp | 2 +- .../base/nsPluginStreamListenerPeer.cpp | 2 +- dom/plugins/base/nsPluginsDirDarwin.cpp | 6 +- dom/plugins/ipc/PluginInstanceParent.cpp | 4 +- dom/plugins/ipc/PluginModuleChild.cpp | 2 +- dom/plugins/ipc/PluginModuleParent.cpp | 6 +- dom/plugins/ipc/PluginProcessChild.cpp | 2 +- dom/plugins/ipc/PluginProcessParent.cpp | 12 +- dom/plugins/ipc/PluginProcessParent.h | 8 +- .../ipc/PluginScriptableObjectUtils-inl.h | 2 +- dom/plugins/ipc/PluginScriptableObjectUtils.h | 2 +- .../ipc/interpose/plugin_child_interpose.mm | 2 +- dom/quota/QuotaManager.cpp | 4 +- dom/speakermanager/SpeakerManagerService.cpp | 8 +- dom/storage/DOMStorageCache.cpp | 4 +- dom/storage/DOMStorageManager.cpp | 6 +- dom/storage/DOMStorageObserver.cpp | 2 +- dom/system/gonk/AudioManager.cpp | 2 +- dom/system/gonk/AutoMounter.cpp | 10 +- dom/system/gonk/NetworkWorker.cpp | 2 +- dom/system/gonk/SystemWorkerManager.cpp | 2 +- dom/system/gonk/Volume.cpp | 26 ++-- dom/system/gonk/nsVolume.cpp | 20 +-- dom/system/gonk/nsVolumeService.cpp | 14 +- dom/telephony/Telephony.cpp | 2 +- dom/voicemail/Voicemail.cpp | 2 +- dom/wifi/WifiCertService.cpp | 2 +- dom/wifi/WifiProxyService.cpp | 2 +- dom/workers/RuntimeService.cpp | 2 +- dom/workers/ServiceWorkerManager.cpp | 2 +- dom/workers/ServiceWorkerRegistrar.cpp | 4 +- dom/workers/WorkerPrivate.cpp | 2 +- embedding/browser/nsWebBrowser.cpp | 2 +- .../windowwatcher/nsWindowWatcher.cpp | 2 +- extensions/cookie/nsPermissionManager.cpp | 2 +- extensions/spellcheck/src/mozSpellChecker.cpp | 14 +- gfx/gl/GLContext.h | 2 +- gfx/gl/GLContextProviderCGL.mm | 2 +- gfx/gl/GLLibraryEGL.h | 2 +- gfx/gl/GLScreenBuffer.cpp | 2 +- gfx/ipc/GfxMessageUtils.h | 4 +- gfx/layers/CompositorTypes.h | 6 +- gfx/layers/RotatedBuffer.cpp | 2 +- ...tController.h => GeckoContentController.h} | 14 +- gfx/layers/apz/src/APZCTreeManager.cpp | 8 +- gfx/layers/apz/src/APZCTreeManager.h | 4 +- gfx/layers/apz/src/AsyncPanZoomController.cpp | 44 +++--- gfx/layers/apz/src/AsyncPanZoomController.h | 12 +- gfx/layers/apz/src/HitTestingTreeNode.h | 2 +- gfx/layers/apz/util/APZCCallbackHelper.h | 2 +- gfx/layers/apz/util/APZEventState.h | 4 +- gfx/layers/apz/util/ChromeProcessController.h | 6 +- gfx/layers/basic/BasicLayerManager.cpp | 2 +- gfx/layers/basic/BasicPaintedLayer.cpp | 2 +- gfx/layers/client/CanvasClient.cpp | 2 +- gfx/layers/client/ClientCanvasLayer.cpp | 4 +- gfx/layers/client/ClientLayerManager.cpp | 6 +- gfx/layers/client/ClientPaintedLayer.cpp | 2 +- gfx/layers/client/TiledContentClient.cpp | 2 +- .../composite/AsyncCompositionManager.cpp | 2 +- .../composite/ContainerLayerComposite.cpp | 2 +- .../composite/LayerManagerComposite.cpp | 4 +- .../composite/PaintedLayerComposite.cpp | 2 +- gfx/layers/ipc/CompositorBench.cpp | 2 +- gfx/layers/ipc/CompositorChild.cpp | 2 +- gfx/layers/ipc/CompositorParent.cpp | 16 +- gfx/layers/ipc/CompositorParent.h | 8 +- gfx/layers/ipc/FenceUtilsGonk.cpp | 4 +- gfx/layers/ipc/LayerTransactionParent.cpp | 2 +- gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp | 6 +- gfx/layers/ipc/ShadowLayers.cpp | 2 +- gfx/layers/moz.build | 2 +- gfx/layers/opengl/CompositorOGL.cpp | 2 +- gfx/layers/opengl/TextureClientOGL.cpp | 4 +- gfx/layers/opengl/TextureHostOGL.cpp | 2 +- .../gtest/TestAsyncPanZoomController.cpp | 30 ++-- gfx/thebes/gfxAndroidPlatform.cpp | 2 +- gfx/thebes/gfxContext.cpp | 2 +- gfx/thebes/gfxFT2FontList.cpp | 4 +- gfx/thebes/gfxPlatform.cpp | 6 +- gfx/thebes/gfxUtils.cpp | 2 +- gfx/thebes/gfxWindowsPlatform.cpp | 2 +- hal/Hal.cpp | 4 +- image/Decoder.cpp | 2 +- image/RasterImage.cpp | 2 +- image/decoders/icon/android/nsIconChannel.cpp | 2 +- image/imgFrame.cpp | 2 +- ipc/app/MozillaRuntimeMainAndroid.cpp | 4 +- ipc/chromium/src/base/message_pump_default.cc | 6 +- ipc/chromium/src/base/thread.cc | 2 +- ipc/contentproc/plugin-container.cpp | 4 +- ipc/glue/BackgroundImpl.cpp | 4 +- ipc/glue/BackgroundParentImpl.cpp | 2 +- ...cessHost.cpp => GeckoChildProcessHost.cpp} | 108 +++++++------- ...dProcessHost.h => GeckoChildProcessHost.h} | 22 +-- ipc/glue/InputStreamUtils.cpp | 2 +- ipc/glue/ScopedXREEmbed.cpp | 2 +- ipc/glue/moz.build | 6 +- ipc/ipdl/ipdl/builtin.py | 2 +- ipc/ipdl/test/cxx/IPDLUnitTestSubprocess.cpp | 4 +- ipc/ipdl/test/cxx/IPDLUnitTestSubprocess.h | 4 +- ipc/ipdl/test/cxx/TestSyncHang.cpp | 6 +- js/xpconnect/src/XPCJSRuntime.cpp | 8 +- js/xpconnect/wrappers/AccessCheck.cpp | 2 +- js/xpconnect/wrappers/WrapperFactory.cpp | 2 +- layout/base/FrameLayerBuilder.cpp | 2 +- layout/base/RestyleManager.cpp | 2 +- layout/base/RestyleTracker.cpp | 6 +- layout/base/RestyleTracker.h | 2 +- layout/base/nsCSSRendering.cpp | 2 +- layout/base/nsCSSRenderingBorders.cpp | 2 +- layout/base/nsDisplayList.cpp | 4 +- layout/base/nsFrameManager.cpp | 2 +- layout/base/nsLayoutUtils.cpp | 4 +- layout/base/nsPresContext.cpp | 4 +- layout/base/nsPresShell.cpp | 10 +- layout/base/nsRefreshDriver.cpp | 2 +- layout/base/nsRefreshDriver.h | 2 +- layout/base/nsStyleSheetService.cpp | 6 +- layout/build/nsLayoutModule.cpp | 10 +- layout/forms/nsListControlFrame.cpp | 2 +- layout/generic/nsPluginFrame.cpp | 4 +- layout/generic/nsTextFrame.cpp | 2 +- layout/generic/nsViewportFrame.cpp | 2 +- layout/ipc/RenderFrameParent.cpp | 8 +- layout/style/nsStyleContext.cpp | 2 +- layout/style/nsStyleSet.cpp | 2 +- media/mtransport/nr_socket_prsock.cpp | 2 +- .../src/peerconnection/PeerConnectionCtx.cpp | 6 +- .../src/peerconnection/PeerConnectionImpl.cpp | 6 +- mobile/android/installer/package-manifest.in | 4 +- modules/libjar/nsJARProtocolHandler.cpp | 2 +- modules/libpref/Makefile.in | 6 +- modules/libpref/Preferences.cpp | 28 ++-- modules/libpref/nsPrefBranch.cpp | 2 +- mozglue/android/APKOpen.cpp | 2 +- netwerk/base/nsBaseChannel.cpp | 2 +- netwerk/base/nsChannelClassifier.cpp | 10 +- netwerk/base/nsFileStreams.cpp | 2 +- netwerk/base/nsIOService.cpp | 4 +- netwerk/base/nsInputStreamPump.cpp | 2 +- netwerk/base/nsStreamLoader.cpp | 2 +- netwerk/ipc/NeckoCommon.h | 2 +- netwerk/ipc/NeckoParent.cpp | 2 +- netwerk/protocol/app/AppProtocolHandler.cpp | 2 +- .../device/AndroidCaptureProvider.cpp | 2 +- netwerk/protocol/http/HttpBaseChannel.cpp | 2 +- netwerk/protocol/http/HttpChannelParent.cpp | 2 +- netwerk/protocol/http/nsHttpChannel.cpp | 2 +- netwerk/protocol/res/nsResProtocolHandler.cpp | 2 +- parser/html/nsHtml5StreamParser.cpp | 2 +- parser/html/nsHtml5TreeOpExecutor.cpp | 2 +- python/mozbuild/mozpack/packager/formats.py | 2 +- .../boot/src/nsSiteSecurityService.cpp | 2 +- .../manager/ssl/src/TransportSecurityInfo.cpp | 2 +- security/manager/ssl/src/nsKeygenHandler.cpp | 2 +- security/manager/ssl/src/nsNSSCertificate.cpp | 8 +- security/manager/ssl/src/nsNSSComponent.cpp | 4 +- security/manager/ssl/src/nsNSSModule.cpp | 2 +- .../sandbox/win/loggingCallbacks.h | 2 +- startupcache/StartupCache.cpp | 2 +- storage/src/VacuumManager.cpp | 2 +- storage/src/mozStorageConnection.cpp | 2 +- storage/src/mozStorageStatement.cpp | 2 +- testing/mochitest/mochitest_options.py | 6 +- toolkit/components/alerts/nsAlertsService.cpp | 4 +- .../diskspacewatcher/DiskSpaceWatcher.cpp | 2 +- toolkit/components/places/History.cpp | 16 +- .../components/places/nsAnnotationService.cpp | 2 +- toolkit/components/places/nsNavBookmarks.cpp | 2 +- toolkit/components/startup/StartupTimeline.h | 2 +- toolkit/components/startup/nsAppStartup.cpp | 2 +- toolkit/components/telemetry/Telemetry.cpp | 8 +- .../mozapps/extensions/AddonPathService.cpp | 2 +- toolkit/xre/EventTracer.cpp | 2 +- toolkit/xre/nsAppRunner.cpp | 34 ++--- toolkit/xre/nsAppRunner.h | 2 +- toolkit/xre/nsEmbedFunctions.cpp | 40 ++--- toolkit/xre/nsNativeAppSupportQt.cpp | 2 +- toolkit/xre/nsSigHandlers.cpp | 4 +- .../{GoannaProfiler.h => GeckoProfiler.h} | 14 +- ...annaProfilerFunc.h => GeckoProfilerFunc.h} | 0 ...annaProfilerImpl.h => GeckoProfilerImpl.h} | 12 +- ...annaTaskTracer.cpp => GeckoTaskTracer.cpp} | 6 +- .../{GoannaTaskTracer.h => GeckoTaskTracer.h} | 0 ...TaskTracerImpl.h => GeckoTaskTracerImpl.h} | 2 +- .../profiler/ProfilerIOInterposeObserver.cpp | 2 +- tools/profiler/ProfilerMarkers.cpp | 2 +- tools/profiler/SaveProfileTask.cpp | 2 +- tools/profiler/TableTicker.cpp | 4 +- tools/profiler/moz.build | 8 +- tools/profiler/nsProfiler.cpp | 2 +- tools/profiler/platform-linux.cc | 2 +- .../exthandler/nsExternalHelperAppService.cpp | 10 +- uriloader/prefetch/nsOfflineCacheUpdate.cpp | 2 +- .../prefetch/nsOfflineCacheUpdateService.cpp | 6 +- view/nsViewManager.cpp | 2 +- widget/GfxInfoBase.cpp | 2 +- widget/PuppetWidget.cpp | 2 +- widget/android/APZCCallbackHandler.h | 6 +- widget/android/AndroidJNI.cpp | 2 +- widget/android/nsAppShell.cpp | 4 +- widget/android/nsLookAndFeel.cpp | 4 +- widget/android/nsWindow.cpp | 8 +- widget/android/nsWindow.h | 2 +- widget/cocoa/nsAppShell.mm | 2 +- widget/cocoa/nsChildView.mm | 2 +- ...ispatcher.cpp => GeckoTouchDispatcher.cpp} | 2 +- ...uchDispatcher.h => GeckoTouchDispatcher.h} | 12 +- widget/gonk/moz.build | 4 +- widget/gonk/nsAppShell.cpp | 4 +- widget/gonk/nsClipboard.cpp | 8 +- widget/gonk/nsWidgetFactory.cpp | 2 +- widget/gtk/nsAppShell.cpp | 2 +- widget/nsBaseWidget.cpp | 6 +- widget/nsBaseWidget.h | 6 +- widget/nsIWidget.h | 2 +- widget/nsIdleService.cpp | 6 +- widget/windows/AudioSession.cpp | 8 +- widget/windows/nsAppShell.cpp | 4 +- xpcom/base/nsCycleCollector.cpp | 8 +- xpcom/base/nsDumpUtils.cpp | 2 +- xpcom/base/nsMemoryInfoDumper.cpp | 2 +- xpcom/base/nsTraceRefcnt.cpp | 2 +- xpcom/build/MainThreadIOLogger.cpp | 2 +- xpcom/build/XPCOMInit.cpp | 12 +- xpcom/build/nsXULAppAPI.h | 28 ++-- xpcom/components/ManifestParser.cpp | 4 +- xpcom/components/nsComponentManager.cpp | 6 +- xpcom/glue/BlockingResourceBase.cpp | 4 +- xpcom/glue/CondVar.h | 4 +- xpcom/glue/ReentrantMonitor.h | 4 +- xpcom/io/nsAnonymousTemporaryFile.cpp | 2 +- xpcom/libxpcomrt/XPCOMRTStubs.cpp | 4 +- xpcom/threads/HangAnnotations.cpp | 4 +- xpcom/threads/HangMonitor.cpp | 4 +- xpcom/threads/LazyIdleThread.cpp | 2 +- xpcom/threads/nsThread.cpp | 2 +- xpcom/threads/nsTimerImpl.cpp | 2 +- 341 files changed, 971 insertions(+), 971 deletions(-) rename dom/media/gmp/{mozIGoannaMediaPluginService.idl => mozIGeckoMediaPluginService.idl} (97%) rename gfx/layers/apz/public/{GoannaContentController.h => GeckoContentController.h} (95%) rename ipc/glue/{GoannaChildProcessHost.cpp => GeckoChildProcessHost.cpp} (89%) rename ipc/glue/{GoannaChildProcessHost.h => GeckoChildProcessHost.h} (92%) rename tools/profiler/{GoannaProfiler.h => GeckoProfiler.h} (97%) rename tools/profiler/{GoannaProfilerFunc.h => GeckoProfilerFunc.h} (100%) rename tools/profiler/{GoannaProfilerImpl.h => GeckoProfilerImpl.h} (98%) rename tools/profiler/{GoannaTaskTracer.cpp => GeckoTaskTracer.cpp} (98%) rename tools/profiler/{GoannaTaskTracer.h => GeckoTaskTracer.h} (100%) rename tools/profiler/{GoannaTaskTracerImpl.h => GeckoTaskTracerImpl.h} (98%) rename widget/gonk/{GoannaTouchDispatcher.cpp => GeckoTouchDispatcher.cpp} (99%) rename widget/gonk/{GoannaTouchDispatcher.h => GeckoTouchDispatcher.h} (92%) diff --git a/accessible/base/nsAccessibilityService.h b/accessible/base/nsAccessibilityService.h index 1cde5941fe..a9b4d39406 100644 --- a/accessible/base/nsAccessibilityService.h +++ b/accessible/base/nsAccessibilityService.h @@ -284,7 +284,7 @@ IPCAccessibilityActive() #ifdef MOZ_B2G return false; #else - return XRE_GetProcessType() == GoannaProcessType_Content && + return XRE_GetProcessType() == GeckoProcessType_Content && mozilla::Preferences::GetBool("accessibility.ipc_architecture.enabled", true); #endif } diff --git a/accessible/base/nsCoreUtils.cpp b/accessible/base/nsCoreUtils.cpp index d6ffc69a94..a564f7b65e 100644 --- a/accessible/base/nsCoreUtils.cpp +++ b/accessible/base/nsCoreUtils.cpp @@ -425,7 +425,7 @@ nsCoreUtils::IsTabDocument(nsIDocument* aDocumentNode) treeItem->GetParent(getter_AddRefs(parentTreeItem)); // Tab document running in own process doesn't have parent. - if (XRE_GetProcessType() == GoannaProcessType_Content) + if (XRE_GetProcessType() == GeckoProcessType_Content) return !parentTreeItem; // Parent of docshell for tab document running in chrome process is root. diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm index 2770763149..70417810f2 100644 --- a/accessible/mac/mozAccessible.mm +++ b/accessible/mac/mozAccessible.mm @@ -273,9 +273,9 @@ GetClosestInterestingAccessible(id anObject) if (!mGoannaAccessible) return nil; - Accessible* focusedGoannaChild = mGoannaAccessible->FocusedChild(); - if (focusedGoannaChild) { - mozAccessible *focusedChild = GetNativeFromGoannaAccessible(focusedGoannaChild); + Accessible* focusedGeckoChild = mGoannaAccessible->FocusedChild(); + if (focusedGeckoChild) { + mozAccessible *focusedChild = GetNativeFromGoannaAccessible(focusedGeckoChild); if (focusedChild) return GetClosestInterestingAccessible(focusedChild); } diff --git a/accessible/windows/msaa/nsWinUtils.cpp b/accessible/windows/msaa/nsWinUtils.cpp index b905bc9b3e..eed0e13566 100644 --- a/accessible/windows/msaa/nsWinUtils.cpp +++ b/accessible/windows/msaa/nsWinUtils.cpp @@ -60,7 +60,7 @@ nsWinUtils::MaybeStartWindowEmulation() // with tabs. if (Compatibility::IsJAWS() || Compatibility::IsWE() || Compatibility::IsDolphin() || - XRE_GetProcessType() == GoannaProcessType_Content) { + XRE_GetProcessType() == GeckoProcessType_Content) { RegisterNativeWindow(kClassNameTabContent); sHWNDCache = new nsRefPtrHashtable, DocAccessible>(2); return true; diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in index fed57b715f..3f80ede1da 100644 --- a/b2g/installer/package-manifest.in +++ b/b2g/installer/package-manifest.in @@ -701,7 +701,7 @@ @BINPATH@/@PREF_DIR@/b2g.js #endif @BINPATH@/@PREF_DIR@/channel-prefs.js -@BINPATH@/goanna.js +@BINPATH@/gecko.js @BINPATH@/defaults/autoconfig/platform.js @BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/defaults/profile/prefs.js diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index ee978813d6..7df324baf3 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -197,7 +197,7 @@ @RESPATH@/components/composer.xpt @RESPATH@/components/content_events.xpt @RESPATH@/components/content_html.xpt -@RESPATH@/components/content_goannamediaplugins.xpt +@RESPATH@/components/content_geckomediaplugins.xpt #ifdef MOZ_WEBRTC @RESPATH@/components/content_webrtc.xpt #endif @@ -689,7 +689,7 @@ ; All the pref files must be part of base to prevent migration bugs @RESPATH@/browser/@PREF_DIR@/palemoon.js @RESPATH@/browser/@PREF_DIR@/palemoon-branding.js -@RESPATH@/goanna.js +@RESPATH@/gecko.js @RESPATH@/defaults/autoconfig/platform.js @RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/browser/defaults/profile/prefs.js diff --git a/build/automationutils.py b/build/automationutils.py index 4131585581..bdbdf0a889 100644 --- a/build/automationutils.py +++ b/build/automationutils.py @@ -245,9 +245,9 @@ def processLeakLog(leakLogFile, options): leakThresholds = getattr(options, 'leakThresholds', {}) ignoreMissingLeaks = getattr(options, 'ignoreMissingLeaks', []) - # This list is based on kGoannaProcessTypeString. ipdlunittest processes likely + # This list is based on kGeckoProcessTypeString. ipdlunittest processes likely # are not going to produce leak logs we will ever see. - knownProcessTypes = ["default", "plugin", "tab", "goannamediaplugin"] + knownProcessTypes = ["default", "plugin", "tab", "geckomediaplugin"] for processType in knownProcessTypes: log.info("TEST-INFO | leakcheck | %s process: leak threshold set at %d bytes" diff --git a/caps/DomainPolicy.cpp b/caps/DomainPolicy.cpp index dcdad44e61..a2ec3e34f6 100644 --- a/caps/DomainPolicy.cpp +++ b/caps/DomainPolicy.cpp @@ -22,7 +22,7 @@ static nsresult BroadcastDomainSetChange(DomainSetType aSetType, DomainSetChangeType aChangeType, nsIURI* aDomain = nullptr) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default, + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default, "DomainPolicy should only be exposed to the chrome process."); nsTArray parents; @@ -45,7 +45,7 @@ DomainPolicy::DomainPolicy() : mBlacklist(new DomainSet(BLACKLIST)) , mWhitelist(new DomainSet(WHITELIST)) , mSuperWhitelist(new DomainSet(SUPER_WHITELIST)) { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { BroadcastDomainSetChange(NO_TYPE, ACTIVATE_POLICY); } } @@ -112,7 +112,7 @@ DomainPolicy::Deactivate() if (ssm) { ssm->DeactivateDomainPolicy(); } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { BroadcastDomainSetChange(NO_TYPE, DEACTIVATE_POLICY); } return NS_OK; @@ -170,7 +170,7 @@ DomainSet::Add(nsIURI* aDomain) nsCOMPtr clone = GetCanonicalClone(aDomain); NS_ENSURE_TRUE(clone, NS_ERROR_FAILURE); mHashTable.PutEntry(clone); - if (XRE_GetProcessType() == GoannaProcessType_Default) + if (XRE_GetProcessType() == GeckoProcessType_Default) return BroadcastDomainSetChange(mType, ADD_DOMAIN, aDomain); return NS_OK; @@ -182,7 +182,7 @@ DomainSet::Remove(nsIURI* aDomain) nsCOMPtr clone = GetCanonicalClone(aDomain); NS_ENSURE_TRUE(clone, NS_ERROR_FAILURE); mHashTable.RemoveEntry(clone); - if (XRE_GetProcessType() == GoannaProcessType_Default) + if (XRE_GetProcessType() == GeckoProcessType_Default) return BroadcastDomainSetChange(mType, REMOVE_DOMAIN, aDomain); return NS_OK; @@ -192,7 +192,7 @@ NS_IMETHODIMP DomainSet::Clear() { mHashTable.Clear(); - if (XRE_GetProcessType() == GoannaProcessType_Default) + if (XRE_GetProcessType() == GeckoProcessType_Default) return BroadcastDomainSetChange(mType, CLEAR_DOMAINS); return NS_OK; diff --git a/caps/nsScriptSecurityManager.cpp b/caps/nsScriptSecurityManager.cpp index 7d7755fb81..2c12144c80 100644 --- a/caps/nsScriptSecurityManager.cpp +++ b/caps/nsScriptSecurityManager.cpp @@ -1326,7 +1326,7 @@ nsScriptSecurityManager::~nsScriptSecurityManager(void) // ContentChild might hold a reference to the domain policy, // and it might release it only after the security manager is // gone. But we can still assert this for the main process. - MOZ_ASSERT_IF(XRE_GetProcessType() == GoannaProcessType_Default, + MOZ_ASSERT_IF(XRE_GetProcessType() == GeckoProcessType_Default, !mDomainPolicy); } @@ -1543,7 +1543,7 @@ nsScriptSecurityManager::GetDomainPolicyActive(bool *aRv) NS_IMETHODIMP nsScriptSecurityManager::ActivateDomainPolicy(nsIDomainPolicy** aRv) { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return NS_ERROR_SERVICE_NOT_AVAILABLE; } diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp index 462b278a26..29159f245c 100644 --- a/chrome/nsChromeRegistry.cpp +++ b/chrome/nsChromeRegistry.cpp @@ -690,7 +690,7 @@ nsChromeRegistry::GetSingleton() } nsRefPtr cr; - if (GoannaProcessType_Content == XRE_GetProcessType()) + if (GeckoProcessType_Content == XRE_GetProcessType()) cr = new nsChromeRegistryContent(); else cr = new nsChromeRegistryChrome(); diff --git a/docshell/base/TimelineMarker.h b/docshell/base/TimelineMarker.h index 068c6382a6..57a2222885 100644 --- a/docshell/base/TimelineMarker.h +++ b/docshell/base/TimelineMarker.h @@ -8,7 +8,7 @@ #define TimelineMarker_h__ #include "nsString.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/dom/ProfileTimelineMarkerBinding.h" #include "nsContentUtils.h" #include "jsapi.h" diff --git a/docshell/base/nsDefaultURIFixup.cpp b/docshell/base/nsDefaultURIFixup.cpp index 540ba8c9a2..0564d8d7c2 100644 --- a/docshell/base/nsDefaultURIFixup.cpp +++ b/docshell/base/nsDefaultURIFixup.cpp @@ -450,7 +450,7 @@ nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword, } keyword.Trim(" "); - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { dom::ContentChild* contentChild = dom::ContentChild::GetSingleton(); if (!contentChild) { return NS_ERROR_NOT_AVAILABLE; diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 575416cf1f..f537056ec6 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -88,7 +88,7 @@ #include "nsDocShellEnumerator.h" #include "nsSHistory.h" #include "nsDocShellEditorData.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" // Helper Classes #include "nsError.h" @@ -817,7 +817,7 @@ IncreasePrivateDocShellCount() { gNumberOfPrivateDocShells++; if (gNumberOfPrivateDocShells > 1 || - XRE_GetProcessType() != GoannaProcessType_Content) { + XRE_GetProcessType() != GeckoProcessType_Content) { return; } @@ -831,7 +831,7 @@ DecreasePrivateDocShellCount() MOZ_ASSERT(gNumberOfPrivateDocShells > 0); gNumberOfPrivateDocShells--; if (!gNumberOfPrivateDocShells) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { dom::ContentChild* cc = dom::ContentChild::GetSingleton(); cc->SendPrivateDocShellsExist(false); return; @@ -5053,7 +5053,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI, mInPrivateBrowsing ? nsISocketProvider::NO_PERMANENT_STORAGE : 0; bool isStsHost = false; bool isPinnedHost = false; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsCOMPtr sss = do_GetService(NS_SSSERVICE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); @@ -7513,7 +7513,7 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel, nsCOMPtr appCacheChannel = do_QueryInterface(aNewChannel); if (appCacheChannel) { - if (GoannaProcessType_Default != XRE_GetProcessType()) { + if (GeckoProcessType_Default != XRE_GetProcessType()) { // Permission will be checked in the parent process. appCacheChannel->SetChooseApplicationCache(true); } else { @@ -10779,7 +10779,7 @@ nsDocShell::DoURILoad(nsIURI* aURI, // Loads with the correct permissions should check for a matching // application cache. - if (GoannaProcessType_Default != XRE_GetProcessType()) { + if (GeckoProcessType_Default != XRE_GetProcessType()) { // Permission will be checked in the parent process appCacheChannel->SetChooseApplicationCache(true); } else { @@ -14159,7 +14159,7 @@ nsDocShell::MaybeNotifyKeywordSearchLoading(const nsString& aProvider, return; } - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { dom::ContentChild* contentChild = dom::ContentChild::GetSingleton(); if (contentChild) { contentChild->SendNotifyKeywordSearchLoading(aProvider, aKeyword); diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h index 9c03999e18..aed769919e 100644 --- a/docshell/base/nsDocShell.h +++ b/docshell/base/nsDocShell.h @@ -21,7 +21,7 @@ #include "mozilla/UniquePtr.h" #include "mozilla/WeakPtr.h" #include "mozilla/TimeStamp.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/dom/ProfileTimelineMarkerBinding.h" #include "jsapi.h" diff --git a/dom/asmjscache/AsmJSCache.cpp b/dom/asmjscache/AsmJSCache.cpp index 123bd93689..dbe07f4413 100644 --- a/dom/asmjscache/AsmJSCache.cpp +++ b/dom/asmjscache/AsmJSCache.cpp @@ -62,7 +62,7 @@ namespace { bool IsMainProcess() { - return XRE_GetProcessType() == GoannaProcessType_Default; + return XRE_GetProcessType() == GeckoProcessType_Default; } // Anything smaller should compile fast enough that caching will just add diff --git a/dom/audiochannel/AudioChannelService.cpp b/dom/audiochannel/AudioChannelService.cpp index 4a79f454e5..0b38827f09 100644 --- a/dom/audiochannel/AudioChannelService.cpp +++ b/dom/audiochannel/AudioChannelService.cpp @@ -57,7 +57,7 @@ AudioChannelService::GetAudioChannelService() { MOZ_ASSERT(NS_IsMainThread()); - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return AudioChannelServiceChild::GetAudioChannelService(); } @@ -71,7 +71,7 @@ AudioChannelService::GetOrCreateAudioChannelService() { MOZ_ASSERT(NS_IsMainThread()); - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return AudioChannelServiceChild::GetOrCreateAudioChannelService(); } @@ -91,7 +91,7 @@ AudioChannelService::GetOrCreateAudioChannelService() void AudioChannelService::Shutdown() { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return AudioChannelServiceChild::Shutdown(); } @@ -109,7 +109,7 @@ AudioChannelService::AudioChannelService() , mDisabled(false) , mDefChannelChildID(CONTENT_PROCESS_ID_UNKNOWN) { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsCOMPtr obs = mozilla::services::GetObserverService(); if (obs) { obs->AddObserver(this, "ipc:content-shutdown", false); @@ -167,7 +167,7 @@ AudioChannelService::RegisterType(AudioChannel aChannel, uint64_t aChildID, AudioChannelInternalType type = GetInternalType(aChannel, true); mChannelCounters[type].AppendElement(aChildID); - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // We must keep the childIds in order to decide which app is allowed to play // with then telephony channel. @@ -259,7 +259,7 @@ AudioChannelService::UnregisterType(AudioChannel aChannel, // There are two reasons to defer the decrease of telephony channel. // 1. User can have time to remove device from his ear before music resuming. // 2. Give BT SCO to be disconnected before starting to connect A2DP. - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { if (aChannel == AudioChannel::Telephony) { UnregisterTelephonyChild(aChildID); @@ -293,7 +293,7 @@ AudioChannelService::UnregisterTypeInternal(AudioChannel aChannel, // In order to avoid race conditions, it's safer to notify any existing // agent any time a new one is registered. - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // No hidden content channel is playable if the original playable hidden // process does not need to play audio from background anymore. if (aChannel == AudioChannel::Content && @@ -518,7 +518,7 @@ AudioChannelService::SetDefaultVolumeControlChannelInternal(int32_t aChannel, bool aVisible, uint64_t aChildID) { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return; } @@ -561,7 +561,7 @@ AudioChannelService::SetDefaultVolumeControlChannelInternal(int32_t aChannel, void AudioChannelService::SendAudioChannelChangedNotification(uint64_t aChildID) { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return; } diff --git a/dom/base/Crypto.cpp b/dom/base/Crypto.cpp index 418e97c4c2..a260b58c21 100644 --- a/dom/base/Crypto.cpp +++ b/dom/base/Crypto.cpp @@ -89,7 +89,7 @@ Crypto::GetRandomValues(JSContext* aCx, const ArrayBufferView& aArray, uint8_t* data = aArray.Data(); - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { InfallibleTArray randomValues; // Tell the parent process to generate random values via PContent ContentChild* cc = ContentChild::GetSingleton(); diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 64df61c616..2fe99c1903 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1417,7 +1417,7 @@ Navigator::GetFeature(const nsAString& aName, ErrorResult& aRv) #if defined(XP_LINUX) if (aName.EqualsLiteral("hardware.memory")) { // with seccomp enabled, fopen() should be in a non-sandboxed process - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { uint32_t memLevel = mozilla::hal::GetTotalSystemMemoryLevel(); if (memLevel == 0) { p->MaybeReject(NS_ERROR_NOT_AVAILABLE); @@ -2454,7 +2454,7 @@ Navigator::HasTVSupport(JSContext* aCx, JSObject* aGlobal) bool Navigator::IsE10sEnabled(JSContext* aCx, JSObject* aGlobal) { - return XRE_GetProcessType() == GoannaProcessType_Content; + return XRE_GetProcessType() == GeckoProcessType_Content; } bool diff --git a/dom/base/nsCCUncollectableMarker.cpp b/dom/base/nsCCUncollectableMarker.cpp index 3b61bda4c0..9d5f1706c1 100644 --- a/dom/base/nsCCUncollectableMarker.cpp +++ b/dom/base/nsCCUncollectableMarker.cpp @@ -139,7 +139,7 @@ static void MarkMessageManagers() { // The global message manager only exists in the root process. - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return; } nsCOMPtr strongGlobalMM = diff --git a/dom/base/nsContentPermissionHelper.cpp b/dom/base/nsContentPermissionHelper.cpp index 44a66d6d08..918d6c7a1f 100644 --- a/dom/base/nsContentPermissionHelper.cpp +++ b/dom/base/nsContentPermissionHelper.cpp @@ -237,7 +237,7 @@ nsContentPermissionUtils::AskPermission(nsIContentPermissionRequest* aRequest, n NS_ENSURE_STATE(aWindow && aWindow->IsCurrentInnerWindow()); // for content process - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { nsRefPtr req = new RemotePermissionRequest(aRequest, aWindow); diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index fd3bff6b90..e58c887343 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -87,7 +87,7 @@ #include "nsIBaseWindow.h" #include "nsIDocShellTreeOwner.h" #include "nsIInterfaceRequestorUtils.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/Preferences.h" #include "nsIContentIterator.h" #include "nsIDOMStyleSheet.h" diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 366c7e083e..fd43f3d139 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -10609,7 +10609,7 @@ PLDHashOperator UnlockEnumerator(imgIRequest* aKey, nsresult nsDocument::SetImageLockingState(bool aLocked) { - if (XRE_GetProcessType() == GoannaProcessType_Content && + if (XRE_GetProcessType() == GeckoProcessType_Content && !Preferences::GetBool("image.mem.allow_locking_in_content_processes", true)) { return NS_OK; } @@ -11137,7 +11137,7 @@ nsIDocument::ExitFullscreen(nsIDocument* aDoc, bool aRunAsync) static bool HasCrossProcessParent(nsIDocument* aDocument) { - if (XRE_GetProcessType() != GoannaProcessType_Content) { + if (XRE_GetProcessType() != GeckoProcessType_Content) { return false; } if (aDocument->GetParentDocument() != nullptr) { diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp index 5fffe6334b..3f3054c99c 100644 --- a/dom/base/nsFocusManager.cpp +++ b/dom/base/nsFocusManager.cpp @@ -712,7 +712,7 @@ nsFocusManager::WindowRaised(nsIDOMWindow* aWindow) // If this is a parent or single process window, send the activate event. // Events for child process windows will be sent when ParentActivated // is called. - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { ActivateOrDeactivate(window, true); } @@ -777,7 +777,7 @@ nsFocusManager::WindowLowered(nsIDOMWindow* aWindow) // If this is a parent or single process window, send the deactivate event. // Events for child process windows will be sent when ParentActivated // is called. - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { ActivateOrDeactivate(window, false); } diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp index 0b8c0b988a..a71f002721 100644 --- a/dom/base/nsFrameLoader.cpp +++ b/dom/base/nsFrameLoader.cpp @@ -86,7 +86,7 @@ #include "mozilla/jsipc/CrossProcessObjectWrappers.h" #include "mozilla/layout/RenderFrameParent.h" #include "nsIAppsService.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "jsapi.h" #include "mozilla/dom/HTMLIFrameElement.h" @@ -1661,12 +1661,12 @@ nsFrameLoader::ShouldUseRemoteProcess() // Don't try to launch nested children if we don't have OMTC. // They won't render! - if (XRE_GetProcessType() == GoannaProcessType_Content && + if (XRE_GetProcessType() == GeckoProcessType_Content && !CompositorChild::ChildProcessHasCompositor()) { return false; } - if (XRE_GetProcessType() == GoannaProcessType_Content && + if (XRE_GetProcessType() == GeckoProcessType_Content && !(PR_GetEnv("MOZ_NESTED_OOP_TABS") || Preferences::GetBool("dom.ipc.tabs.nested.enabled", false))) { return false; @@ -2698,7 +2698,7 @@ nsFrameLoader::ResetPermissionManagerStatus() { // The resetting of the permissions status can run only // in the main process. - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return; } diff --git a/dom/base/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp index 52004e7555..39db28ee50 100644 --- a/dom/base/nsFrameMessageManager.cpp +++ b/dom/base/nsFrameMessageManager.cpp @@ -827,7 +827,7 @@ nsFrameMessageManager::Dump(const nsAString& aStr) NS_IMETHODIMP nsFrameMessageManager::PrivateNoteIntentionalCrash() { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { mozilla::NoteIntentionalCrash("tab"); return NS_OK; } else { @@ -1439,7 +1439,7 @@ MessageManagerReporter::CollectReports(nsIMemoryReporterCallback* aCb, { nsresult rv; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsCOMPtr globalmm = do_GetService("@mozilla.org/globalmessagemanager;1"); if (globalmm) { @@ -1475,7 +1475,7 @@ MessageManagerReporter::CollectReports(nsIMemoryReporterCallback* aCb, nsresult NS_NewGlobalMessageManager(nsIMessageBroadcaster** aResult) { - NS_ENSURE_TRUE(XRE_GetProcessType() == GoannaProcessType_Default, + NS_ENSURE_TRUE(XRE_GetProcessType() == GeckoProcessType_Default, NS_ERROR_NOT_AVAILABLE); nsFrameMessageManager* mm = new nsFrameMessageManager(nullptr, nullptr, @@ -2032,7 +2032,7 @@ NS_NewChildProcessMessageManager(nsISyncMessageSender** aResult) "Re-creating sChildProcessManager"); MessageManagerCallback* cb; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { cb = new SameChildProcessMessageManagerCallback(); } else { cb = new ChildProcessMessageManagerCallback(); diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index e956392e5d..1b7dea8b69 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -9320,7 +9320,7 @@ nsGlobalWindow::ShowModalDialog(const nsAString& aUrl, nsIVariant* aArgument, (aUrl, aArgument, aOptions, aError), aError, nullptr); - if (!IsShowModalDialogEnabled() || XRE_GetProcessType() == GoannaProcessType_Content) { + if (!IsShowModalDialogEnabled() || XRE_GetProcessType() == GeckoProcessType_Content) { aError.Throw(NS_ERROR_NOT_AVAILABLE); return nullptr; } @@ -11138,7 +11138,7 @@ nsGlobalWindow::ShowSlowScriptDialog() unsigned lineno; bool hasFrame = JS::DescribeScriptedCaller(cx, &filename, &lineno); - if (XRE_GetProcessType() == GoannaProcessType_Content && + if (XRE_GetProcessType() == GeckoProcessType_Content && ProcessHangMonitor::Get()) { ProcessHangMonitor::SlowScriptAction action; nsRefPtr monitor = ProcessHangMonitor::Get(); diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 80a9dcfc4a..a0b110b614 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -90,7 +90,7 @@ #include "mozilla/ContentEvents.h" #include "nsCycleCollectionNoteRootCallback.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" using namespace mozilla; using namespace mozilla::dom; diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp index d9c68b4d28..153770fa44 100644 --- a/dom/base/nsJSUtils.cpp +++ b/dom/base/nsJSUtils.cpp @@ -20,7 +20,7 @@ #include "nsCOMPtr.h" #include "nsIScriptSecurityManager.h" #include "nsPIDOMWindow.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsDOMJSUtils.h" // for GetScriptContextFromJSContext #include "nsJSPrincipals.h" #include "xpcpublic.h" diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index 452e155c79..2a27ba97a2 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -66,7 +66,7 @@ #include "nsObjectLoadingContent.h" #include "mozAutoDocUpdate.h" #include "nsIContentSecurityPolicy.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsPluginFrame.h" #include "nsDOMClassInfo.h" #include "nsWrapperCacheInlines.h" diff --git a/dom/base/nsWindowMemoryReporter.cpp b/dom/base/nsWindowMemoryReporter.cpp index 6ab2f3b95d..04c38ee84e 100644 --- a/dom/base/nsWindowMemoryReporter.cpp +++ b/dom/base/nsWindowMemoryReporter.cpp @@ -529,7 +529,7 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb, // Collect window memory usage. nsWindowSizes windowTotalSizes(nullptr); nsCOMPtr addonManager; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // Only try to access the service from the main process. addonManager = do_GetService("@mozilla.org/addons/integration;1"); } diff --git a/dom/base/nsXMLHttpRequest.cpp b/dom/base/nsXMLHttpRequest.cpp index 88666d7d26..3db30401ff 100644 --- a/dom/base/nsXMLHttpRequest.cpp +++ b/dom/base/nsXMLHttpRequest.cpp @@ -60,7 +60,7 @@ #include "nsIFileChannel.h" #include "mozilla/Telemetry.h" #include "jsfriendapi.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/dom/EncodingUtils.h" #include "nsIUnicodeDecoder.h" #include "mozilla/dom/XMLHttpRequestBinding.h" @@ -3022,7 +3022,7 @@ nsXMLHttpRequest::Send(nsIVariant* aVariant, const Nullable& aBody) if (scheme.LowerCaseEqualsLiteral("app") || scheme.LowerCaseEqualsLiteral("jar")) { mIsMappedArrayBuffer = true; - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { nsCOMPtr jarChannel = do_QueryInterface(mChannel); // For memory mapping from child process, we need to get file // descriptor of the JAR file opened remotely on the parent proess. diff --git a/dom/bluetooth/BluetoothAdapter.cpp b/dom/bluetooth/BluetoothAdapter.cpp index 0af6155658..1670ae90bc 100644 --- a/dom/bluetooth/BluetoothAdapter.cpp +++ b/dom/bluetooth/BluetoothAdapter.cpp @@ -789,7 +789,7 @@ BluetoothAdapter::SendFile(const nsAString& aDeviceAddress, return nullptr; } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // In-process transfer bs->SendFile(aDeviceAddress, &aBlob, results); } else { diff --git a/dom/bluetooth/BluetoothService.cpp b/dom/bluetooth/BluetoothService.cpp index bb3bf8e7a0..a958c1e1e8 100644 --- a/dom/bluetooth/BluetoothService.cpp +++ b/dom/bluetooth/BluetoothService.cpp @@ -98,7 +98,7 @@ bool sToggleInProgress = false; bool IsMainProcess() { - return XRE_GetProcessType() == GoannaProcessType_Default; + return XRE_GetProcessType() == GeckoProcessType_Default; } void diff --git a/dom/bluetooth2/BluetoothAdapter.cpp b/dom/bluetooth2/BluetoothAdapter.cpp index 238548797a..b2a57b79db 100644 --- a/dom/bluetooth2/BluetoothAdapter.cpp +++ b/dom/bluetooth2/BluetoothAdapter.cpp @@ -1046,7 +1046,7 @@ BluetoothAdapter::SendFile(const nsAString& aDeviceAddress, return nullptr; } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // In-process transfer bs->SendFile(aDeviceAddress, &aBlob, results); } else { diff --git a/dom/bluetooth2/BluetoothUtils.cpp b/dom/bluetooth2/BluetoothUtils.cpp index fa640560b9..23f4898138 100644 --- a/dom/bluetooth2/BluetoothUtils.cpp +++ b/dom/bluetooth2/BluetoothUtils.cpp @@ -247,7 +247,7 @@ DispatchStatusChangedEvent(const nsAString& aType, bool IsMainProcess() { - return XRE_GetProcessType() == GoannaProcessType_Default; + return XRE_GetProcessType() == GeckoProcessType_Default; } END_BLUETOOTH_NAMESPACE diff --git a/dom/cellbroadcast/CellBroadcast.cpp b/dom/cellbroadcast/CellBroadcast.cpp index b884398aa8..47f951304b 100644 --- a/dom/cellbroadcast/CellBroadcast.cpp +++ b/dom/cellbroadcast/CellBroadcast.cpp @@ -151,7 +151,7 @@ NS_CreateCellBroadcastService() { nsCOMPtr service; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { service = new mozilla::dom::cellbroadcast::CellBroadcastIPCService(); #if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL) } else { diff --git a/dom/datastore/DataStoreService.cpp b/dom/datastore/DataStoreService.cpp index 8242368b83..069d3640eb 100644 --- a/dom/datastore/DataStoreService.cpp +++ b/dom/datastore/DataStoreService.cpp @@ -129,7 +129,7 @@ bool IsMainProcess() { static const bool isMainProcess = - XRE_GetProcessType() == GoannaProcessType_Default; + XRE_GetProcessType() == GeckoProcessType_Default; return isMainProcess; } diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp index 6fab7d91eb..4eb773d920 100644 --- a/dom/devicestorage/nsDeviceStorage.cpp +++ b/dom/devicestorage/nsDeviceStorage.cpp @@ -562,7 +562,7 @@ FileUpdateDispatcher::Observe(nsISupports* aSubject, return NS_OK; } - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { // Child process. Forward the notification to the parent. ContentChild::GetSingleton() ->SendFilePathUpdateNotify(dsf->mStorageType, @@ -693,7 +693,7 @@ DeviceStorageFile::Dump(const char* label) path = NS_LITERAL_STRING("(null)"); } const char* ptStr; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { ptStr = "parent"; } else { ptStr = "child"; @@ -815,7 +815,7 @@ OverrideRootDir::Init() } if (sDirs->overrideRootDir) { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // Only the parent process can create directories. In testing, because // the preference is updated after startup, its entirely possible that // the preference updated notification will be received by a child @@ -937,7 +937,7 @@ InitDirs() } #endif - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { NS_GetSpecialDirectory("UAppData", getter_AddRefs(sDirs->crashes)); if (sDirs->crashes) { sDirs->crashes->Append(NS_LITERAL_STRING("Crash Reports")); @@ -2059,7 +2059,7 @@ ContinueCursorEvent::~ContinueCursorEvent() {} void ContinueCursorEvent::Continue() { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { DebugOnly rv = NS_DispatchToMainThread(this); MOZ_ASSERT(NS_SUCCEEDED(rv)); return; @@ -2243,7 +2243,7 @@ nsDOMDeviceStorageCursor::Allow(JS::HandleValue aChoices) return NS_DispatchToMainThread(r); } - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(this, mFile); DeviceStorageEnumerationParams params(mFile->mStorageType, @@ -2990,7 +2990,7 @@ public: return NS_DispatchToCurrentThread(r); } - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { DeviceStorageCreateFdParams params; params.type() = mFile->mStorageType; @@ -3030,7 +3030,7 @@ public: return NS_DispatchToCurrentThread(r); } - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { BlobChild* actor = ContentChild::GetSingleton()->GetOrCreateActorForBlob( static_cast(mBlob.get())); @@ -3076,7 +3076,7 @@ public: return NS_DispatchToCurrentThread(r); } - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { BlobChild* actor = ContentChild::GetSingleton()->GetOrCreateActorForBlob( static_cast(mBlob.get())); @@ -3122,7 +3122,7 @@ public: return NS_DispatchToCurrentThread(r); } - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile); DeviceStorageGetParams params(mFile->mStorageType, @@ -3156,7 +3156,7 @@ public: return NS_DispatchToCurrentThread(r); } - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile); DeviceStorageDeleteParams params(mFile->mStorageType, @@ -3172,7 +3172,7 @@ public: case DEVICE_STORAGE_REQUEST_FREE_SPACE: { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile); DeviceStorageFreeSpaceParams params(mFile->mStorageType, @@ -3187,7 +3187,7 @@ public: case DEVICE_STORAGE_REQUEST_USED_SPACE: { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile); DeviceStorageUsedSpaceParams params(mFile->mStorageType, @@ -3208,7 +3208,7 @@ public: case DEVICE_STORAGE_REQUEST_AVAILABLE: { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile); DeviceStorageAvailableParams params(mFile->mStorageType, @@ -3223,7 +3223,7 @@ public: case DEVICE_STORAGE_REQUEST_STATUS: { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile); DeviceStorageStatusParams params(mFile->mStorageType, @@ -3244,7 +3244,7 @@ public: case DEVICE_STORAGE_REQUEST_FORMAT: { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile); DeviceStorageFormatParams params(mFile->mStorageType, @@ -3259,7 +3259,7 @@ public: case DEVICE_STORAGE_REQUEST_MOUNT: { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile); DeviceStorageMountParams params(mFile->mStorageType, @@ -3274,7 +3274,7 @@ public: case DEVICE_STORAGE_REQUEST_UNMOUNT: { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { PDeviceStorageRequestChild* child = new DeviceStorageRequestChild(mRequest, mFile); DeviceStorageUnmountParams params(mFile->mStorageType, diff --git a/dom/events/EventDispatcher.cpp b/dom/events/EventDispatcher.cpp index 7acd6289a0..cb8ddc8ede 100644 --- a/dom/events/EventDispatcher.cpp +++ b/dom/events/EventDispatcher.cpp @@ -12,7 +12,7 @@ #include "nsIDocument.h" #include "nsINode.h" #include "nsPIDOMWindow.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/ContentEvents.h" #include "mozilla/dom/CloseEvent.h" #include "mozilla/dom/DeviceOrientationEvent.h" diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index 595c82c169..62c6b44deb 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -85,7 +85,7 @@ #include "mozilla/Preferences.h" #include "mozilla/LookAndFeel.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "Units.h" #include "mozilla/layers/APZCTreeManager.h" @@ -604,7 +604,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext, // window edge) wont update the cursor if the cached value and the current // cursor match. So when the mouse exits a remote frame, clear the cached // widget cursor so a proper update will occur when the mouse re-enters. - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ClearCachedWidgetCursor(mCurrentTarget); } diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp index a4d9146bc3..71d7b7a62b 100644 --- a/dom/events/IMEStateManager.cpp +++ b/dom/events/IMEStateManager.cpp @@ -857,7 +857,7 @@ IMEStateManager::SetIMEState(const IMEState& aState, // XXX I think that we should use nsContentUtils::IsCallerChrome() instead // of the process type. if (aAction.mCause == InputContextAction::CAUSE_UNKNOWN && - XRE_GetProcessType() != GoannaProcessType_Content) { + XRE_GetProcessType() != GeckoProcessType_Content) { aAction.mCause = InputContextAction::CAUSE_UNKNOWN_CHROME; } diff --git a/dom/filehandle/FileStreamWrappers.cpp b/dom/filehandle/FileStreamWrappers.cpp index 36c0da71c1..03a4202bd4 100644 --- a/dom/filehandle/FileStreamWrappers.cpp +++ b/dom/filehandle/FileStreamWrappers.cpp @@ -241,7 +241,7 @@ void FileInputStreamWrapper::Serialize(InputStreamParams& aParams, FileDescriptorArray& /* aFDs */) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); nsCOMPtr thisStream = do_QueryObject(this); diff --git a/dom/filesystem/FileSystemUtils.cpp b/dom/filesystem/FileSystemUtils.cpp index e86cdda2c8..fade06f828 100644 --- a/dom/filesystem/FileSystemUtils.cpp +++ b/dom/filesystem/FileSystemUtils.cpp @@ -69,7 +69,7 @@ FileSystemUtils::IsDescendantPath(const nsAString& aPath, bool FileSystemUtils::IsParentProcess() { - return XRE_GetProcessType() == GoannaProcessType_Default; + return XRE_GetProcessType() == GeckoProcessType_Default; } } // namespace dom diff --git a/dom/fmradio/FMRadioService.cpp b/dom/fmradio/FMRadioService.cpp index 078535b27f..ad8c3502a7 100644 --- a/dom/fmradio/FMRadioService.cpp +++ b/dom/fmradio/FMRadioService.cpp @@ -42,7 +42,7 @@ BEGIN_FMRADIO_NAMESPACE IFMRadioService* IFMRadioService::Singleton() { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return FMRadioChild::Singleton(); } else { return FMRadioService::Singleton(); @@ -1240,7 +1240,7 @@ FMRadioService::UpdateFrequency() FMRadioService* FMRadioService::Singleton() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); if (!sFMRadioService) { diff --git a/dom/fmradio/ipc/FMRadioChild.cpp b/dom/fmradio/ipc/FMRadioChild.cpp index 5c3430c891..f74fda4e18 100644 --- a/dom/fmradio/ipc/FMRadioChild.cpp +++ b/dom/fmradio/ipc/FMRadioChild.cpp @@ -338,7 +338,7 @@ FMRadioChild::EnableAudio(bool aAudioEnabled) FMRadioChild* FMRadioChild::Singleton() { - MOZ_ASSERT(XRE_GetProcessType() != GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() != GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); if (!sFMRadioChild) { diff --git a/dom/geolocation/nsGeolocation.cpp b/dom/geolocation/nsGeolocation.cpp index df51f29dbb..1b95c181c6 100644 --- a/dom/geolocation/nsGeolocation.cpp +++ b/dom/geolocation/nsGeolocation.cpp @@ -542,7 +542,7 @@ already_AddRefed nsGeolocationRequest::AdjustedLocation(nsIDOMGeoPosition *aPosition) { nsCOMPtr pos = aPosition; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { GPSLOG("child process just copying position"); return pos.forget(); } @@ -736,7 +736,7 @@ nsresult nsGeolocationService::Init() return NS_ERROR_FAILURE; } - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { sGeoInitPending = false; return NS_OK; } @@ -988,7 +988,7 @@ nsGeolocationService::StartDevice(nsIPrincipal *aPrincipal) // inactivivity SetDisconnectTimer(); - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cpc = ContentChild::GetSingleton(); cpc->SendAddGeolocationListener(IPC::Principal(aPrincipal), HighAccuracyRequested()); @@ -1051,7 +1051,7 @@ nsGeolocationService::UpdateAccuracy(bool aForceHigh) { bool highRequired = aForceHigh || HighAccuracyRequested(); - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cpc = ContentChild::GetSingleton(); if (cpc->IsAlive()) { cpc->SendSetGeolocationHigherAccuracy(highRequired); @@ -1078,7 +1078,7 @@ nsGeolocationService::StopDevice() mDisconnectTimer = nullptr; } - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cpc = ContentChild::GetSingleton(); cpc->SendRemoveGeolocationListener(); return; // bail early diff --git a/dom/geolocation/nsGeolocationSettings.cpp b/dom/geolocation/nsGeolocationSettings.cpp index c186c3e4ed..f3facfb609 100644 --- a/dom/geolocation/nsGeolocationSettings.cpp +++ b/dom/geolocation/nsGeolocationSettings.cpp @@ -48,7 +48,7 @@ already_AddRefed nsGeolocationSettings::GetGeolocationSettings() { // this singleton is only needed in the parent process... - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return nullptr; } diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp index 4953b695db..32aeaf33cb 100644 --- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp @@ -1034,7 +1034,7 @@ UploadLastDir::FetchDirectoryAndDisplayPicker(nsIDocument* aDoc, new UploadLastDir::ContentPrefCallback(aFilePicker, aFpCallback); #ifdef MOZ_B2G - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { prefCallback->HandleCompletion(nsIContentPrefCallback2::COMPLETE_ERROR); return NS_OK; } @@ -1065,7 +1065,7 @@ UploadLastDir::StoreLastUsedDirectory(nsIDocument* aDoc, nsIFile* aDir) } #ifdef MOZ_B2G - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return NS_OK; } #endif diff --git a/dom/html/PluginDocument.cpp b/dom/html/PluginDocument.cpp index bb99d11080..646a625cfb 100644 --- a/dom/html/PluginDocument.cpp +++ b/dom/html/PluginDocument.cpp @@ -17,7 +17,7 @@ #include "nsIPropertyBag2.h" #include "mozilla/dom/Element.h" #include "nsObjectLoadingContent.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" namespace mozilla { namespace dom { diff --git a/dom/html/nsGenericHTMLFrameElement.cpp b/dom/html/nsGenericHTMLFrameElement.cpp index 8d7537108c..22a04c9d93 100644 --- a/dom/html/nsGenericHTMLFrameElement.cpp +++ b/dom/html/nsGenericHTMLFrameElement.cpp @@ -10,7 +10,7 @@ #include "mozilla/dom/ContentChild.h" #include "mozilla/Preferences.h" #include "mozilla/ErrorResult.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozIApplication.h" #include "nsAttrValueInlines.h" #include "nsContentUtils.h" @@ -581,7 +581,7 @@ nsGenericHTMLFrameElement::GetAppManifestURL(nsAString& aOut) return NS_OK; } - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { NS_WARNING("Can't embed-apps. Embed-apps is restricted to in-proc apps, see bug 1059662"); return NS_OK; } diff --git a/dom/indexedDB/ActorsChild.cpp b/dom/indexedDB/ActorsChild.cpp index f3f6459710..cd730eec3e 100644 --- a/dom/indexedDB/ActorsChild.cpp +++ b/dom/indexedDB/ActorsChild.cpp @@ -1131,7 +1131,7 @@ BackgroundFactoryRequestChild::RecvPermissionChallenge( return false; } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsCOMPtr window = mFactory->GetParentObject(); MOZ_ASSERT(window); diff --git a/dom/indexedDB/FileSnapshot.cpp b/dom/indexedDB/FileSnapshot.cpp index 36f002a416..aaf5010ed2 100644 --- a/dom/indexedDB/FileSnapshot.cpp +++ b/dom/indexedDB/FileSnapshot.cpp @@ -82,7 +82,7 @@ FileImplSnapshot::~FileImplSnapshot() void FileImplSnapshot::AssertSanity() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); } diff --git a/dom/indexedDB/IndexedDatabaseManager.cpp b/dom/indexedDB/IndexedDatabaseManager.cpp index e5a1b5e772..b983f1934d 100644 --- a/dom/indexedDB/IndexedDatabaseManager.cpp +++ b/dom/indexedDB/IndexedDatabaseManager.cpp @@ -247,7 +247,7 @@ IndexedDatabaseManager::GetOrCreate() } if (!gDBManager) { - sIsMainProcess = XRE_GetProcessType() == GoannaProcessType_Default; + sIsMainProcess = XRE_GetProcessType() == GeckoProcessType_Default; if (!sLoggingModule) { sLoggingModule = PR_NewLogModule("IndexedDB"); @@ -585,7 +585,7 @@ IndexedDatabaseManager::IsMainProcess() { NS_ASSERTION(gDBManager, "IsMainProcess() called before indexedDB has been initialized!"); - NS_ASSERTION((XRE_GetProcessType() == GoannaProcessType_Default) == + NS_ASSERTION((XRE_GetProcessType() == GeckoProcessType_Default) == sIsMainProcess, "XRE_GetProcessType changed its tune!"); return sIsMainProcess; } diff --git a/dom/indexedDB/PermissionRequestBase.cpp b/dom/indexedDB/PermissionRequestBase.cpp index 70bf24bd9c..d7f9c0ebe7 100644 --- a/dom/indexedDB/PermissionRequestBase.cpp +++ b/dom/indexedDB/PermissionRequestBase.cpp @@ -40,7 +40,7 @@ const uint32_t kPermissionDefault = nsIPermissionManager::UNKNOWN_ACTION; void AssertSanity() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); } diff --git a/dom/indexedDB/ProfilerHelpers.h b/dom/indexedDB/ProfilerHelpers.h index 847c733b18..384d2999e3 100644 --- a/dom/indexedDB/ProfilerHelpers.h +++ b/dom/indexedDB/ProfilerHelpers.h @@ -11,7 +11,7 @@ // source files. #include "BackgroundChildImpl.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "IDBCursor.h" #include "IDBDatabase.h" #include "IDBIndex.h" diff --git a/dom/ipc/Blob.cpp b/dom/ipc/Blob.cpp index 6710a87df6..1d14c881d4 100644 --- a/dom/ipc/Blob.cpp +++ b/dom/ipc/Blob.cpp @@ -84,7 +84,7 @@ static_assert(FileDescriptorSet::MAX_DESCRIPTORS_PER_MESSAGE == 250, StaticRefPtr gUUIDGenerator; -GoannaProcessType gProcessType = GoannaProcessType_Invalid; +GeckoProcessType gProcessType = GeckoProcessType_Invalid; void CommonStartup() @@ -92,7 +92,7 @@ CommonStartup() MOZ_ASSERT(NS_IsMainThread()); gProcessType = XRE_GetProcessType(); - MOZ_ASSERT(gProcessType != GoannaProcessType_Invalid); + MOZ_ASSERT(gProcessType != GeckoProcessType_Invalid); nsCOMPtr uuidGen = do_GetService(kUUIDGeneratorContractId); MOZ_RELEASE_ASSERT(uuidGen); @@ -137,7 +137,7 @@ AssertCorrectThreadForManager(nsIContentChild* aManager) void AssertCorrectThreadForManager(nsIContentParent* aManager) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); } @@ -156,7 +156,7 @@ AssertCorrectThreadForManager(PBackgroundChild* aManager) void AssertCorrectThreadForManager(PBackgroundParent* aManager) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); AssertIsOnBackgroundThread(); } @@ -796,7 +796,7 @@ already_AddRefed CreateBlobImpl(const nsID& aKnownBlobIDData, const CreateBlobImplMetadata& aMetadata) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); MOZ_ASSERT(aMetadata.mHasRecursed); nsRefPtr blobImpl = BlobParent::GetBlobImplForID(aKnownBlobIDData); @@ -821,7 +821,7 @@ CreateBlobImpl(const nsTArray& aMemoryData, static_assert(sizeof(size_t) <= sizeof(uint64_t), "size_t won't fit in uint64_t!"); - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); nsRefPtr blobImpl; @@ -871,7 +871,7 @@ already_AddRefed CreateBlobImpl(intptr_t aAddRefedInputStream, const CreateBlobImplMetadata& aMetadata) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); MOZ_ASSERT(aMetadata.mIsSameProcessActor); MOZ_ASSERT(aAddRefedInputStream); @@ -909,7 +909,7 @@ already_AddRefed CreateBlobImplFromBlobData(const BlobData& aBlobData, CreateBlobImplMetadata& aMetadata) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); nsRefPtr blobImpl; @@ -945,7 +945,7 @@ already_AddRefed CreateBlobImpl(const nsTArray& aBlobDatas, CreateBlobImplMetadata& aMetadata) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); // Special case for a multipart blob with only one part. if (aBlobDatas.Length() == 1) { @@ -1010,7 +1010,7 @@ CreateBlobImpl(const ParentBlobConstructorParams& aParams, const BlobData& aBlobData, bool aIsSameProcessActor) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); MOZ_ASSERT(aParams.blobParams().type() == AnyBlobConstructorParams::TNormalBlobConstructorParams || aParams.blobParams().type() == @@ -1058,7 +1058,7 @@ CreateBlobImpl(const ParentBlobConstructorParams& aParams, void BlobDataFromBlobImpl(FileImpl* aBlobImpl, BlobData& aBlobData) { - MOZ_ASSERT(gProcessType != GoannaProcessType_Default); + MOZ_ASSERT(gProcessType != GeckoProcessType_Default); MOZ_ASSERT(aBlobImpl); const nsTArray>* subBlobs = aBlobImpl->GetSubBlobImpls(); @@ -2189,7 +2189,7 @@ RemoteBlobImpl::RemoteBlobImpl(BlobChild* aActor, , mIsSlice(false) { MOZ_ASSERT(aSameProcessBlobImpl); - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); CommonInit(aActor); } @@ -2204,7 +2204,7 @@ RemoteBlobImpl::RemoteBlobImpl(BlobChild* aActor, , mIsSlice(false) { MOZ_ASSERT(aSameProcessBlobImpl); - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); CommonInit(aActor); } @@ -2314,7 +2314,7 @@ RemoteBlobImpl::GetMozFullPathInternal(nsAString& aFilePath, } if (mSameProcessFileImpl) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); mSameProcessFileImpl->GetMozFullPathInternal(aFilePath, aRv); return; @@ -2343,7 +2343,7 @@ RemoteBlobImpl::CreateSlice(uint64_t aStart, { // May be called on any thread. if (mSameProcessFileImpl) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); return mSameProcessFileImpl->CreateSlice(aStart, aLength, @@ -2362,7 +2362,7 @@ RemoteBlobImpl::GetInternalStream(nsIInputStream** aStream) { // May be called on any thread. if (mSameProcessFileImpl) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); nsCOMPtr realStream; nsresult rv = @@ -2390,7 +2390,7 @@ RemoteBlobImpl::GetFileId() } if (mSameProcessFileImpl) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); return mSameProcessFileImpl->GetFileId(); } @@ -3133,7 +3133,7 @@ BlobChild::CommonInit(const ChildBlobConstructorParams& aParams) } case AnyBlobConstructorParams::TSameProcessBlobConstructorParams: { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); const SameProcessBlobConstructorParams& params = blobParams.get_SameProcessBlobConstructorParams(); @@ -3229,7 +3229,7 @@ BlobChild::AssertIsOnOwningThread() const void BlobChild::Startup(const FriendKey& /* aKey */) { - MOZ_ASSERT(XRE_GetProcessType() != GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() != GeckoProcessType_Default); CommonStartup(); } @@ -3308,7 +3308,7 @@ BlobChild::GetOrCreateFromImpl(ChildManagerType* aManager, nsCOMPtr snapshotInputStream; - if (gProcessType == GoannaProcessType_Default) { + if (gProcessType == GeckoProcessType_Default) { nsCOMPtr snapshot = do_QueryInterface(aBlobImpl); if (snapshot) { MOZ_ALWAYS_TRUE(NS_SUCCEEDED( @@ -3316,7 +3316,7 @@ BlobChild::GetOrCreateFromImpl(ChildManagerType* aManager, } } - if (gProcessType == GoannaProcessType_Default && !snapshotInputStream) { + if (gProcessType == GeckoProcessType_Default && !snapshotInputStream) { nsRefPtr sameProcessImpl = aBlobImpl; auto addRefedFileImpl = reinterpret_cast(sameProcessImpl.forget().take()); @@ -3415,7 +3415,7 @@ BlobChild::SendSliceConstructor(ChildManagerType* aManager, BlobChild* newActor = new BlobChild(aManager, id, aRemoteBlobSliceImpl); if (aManager->SendPBlobConstructor(newActor, aParams)) { - if (gProcessType != GoannaProcessType_Default || !NS_IsMainThread()) { + if (gProcessType != GeckoProcessType_Default || !NS_IsMainThread()) { newActor->SendWaitForSliceCreation(); } return newActor; @@ -3751,7 +3751,7 @@ BlobParent::AssertIsOnOwningThread() const void BlobParent::Startup(const FriendKey& /* aKey */) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); CommonStartup(); @@ -3807,7 +3807,7 @@ BlobParent::Create(PBackgroundParent* aManager, already_AddRefed BlobParent::GetBlobImplForID(const nsID& aID) { - if (NS_WARN_IF(gProcessType != GoannaProcessType_Default)) { + if (NS_WARN_IF(gProcessType != GeckoProcessType_Default)) { ASSERT_UNLESS_FUZZING(); return nullptr; } @@ -4557,7 +4557,7 @@ IDTableEntry::GetOrCreateInternal(const nsID& aID, bool aMayGet, bool aIgnoreProcessID) { - MOZ_ASSERT(gProcessType == GoannaProcessType_Default); + MOZ_ASSERT(gProcessType == GeckoProcessType_Default); MOZ_ASSERT(sIDTableMutex); sIDTableMutex->AssertNotCurrentThreadOwns(); diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index a907b5f925..d4104018d2 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -15,7 +15,7 @@ #include "ContentChild.h" #include "BlobChild.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "TabChild.h" #include "mozilla/Attributes.h" @@ -39,7 +39,7 @@ #include "mozilla/ipc/BackgroundChild.h" #include "mozilla/ipc/FileDescriptorSetChild.h" #include "mozilla/ipc/FileDescriptorUtils.h" -#include "mozilla/ipc/GoannaChildProcessHost.h" +#include "mozilla/ipc/GeckoChildProcessHost.h" #include "mozilla/ipc/TestShellChild.h" #include "mozilla/jsipc/CrossProcessObjectWrappers.h" #include "mozilla/layers/CompositorChild.h" @@ -2662,7 +2662,7 @@ uint64_t NextWindowID() { uint64_t processID = 0; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cc = ContentChild::GetSingleton(); processID = cc->GetID(); } diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 13eb62610f..6f59f72d57 100755 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -692,7 +692,7 @@ ContentParent::StartUp() // child process sCanLaunchSubprocesses = true; - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return; } @@ -739,7 +739,7 @@ ContentParent::JoinProcessesIOThread(const nsTArray* aProcesses, { const nsTArray& processes = *aProcesses; for (uint32_t i = 0; i < processes.Length(); ++i) { - if (GoannaChildProcessHost* process = processes[i]->mSubprocess) { + if (GeckoChildProcessHost* process = processes[i]->mSubprocess) { process->Join(); } } @@ -1000,7 +1000,7 @@ ContentParent::CreateBrowserOrApp(const TabContext& aContext, } ProcessPriority initialPriority = GetInitialProcessPriority(aFrameElement); - bool isInContentProcess = (XRE_GetProcessType() != GoannaProcessType_Default); + bool isInContentProcess = (XRE_GetProcessType() != GeckoProcessType_Default); TabId tabId; nsIDocShell* docShell = GetOpenerDocShellHelper(aFrameElement); @@ -1470,7 +1470,7 @@ ContentParent::SetPriorityAndCheckIsAlive(ProcessPriority aPriority) // // Bug 943174: use waitid() with WNOWAIT so that, if the process // did exit, we won't consume its zombie and confuse the - // GoannaChildProcessHost dtor. Also, if the process isn't a + // GeckoChildProcessHost dtor. Also, if the process isn't a // direct child because of Nuwa this will fail with ECHILD, and we // need to assume the child is alive in that case rather than // assuming it's dead (as is otherwise a reasonable fallback). @@ -1669,7 +1669,7 @@ ContentParent::OnChannelError() void ContentParent::OnBeginSyncTransaction() { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsCOMPtr console(do_GetService(NS_CONSOLESERVICE_CONTRACTID)); JSContext *cx = nsContentUtils::GetCurrentJSContext(); if (console && cx) { @@ -1771,11 +1771,11 @@ ContentParent::RecvDeallocateLayerTreeId(const uint64_t& aId) namespace { void -DelayedDeleteSubprocess(GoannaChildProcessHost* aSubprocess) +DelayedDeleteSubprocess(GeckoChildProcessHost* aSubprocess) { XRE_GetIOMessageLoop() ->PostTask(FROM_HERE, - new DeleteTask(aSubprocess)); + new DeleteTask(aSubprocess)); } // This runnable only exists to delegate ownership of the @@ -2057,7 +2057,7 @@ ContentParent::ContentParent(mozIApplication* aApp, ChildPrivileges privs = aIsNuwaProcess ? base::PRIVILEGES_INHERIT : base::PRIVILEGES_DEFAULT; - mSubprocess = new GoannaChildProcessHost(GoannaProcessType_Content, privs); + mSubprocess = new GeckoChildProcessHost(GeckoProcessType_Content, privs); IToplevelProtocol::SetTransport(mSubprocess->GetChannel()); @@ -2130,7 +2130,7 @@ ContentParent::ContentParent(ContentParent* aTemplate, const FileDescriptor* fd = FindFdProtocolFdMapping(aFds, GetProtocolId()); NS_ASSERTION(fd != nullptr, "IPC Channel for PContent is necessary!"); - mSubprocess = new GoannaExistingProcessHost(GoannaProcessType_Content, + mSubprocess = new GoannaExistingProcessHost(GeckoProcessType_Content, aPid, *fd); @@ -4462,7 +4462,7 @@ ContentParent::AllocateTabId(const TabId& aOpenerTabId, const ContentParentId& aCpId) { TabId tabId; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { ContentProcessManager *cpm = ContentProcessManager::GetSingleton(); tabId = cpm->AllocateTabId(aOpenerTabId, aContext, aCpId); } @@ -4479,7 +4479,7 @@ ContentParent::AllocateTabId(const TabId& aOpenerTabId, ContentParent::DeallocateTabId(const TabId& aTabId, const ContentParentId& aCpId) { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { ContentProcessManager::GetSingleton()->DeallocateTabId(aCpId, aTabId); } diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h index c79260bf31..23f915b45c 100644 --- a/dom/ipc/ContentParent.h +++ b/dom/ipc/ContentParent.h @@ -9,7 +9,7 @@ #include "mozilla/dom/PContentParent.h" #include "mozilla/dom/nsIContentParent.h" -#include "mozilla/ipc/GoannaChildProcessHost.h" +#include "mozilla/ipc/GeckoChildProcessHost.h" #include "mozilla/Attributes.h" #include "mozilla/FileUtils.h" #include "mozilla/HalTypes.h" @@ -72,7 +72,7 @@ class ContentParent final : public PContentParent , public nsIDOMGeoPositionErrorCallback , public mozilla::LinkedListElement { - typedef mozilla::ipc::GoannaChildProcessHost GoannaChildProcessHost; + typedef mozilla::ipc::GeckoChildProcessHost GeckoChildProcessHost; typedef mozilla::ipc::OptionalURIParams OptionalURIParams; typedef mozilla::ipc::PFileDescriptorSetParent PFileDescriptorSetParent; typedef mozilla::ipc::TestShellParent TestShellParent; @@ -212,7 +212,7 @@ public: bool IsNuwaProcess() const; #endif - GoannaChildProcessHost* Process() { + GeckoChildProcessHost* Process() { return mSubprocess; } @@ -783,7 +783,7 @@ private: // release these objects in ShutDownProcess. See the comment there for more // details. - GoannaChildProcessHost* mSubprocess; + GeckoChildProcessHost* mSubprocess; ContentParent* mOpener; ContentParentId mChildID; diff --git a/dom/ipc/ContentProcessManager.cpp b/dom/ipc/ContentProcessManager.cpp index ac456b9a38..ae6de7cf09 100644 --- a/dom/ipc/ContentProcessManager.cpp +++ b/dom/ipc/ContentProcessManager.cpp @@ -32,7 +32,7 @@ ContentProcessManager::sSingleton; /* static */ ContentProcessManager* ContentProcessManager::GetSingleton() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); if (!sSingleton) { sSingleton = new ContentProcessManager(); diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl index b18f56edf7..650ee37733 100644 --- a/dom/ipc/PBrowser.ipdl +++ b/dom/ipc/PBrowser.ipdl @@ -54,7 +54,7 @@ using mozilla::CSSPoint from "Units.h"; using mozilla::CSSToScreenScale from "Units.h"; using mozilla::CommandInt from "mozilla/EventForwards.h"; using mozilla::Modifiers from "mozilla/EventForwards.h"; -using mozilla::layers::GoannaContentController::APZStateChange from "mozilla/layers/GoannaContentController.h"; +using mozilla::layers::GeckoContentController::APZStateChange from "mozilla/layers/GeckoContentController.h"; using mozilla::WritingMode from "WritingModes.h"; namespace mozilla { @@ -512,8 +512,8 @@ child: UpdateFrame(FrameMetrics frame); - // The following methods correspond to functions on the GoannaContentController - // interface in gfx/layers/apz/public/GoannaContentController.h. Refer to documentation + // The following methods correspond to functions on the GeckoContentController + // interface in gfx/layers/apz/public/GeckoContentController.h. Refer to documentation // in that file for these functions. RequestFlingSnap(ViewID aScrollID, CSSPoint aDestination); AcknowledgeScrollUpdate(ViewID aScrollId, uint32_t aScrollGeneration); diff --git a/dom/ipc/ProcessHangMonitor.cpp b/dom/ipc/ProcessHangMonitor.cpp index bfa9edb6a1..85c4324178 100644 --- a/dom/ipc/ProcessHangMonitor.cpp +++ b/dom/ipc/ProcessHangMonitor.cpp @@ -783,7 +783,7 @@ ProcessHangMonitor::ProcessHangMonitor() MOZ_COUNT_CTOR(ProcessHangMonitor); - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { nsCOMPtr obs = mozilla::services::GetObserverService(); obs->AddObserver(this, "xpcom-shutdown", false); } diff --git a/dom/ipc/ProcessPriorityManager.cpp b/dom/ipc/ProcessPriorityManager.cpp index f8b4181791..53b412753a 100644 --- a/dom/ipc/ProcessPriorityManager.cpp +++ b/dom/ipc/ProcessPriorityManager.cpp @@ -381,7 +381,7 @@ ProcessPriorityManagerImpl::StaticInit() } // The process priority manager is main-process only. - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { sInitialized = true; return; } @@ -422,7 +422,7 @@ ProcessPriorityManagerImpl::GetSingleton() ProcessPriorityManagerImpl::ProcessPriorityManagerImpl() : mHighPriority(false) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); RegisterWakeLockObserver(this); } @@ -657,7 +657,7 @@ ParticularProcessPriorityManager::ParticularProcessPriorityManager( , mHoldsCPUWakeLock(false) , mHoldsHighPriorityWakeLock(false) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); LOGP("Creating ParticularProcessPriorityManager."); } @@ -817,7 +817,7 @@ ParticularProcessPriorityManager::OnRemoteBrowserFrameShown(nsISupports* aSubjec TabParent* tp = TabParent::GetFrom(fl); NS_ENSURE_TRUE_VOID(tp); - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); if (tp->Manager() != mContentParent) { return; } @@ -841,7 +841,7 @@ ParticularProcessPriorityManager::OnTabParentDestroyed(nsISupports* aSubject) nsCOMPtr tp = do_QueryInterface(aSubject); NS_ENSURE_TRUE_VOID(tp); - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); if (TabParent::GetFrom(tp)->Manager() != mContentParent) { return; } @@ -860,7 +860,7 @@ ParticularProcessPriorityManager::OnFrameloaderVisibleChanged(nsISupports* aSubj return; } - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); if (tp->Manager() != mContentParent) { return; } @@ -1224,7 +1224,7 @@ NS_IMPL_ISUPPORTS(ProcessPriorityManagerChild, ProcessPriorityManagerChild::ProcessPriorityManagerChild() { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { mCachedPriority = PROCESS_PRIORITY_MASTER; } else { mCachedPriority = PROCESS_PRIORITY_UNKNOWN; @@ -1236,7 +1236,7 @@ ProcessPriorityManagerChild::Init() { // The process priority should only be changed in child processes; don't even // bother listening for changes if we're in the main process. - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { nsCOMPtr os = services::GetObserverService(); NS_ENSURE_TRUE_VOID(os); os->AddObserver(this, "ipc:process-priority-changed", /* weak = */ false); diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index 7c86fc9c50..6fdbeef3cf 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -371,7 +371,7 @@ TabParent::Destroy() } mIsDestroyed = true; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { Manager()->AsContentParent()->NotifyTabDestroying(this); } @@ -389,7 +389,7 @@ TabParent::Destroy() bool TabParent::Recv__delete__() { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { Manager()->AsContentParent()->NotifyTabDestroyed(this, mMarkedDestroying); ContentParent::DeallocateTabId(mTabId, Manager()->AsContentParent()->ChildID()); diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp index 217d7fee55..349ae99c10 100644 --- a/dom/media/MediaManager.cpp +++ b/dom/media/MediaManager.cpp @@ -1532,7 +1532,7 @@ MediaManager::NotifyRecordingStatusChange(nsPIDOMWindow* aWindow, // Forward recording events to parent process. // The events are gathered in chrome process and used for recording indicator - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { unused << dom::ContentChild::GetSingleton()->SendRecordingDeviceEvents(aMsg, requestURL, diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp index c2e878290f..30b5e46d20 100644 --- a/dom/media/MediaRecorder.cpp +++ b/dom/media/MediaRecorder.cpp @@ -25,7 +25,7 @@ #include "nsMimeTypes.h" #include "nsProxyRelease.h" #include "nsTArray.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #ifdef LOG #undef LOG diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp index c65c719bb2..546dcfd849 100644 --- a/dom/media/MediaStreamGraph.cpp +++ b/dom/media/MediaStreamGraph.cpp @@ -27,7 +27,7 @@ #include "mozilla/dom/AudioContextBinding.h" #include #include "DOMMediaStream.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/unused.h" #ifdef MOZ_WEBRTC #include "AudioOutputObserver.h" diff --git a/dom/media/TrackUnionStream.cpp b/dom/media/TrackUnionStream.cpp index d9fde1fd4b..fddc04ad05 100644 --- a/dom/media/TrackUnionStream.cpp +++ b/dom/media/TrackUnionStream.cpp @@ -27,7 +27,7 @@ #include "webaudio/MediaStreamAudioDestinationNode.h" #include #include "DOMMediaStream.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #ifdef MOZ_WEBRTC #include "AudioOutputObserver.h" #endif diff --git a/dom/media/encoder/MediaEncoder.cpp b/dom/media/encoder/MediaEncoder.cpp index 23734c2f5e..025a5ae9bd 100644 --- a/dom/media/encoder/MediaEncoder.cpp +++ b/dom/media/encoder/MediaEncoder.cpp @@ -10,7 +10,7 @@ #include "mozilla/Preferences.h" #include "mozilla/StaticPtr.h" -#include"GoannaProfiler.h" +#include"GeckoProfiler.h" #include "OggWriter.h" #include "OpusTrackEncoder.h" diff --git a/dom/media/encoder/OmxTrackEncoder.cpp b/dom/media/encoder/OmxTrackEncoder.cpp index 14c5b4364d..2203dd0c24 100644 --- a/dom/media/encoder/OmxTrackEncoder.cpp +++ b/dom/media/encoder/OmxTrackEncoder.cpp @@ -7,7 +7,7 @@ #include "OMXCodecWrapper.h" #include "VideoUtils.h" #include "ISOTrackMetadata.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #ifdef MOZ_WIDGET_GONK #include diff --git a/dom/media/encoder/OpusTrackEncoder.cpp b/dom/media/encoder/OpusTrackEncoder.cpp index 1974051629..687b39e6c9 100644 --- a/dom/media/encoder/OpusTrackEncoder.cpp +++ b/dom/media/encoder/OpusTrackEncoder.cpp @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "OpusTrackEncoder.h" #include "nsString.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include diff --git a/dom/media/encoder/VP8TrackEncoder.cpp b/dom/media/encoder/VP8TrackEncoder.cpp index 49923217de..41380f4825 100644 --- a/dom/media/encoder/VP8TrackEncoder.cpp +++ b/dom/media/encoder/VP8TrackEncoder.cpp @@ -11,7 +11,7 @@ #include "prsystem.h" #include "WebMWriter.h" #include "libyuv.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" namespace mozilla { diff --git a/dom/media/encoder/VorbisTrackEncoder.cpp b/dom/media/encoder/VorbisTrackEncoder.cpp index b2ec8f522c..ab0760b8a5 100644 --- a/dom/media/encoder/VorbisTrackEncoder.cpp +++ b/dom/media/encoder/VorbisTrackEncoder.cpp @@ -6,7 +6,7 @@ #include #include #include "WebMWriter.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" // One actually used: Encoding using a VBR quality mode. The usable range is -.1 // (lowest quality, smallest file) to 1. (highest quality, largest file). diff --git a/dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp b/dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp index 0b44494478..f944e685e3 100644 --- a/dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp +++ b/dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp @@ -10,7 +10,7 @@ #include "nsThreadUtils.h" #include "MediaEncoder.h" #include "VideoUtils.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #undef LOG #ifdef MOZ_WIDGET_GONK diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp index b4f05965e1..b98cb74a11 100644 --- a/dom/media/gmp/GMPParent.cpp +++ b/dom/media/gmp/GMPParent.cpp @@ -13,7 +13,7 @@ #include "nsCharSeparatedTokenizer.h" #include "nsThreadUtils.h" #include "nsIRunnable.h" -#include "mozIGoannaMediaPluginService.h" +#include "mozIGeckoMediaPluginService.h" #include "mozilla/unused.h" #include "nsIObserverService.h" #include "GMPTimerParent.h" @@ -83,7 +83,7 @@ GMPParent::CloneFrom(const GMPParent* aOther) } nsresult -GMPParent::Init(GoannaMediaPluginService *aService, nsIFile* aPluginDir) +GMPParent::Init(GeckoMediaPluginService *aService, nsIFile* aPluginDir) { MOZ_ASSERT(aPluginDir); MOZ_ASSERT(aService); @@ -181,8 +181,8 @@ AbortWaitingForGMPAsyncShutdown(nsITimer* aTimer, void* aClosure) { NS_WARNING("Timed out waiting for GMP async shutdown!"); GMPParent* parent = reinterpret_cast(aClosure); - nsRefPtr service = - GoannaMediaPluginService::GetGoannaMediaPluginService(); + nsRefPtr service = + GeckoMediaPluginService::GetGeckoMediaPluginService(); if (service) { service->AsyncShutdownComplete(parent); } @@ -209,8 +209,8 @@ GMPParent::EnsureAsyncShutdownTimeoutSet() } int32_t timeout = GMP_DEFAULT_ASYNC_SHUTDONW_TIMEOUT; - nsRefPtr service = - GoannaMediaPluginService::GetGoannaMediaPluginService(); + nsRefPtr service = + GeckoMediaPluginService::GetGeckoMediaPluginService(); if (service) { timeout = service->AsyncShutdownTimeoutMs(); } @@ -398,7 +398,7 @@ GMPParent::ChildTerminated() nsRefPtr self(this); GMPThread()->Dispatch(NS_NewRunnableMethodWithArg>( mService, - &GoannaMediaPluginService::PluginTerminated, + &GeckoMediaPluginService::PluginTerminated, self), NS_DISPATCH_NORMAL); } @@ -508,7 +508,7 @@ nsIThread* GMPParent::GMPThread() { if (!mGMPThread) { - nsCOMPtr mps = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); + nsCOMPtr mps = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); MOZ_ASSERT(mps); if (!mps) { return nullptr; diff --git a/dom/media/gmp/GMPParent.h b/dom/media/gmp/GMPParent.h index 184b0a8e1b..734faaa086 100644 --- a/dom/media/gmp/GMPParent.h +++ b/dom/media/gmp/GMPParent.h @@ -51,7 +51,7 @@ public: GMPParent(); - nsresult Init(GoannaMediaPluginService *aService, nsIFile* aPluginDir); + nsresult Init(GeckoMediaPluginService *aService, nsIFile* aPluginDir); nsresult CloneFrom(const GMPParent* aOther); void Crash(); @@ -134,7 +134,7 @@ public: private: ~GMPParent(); - nsRefPtr mService; + nsRefPtr mService; bool EnsureProcessLoaded(); nsresult ReadGMPMetaData(); virtual void ActorDestroy(ActorDestroyReason aWhy) override; diff --git a/dom/media/gmp/GMPProcessParent.cpp b/dom/media/gmp/GMPProcessParent.cpp index 79c63c91ec..09d54b1bcb 100644 --- a/dom/media/gmp/GMPProcessParent.cpp +++ b/dom/media/gmp/GMPProcessParent.cpp @@ -16,7 +16,7 @@ using std::vector; using std::string; using mozilla::gmp::GMPProcessParent; -using mozilla::ipc::GoannaChildProcessHost; +using mozilla::ipc::GeckoChildProcessHost; using base::ProcessArchitecture; template<> @@ -30,7 +30,7 @@ namespace mozilla { namespace gmp { GMPProcessParent::GMPProcessParent(const std::string& aGMPPath) -: GoannaChildProcessHost(GoannaProcessType_GMPlugin), +: GeckoChildProcessHost(GeckoProcessType_GMPlugin), mGMPPath(aGMPPath) { MOZ_COUNT_CTOR(GMPProcessParent); diff --git a/dom/media/gmp/GMPProcessParent.h b/dom/media/gmp/GMPProcessParent.h index e4639f1c3f..6062cb6313 100644 --- a/dom/media/gmp/GMPProcessParent.h +++ b/dom/media/gmp/GMPProcessParent.h @@ -13,14 +13,14 @@ #include "base/thread.h" #include "base/waitable_event.h" #include "chrome/common/child_process_host.h" -#include "mozilla/ipc/GoannaChildProcessHost.h" +#include "mozilla/ipc/GeckoChildProcessHost.h" class nsIRunnable; namespace mozilla { namespace gmp { -class GMPProcessParent final : public mozilla::ipc::GoannaChildProcessHost +class GMPProcessParent final : public mozilla::ipc::GeckoChildProcessHost { public: explicit GMPProcessParent(const std::string& aGMPPath); @@ -35,9 +35,9 @@ public: virtual bool CanShutdown() override { return true; } const std::string& GetPluginFilePath() { return mGMPPath; } - using mozilla::ipc::GoannaChildProcessHost::GetShutDownEvent; - using mozilla::ipc::GoannaChildProcessHost::GetChannel; - using mozilla::ipc::GoannaChildProcessHost::GetChildProcessHandle; + using mozilla::ipc::GeckoChildProcessHost::GetShutDownEvent; + using mozilla::ipc::GeckoChildProcessHost::GetChannel; + using mozilla::ipc::GeckoChildProcessHost::GetChildProcessHandle; private: void DoDelete(); diff --git a/dom/media/gmp/GMPService.cpp b/dom/media/gmp/GMPService.cpp index 02d857e3b7..25060f3b3a 100644 --- a/dom/media/gmp/GMPService.cpp +++ b/dom/media/gmp/GMPService.cpp @@ -9,7 +9,7 @@ #include "GMPParent.h" #include "GMPVideoDecoderParent.h" #include "nsIObserverService.h" -#include "GoannaChildProcessHost.h" +#include "GeckoChildProcessHost.h" #include "mozilla/Preferences.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/SyncRunnable.h" @@ -65,17 +65,17 @@ GetGMPLog() namespace gmp { static const uint32_t NodeIdSaltLength = 32; -static StaticRefPtr sSingletonService; +static StaticRefPtr sSingletonService; class GMPServiceCreateHelper final : public nsRunnable { - nsRefPtr mService; + nsRefPtr mService; public: - static already_AddRefed + static already_AddRefed GetOrCreate() { - nsRefPtr service; + nsRefPtr service; if (NS_IsMainThread()) { service = GetOrCreateOnMainThread(); @@ -103,14 +103,14 @@ private: MOZ_ASSERT(!mService); } - static already_AddRefed + static already_AddRefed GetOrCreateOnMainThread() { MOZ_ASSERT(NS_IsMainThread()); - nsRefPtr service = sSingletonService.get(); + nsRefPtr service = sSingletonService.get(); if (!service) { - service = new GoannaMediaPluginService(); + service = new GeckoMediaPluginService(); service->Init(); sSingletonService = service; @@ -130,19 +130,19 @@ private: } }; -already_AddRefed -GoannaMediaPluginService::GetGoannaMediaPluginService() +already_AddRefed +GeckoMediaPluginService::GetGeckoMediaPluginService() { return GMPServiceCreateHelper::GetOrCreate(); } -NS_IMPL_ISUPPORTS(GoannaMediaPluginService, mozIGoannaMediaPluginService, nsIObserver) +NS_IMPL_ISUPPORTS(GeckoMediaPluginService, mozIGeckoMediaPluginService, nsIObserver) static int32_t sMaxAsyncShutdownWaitMs = 0; static bool sHaveSetTimeoutPrefCache = false; -GoannaMediaPluginService::GoannaMediaPluginService() - : mMutex("GoannaMediaPluginService::mMutex") +GeckoMediaPluginService::GeckoMediaPluginService() + : mMutex("GeckoMediaPluginService::mMutex") , mShuttingDown(false) , mShuttingDownOnGMPThread(false) , mScannedPluginOnDisk(false) @@ -157,21 +157,21 @@ GoannaMediaPluginService::GoannaMediaPluginService() } } -GoannaMediaPluginService::~GoannaMediaPluginService() +GeckoMediaPluginService::~GeckoMediaPluginService() { MOZ_ASSERT(mPlugins.IsEmpty()); MOZ_ASSERT(mAsyncShutdownPlugins.IsEmpty()); } int32_t -GoannaMediaPluginService::AsyncShutdownTimeoutMs() +GeckoMediaPluginService::AsyncShutdownTimeoutMs() { MOZ_ASSERT(sHaveSetTimeoutPrefCache); return sMaxAsyncShutdownWaitMs; } void -GoannaMediaPluginService::RemoveObsoletePluginCrashCallbacks() +GeckoMediaPluginService::RemoveObsoletePluginCrashCallbacks() { MOZ_ASSERT(NS_IsMainThread()); for (size_t i = mPluginCrashCallbacks.Length(); i != 0; --i) { @@ -186,7 +186,7 @@ GoannaMediaPluginService::RemoveObsoletePluginCrashCallbacks() } void -GoannaMediaPluginService::AddPluginCrashCallback( +GeckoMediaPluginService::AddPluginCrashCallback( nsRefPtr aPluginCrashCallback) { RemoveObsoletePluginCrashCallbacks(); @@ -194,7 +194,7 @@ GoannaMediaPluginService::AddPluginCrashCallback( } void -GoannaMediaPluginService::RemovePluginCrashCallbacks(const nsACString& aPluginId) +GeckoMediaPluginService::RemovePluginCrashCallbacks(const nsACString& aPluginId) { RemoveObsoletePluginCrashCallbacks(); for (size_t i = mPluginCrashCallbacks.Length(); i != 0; --i) { @@ -206,7 +206,7 @@ GoannaMediaPluginService::RemovePluginCrashCallbacks(const nsACString& aPluginId } void -GoannaMediaPluginService::RunPluginCrashCallbacks(const nsACString& aPluginId, +GeckoMediaPluginService::RunPluginCrashCallbacks(const nsACString& aPluginId, const nsACString& aPluginName, const nsAString& aPluginDumpId) { @@ -230,7 +230,7 @@ GoannaMediaPluginService::RunPluginCrashCallbacks(const nsACString& aPluginId, } nsresult -GoannaMediaPluginService::Init() +GeckoMediaPluginService::Init() { MOZ_ASSERT(NS_IsMainThread()); @@ -253,8 +253,8 @@ GoannaMediaPluginService::Init() #ifndef MOZ_WIDGET_GONK // Directory service is main thread only, so cache the profile dir here // so that we can use it off main thread. - // We only do this on non-B2G, as this fails in multi-process Goanna. - // TODO: Make this work in multi-process Goanna. + // We only do this on non-B2G, as this fails in multi-process Gecko. + // TODO: Make this work in multi-process Gecko. nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(mStorageBaseDir)); if (NS_WARN_IF(NS_FAILED(rv))) { return rv; @@ -277,7 +277,7 @@ GoannaMediaPluginService::Init() } NS_IMETHODIMP -GoannaMediaPluginService::Observe(nsISupports* aSubject, +GeckoMediaPluginService::Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aSomeData) { @@ -297,7 +297,7 @@ GoannaMediaPluginService::Observe(nsISupports* aSubject, gmpThread = mGMPThread; } if (gmpThread) { - gmpThread->Dispatch(WrapRunnable(this, &GoannaMediaPluginService::CrashPlugins), + gmpThread->Dispatch(WrapRunnable(this, &GeckoMediaPluginService::CrashPlugins), NS_DISPATCH_NORMAL); } } @@ -356,7 +356,7 @@ GoannaMediaPluginService::Observe(nsISupports* aSubject, if (gmpThread) { gmpThread->Dispatch( - NS_NewRunnableMethod(this, &GoannaMediaPluginService::UnloadPlugins), + NS_NewRunnableMethod(this, &GeckoMediaPluginService::UnloadPlugins), NS_DISPATCH_NORMAL); } else { MOZ_ASSERT(mPlugins.IsEmpty()); @@ -374,7 +374,7 @@ GoannaMediaPluginService::Observe(nsISupports* aSubject, // XXX The content process never gets profile-change-teardown, so mShuttingDown // will always be false here. GMPService needs to be proxied to the parent. // See bug 1057908. - MOZ_ASSERT(XRE_GetProcessType() != GoannaProcessType_Default || mShuttingDown); + MOZ_ASSERT(XRE_GetProcessType() != GeckoProcessType_Default || mShuttingDown); mGMPThread.swap(gmpThread); } @@ -392,7 +392,7 @@ GoannaMediaPluginService::Observe(nsISupports* aSubject, // Clear everything! if (!aSomeData || nsDependentString(aSomeData).IsEmpty()) { return GMPDispatch(NS_NewRunnableMethod( - this, &GoannaMediaPluginService::ClearStorage)); + this, &GeckoMediaPluginService::ClearStorage)); } // Clear nodeIds/records modified after |t|. @@ -402,14 +402,14 @@ GoannaMediaPluginService::Observe(nsISupports* aSubject, return rv; } return GMPDispatch(NS_NewRunnableMethodWithArg( - this, &GoannaMediaPluginService::ClearRecentHistoryOnGMPThread, t)); + this, &GeckoMediaPluginService::ClearRecentHistoryOnGMPThread, t)); } return NS_OK; } nsresult -GoannaMediaPluginService::GMPDispatch(nsIRunnable* event, uint32_t flags) +GeckoMediaPluginService::GMPDispatch(nsIRunnable* event, uint32_t flags) { nsCOMPtr r(event); nsCOMPtr thread; @@ -422,7 +422,7 @@ GoannaMediaPluginService::GMPDispatch(nsIRunnable* event, uint32_t flags) // always call with getter_AddRefs, because it does NS_IMETHODIMP -GoannaMediaPluginService::GetThread(nsIThread** aThread) +GeckoMediaPluginService::GetThread(nsIThread** aThread) { MOZ_ASSERT(aThread); @@ -441,7 +441,7 @@ GoannaMediaPluginService::GetThread(nsIThread** aThread) } // Tell the thread to initialize plugins - mGMPThread->Dispatch(NS_NewRunnableMethod(this, &GoannaMediaPluginService::LoadFromEnvironment), NS_DISPATCH_NORMAL); + mGMPThread->Dispatch(NS_NewRunnableMethod(this, &GeckoMediaPluginService::LoadFromEnvironment), NS_DISPATCH_NORMAL); } NS_ADDREF(mGMPThread); @@ -451,7 +451,7 @@ GoannaMediaPluginService::GetThread(nsIThread** aThread) } NS_IMETHODIMP -GoannaMediaPluginService::GetGMPAudioDecoder(nsTArray* aTags, +GeckoMediaPluginService::GetGMPAudioDecoder(nsTArray* aTags, const nsACString& aNodeId, GMPAudioDecoderProxy** aGMPAD) { @@ -482,7 +482,7 @@ GoannaMediaPluginService::GetGMPAudioDecoder(nsTArray* aTags, } NS_IMETHODIMP -GoannaMediaPluginService::GetGMPVideoDecoder(nsTArray* aTags, +GeckoMediaPluginService::GetGMPVideoDecoder(nsTArray* aTags, const nsACString& aNodeId, GMPVideoHost** aOutVideoHost, GMPVideoDecoderProxy** aGMPVD) @@ -521,7 +521,7 @@ GoannaMediaPluginService::GetGMPVideoDecoder(nsTArray* aTags, } NS_IMETHODIMP -GoannaMediaPluginService::GetGMPVideoEncoder(nsTArray* aTags, +GeckoMediaPluginService::GetGMPVideoEncoder(nsTArray* aTags, const nsACString& aNodeId, GMPVideoHost** aOutVideoHost, GMPVideoEncoderProxy** aGMPVE) @@ -559,13 +559,13 @@ GoannaMediaPluginService::GetGMPVideoEncoder(nsTArray* aTags, } NS_IMETHODIMP -GoannaMediaPluginService::GetGMPDecryptor(nsTArray* aTags, +GeckoMediaPluginService::GetGMPDecryptor(nsTArray* aTags, const nsACString& aNodeId, GMPDecryptorProxy** aDecryptor) { #if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX) if (!SandboxInfo::Get().CanSandboxMedia()) { - NS_WARNING("GoannaMediaPluginService::GetGMPDecryptor: " + NS_WARNING("GeckoMediaPluginService::GetGMPDecryptor: " "EME decryption not available without sandboxing support."); return NS_ERROR_NOT_AVAILABLE; } @@ -606,7 +606,7 @@ GoannaMediaPluginService::GetGMPDecryptor(nsTArray* aTags, } void -GoannaMediaPluginService::AsyncShutdownNeeded(GMPParent* aParent) +GeckoMediaPluginService::AsyncShutdownNeeded(GMPParent* aParent) { LOGD(("%s::%s %p", __CLASS__, __FUNCTION__, aParent)); MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); @@ -616,7 +616,7 @@ GoannaMediaPluginService::AsyncShutdownNeeded(GMPParent* aParent) } void -GoannaMediaPluginService::AsyncShutdownComplete(GMPParent* aParent) +GeckoMediaPluginService::AsyncShutdownComplete(GMPParent* aParent) { LOGD(("%s::%s %p", __CLASS__, __FUNCTION__, aParent)); MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); @@ -626,20 +626,20 @@ GoannaMediaPluginService::AsyncShutdownComplete(GMPParent* aParent) // The main thread may be waiting for async shutdown of plugins, // which has completed. Break the main thread out of its waiting loop. nsCOMPtr task(NS_NewRunnableMethod( - this, &GoannaMediaPluginService::SetAsyncShutdownComplete)); + this, &GeckoMediaPluginService::SetAsyncShutdownComplete)); NS_DispatchToMainThread(task); } } void -GoannaMediaPluginService::SetAsyncShutdownComplete() +GeckoMediaPluginService::SetAsyncShutdownComplete() { MOZ_ASSERT(NS_IsMainThread()); mWaitingForPluginsAsyncShutdown = false; } void -GoannaMediaPluginService::UnloadPlugins() +GeckoMediaPluginService::UnloadPlugins() { LOGD(("%s::%s async_shutdown=%d", __CLASS__, __FUNCTION__, mAsyncShutdownPlugins.Length())); @@ -660,13 +660,13 @@ GoannaMediaPluginService::UnloadPlugins() if (mAsyncShutdownPlugins.IsEmpty()) { nsCOMPtr task(NS_NewRunnableMethod( - this, &GoannaMediaPluginService::SetAsyncShutdownComplete)); + this, &GeckoMediaPluginService::SetAsyncShutdownComplete)); NS_DispatchToMainThread(task); } } void -GoannaMediaPluginService::CrashPlugins() +GeckoMediaPluginService::CrashPlugins() { LOGD(("%s::%s", __CLASS__, __FUNCTION__)); MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); @@ -678,7 +678,7 @@ GoannaMediaPluginService::CrashPlugins() } void -GoannaMediaPluginService::LoadFromEnvironment() +GeckoMediaPluginService::LoadFromEnvironment() { MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); @@ -710,7 +710,7 @@ GoannaMediaPluginService::LoadFromEnvironment() } NS_IMETHODIMP -GoannaMediaPluginService::PathRunnable::Run() +GeckoMediaPluginService::PathRunnable::Run() { if (mOperation == ADD) { mService->AddOnGMPThread(mPath); @@ -723,7 +723,7 @@ GoannaMediaPluginService::PathRunnable::Run() } NS_IMETHODIMP -GoannaMediaPluginService::AddPluginDirectory(const nsAString& aDirectory) +GeckoMediaPluginService::AddPluginDirectory(const nsAString& aDirectory) { MOZ_ASSERT(NS_IsMainThread()); return GMPDispatch(new PathRunnable(this, aDirectory, @@ -731,7 +731,7 @@ GoannaMediaPluginService::AddPluginDirectory(const nsAString& aDirectory) } NS_IMETHODIMP -GoannaMediaPluginService::RemovePluginDirectory(const nsAString& aDirectory) +GeckoMediaPluginService::RemovePluginDirectory(const nsAString& aDirectory) { MOZ_ASSERT(NS_IsMainThread()); return GMPDispatch(new PathRunnable(this, aDirectory, @@ -739,7 +739,7 @@ GoannaMediaPluginService::RemovePluginDirectory(const nsAString& aDirectory) } NS_IMETHODIMP -GoannaMediaPluginService::RemoveAndDeletePluginDirectory( +GeckoMediaPluginService::RemoveAndDeletePluginDirectory( const nsAString& aDirectory, const bool aDefer) { MOZ_ASSERT(NS_IsMainThread()); @@ -755,7 +755,7 @@ public: }; NS_IMETHODIMP -GoannaMediaPluginService::GetPluginVersionForAPI(const nsACString& aAPI, +GeckoMediaPluginService::GetPluginVersionForAPI(const nsACString& aAPI, nsTArray* aTags, nsACString& aOutVersion) { @@ -794,7 +794,7 @@ GoannaMediaPluginService::GetPluginVersionForAPI(const nsACString& aAPI, } nsresult -GoannaMediaPluginService::EnsurePluginsOnDiskScanned() +GeckoMediaPluginService::EnsurePluginsOnDiskScanned() { const char* env = nullptr; if (!mScannedPluginOnDisk && (env = PR_GetEnv("MOZ_GMP_PATH")) && *env) { @@ -813,7 +813,7 @@ GoannaMediaPluginService::EnsurePluginsOnDiskScanned() } NS_IMETHODIMP -GoannaMediaPluginService::HasPluginForAPI(const nsACString& aAPI, +GeckoMediaPluginService::HasPluginForAPI(const nsACString& aAPI, nsTArray* aTags, bool* aOutHavePlugin) { @@ -837,7 +837,7 @@ GoannaMediaPluginService::HasPluginForAPI(const nsACString& aAPI, } GMPParent* -GoannaMediaPluginService::FindPluginForAPIFrom(size_t aSearchStartIndex, +GeckoMediaPluginService::FindPluginForAPIFrom(size_t aSearchStartIndex, const nsCString& aAPI, const nsTArray& aTags, size_t* aOutPluginIndex) @@ -865,7 +865,7 @@ GoannaMediaPluginService::FindPluginForAPIFrom(size_t aSearchStartIndex, } GMPParent* -GoannaMediaPluginService::SelectPluginForAPI(const nsACString& aNodeId, +GeckoMediaPluginService::SelectPluginForAPI(const nsACString& aNodeId, const nsCString& aAPI, const nsTArray& aTags) { @@ -941,7 +941,7 @@ private: }; GMPParent* -GoannaMediaPluginService::ClonePlugin(const GMPParent* aOriginal) +GeckoMediaPluginService::ClonePlugin(const GMPParent* aOriginal) { MOZ_ASSERT(aOriginal); @@ -988,7 +988,7 @@ private: }; void -GoannaMediaPluginService::AddOnGMPThread(const nsAString& aDirectory) +GeckoMediaPluginService::AddOnGMPThread(const nsAString& aDirectory) { MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); LOGD(("%s::%s: %s", __CLASS__, __FUNCTION__, NS_LossyConvertUTF16toASCII(aDirectory).get())); @@ -1021,7 +1021,7 @@ GoannaMediaPluginService::AddOnGMPThread(const nsAString& aDirectory) } void -GoannaMediaPluginService::RemoveOnGMPThread(const nsAString& aDirectory, +GeckoMediaPluginService::RemoveOnGMPThread(const nsAString& aDirectory, const bool aDeleteFromDisk, const bool aCanDefer) { @@ -1076,7 +1076,7 @@ static void Dummy(nsRefPtr& aOnDeathsDoor) } void -GoannaMediaPluginService::PluginTerminated(const nsRefPtr& aPlugin) +GeckoMediaPluginService::PluginTerminated(const nsRefPtr& aPlugin) { MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); @@ -1094,7 +1094,7 @@ GoannaMediaPluginService::PluginTerminated(const nsRefPtr& aPlugin) } void -GoannaMediaPluginService::ReAddOnGMPThread(const nsRefPtr& aOld) +GeckoMediaPluginService::ReAddOnGMPThread(const nsRefPtr& aOld) { MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); LOGD(("%s::%s: %p", __CLASS__, __FUNCTION__, (void*) aOld)); @@ -1116,7 +1116,7 @@ GoannaMediaPluginService::ReAddOnGMPThread(const nsRefPtr& aOld) } NS_IMETHODIMP -GoannaMediaPluginService::GetStorageDir(nsIFile** aOutFile) +GeckoMediaPluginService::GetStorageDir(nsIFile** aOutFile) { #ifndef MOZ_WIDGET_GONK if (NS_WARN_IF(!mStorageBaseDir)) { @@ -1208,7 +1208,7 @@ ReadSalt(nsIFile* aPath, nsACString& aOutData) } NS_IMETHODIMP -GoannaMediaPluginService::IsPersistentStorageAllowed(const nsACString& aNodeId, +GeckoMediaPluginService::IsPersistentStorageAllowed(const nsACString& aNodeId, bool* aOutAllowed) { MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); @@ -1218,7 +1218,7 @@ GoannaMediaPluginService::IsPersistentStorageAllowed(const nsACString& aNodeId, } NS_IMETHODIMP -GoannaMediaPluginService::GetNodeId(const nsAString& aOrigin, +GeckoMediaPluginService::GetNodeId(const nsAString& aOrigin, const nsAString& aTopLevelOrigin, bool aInPrivateBrowsing, nsACString& aOutId) @@ -1230,7 +1230,7 @@ GoannaMediaPluginService::GetNodeId(const nsAString& aOrigin, (aInPrivateBrowsing ? "PrivateBrowsing" : "NonPrivateBrowsing"))); #ifdef MOZ_WIDGET_GONK - NS_WARNING("GoannaMediaPluginService::GetNodeId Not implemented on B2G"); + NS_WARNING("GeckoMediaPluginService::GetNodeId Not implemented on B2G"); return NS_ERROR_NOT_IMPLEMENTED; #endif @@ -1464,7 +1464,7 @@ private: }; void -GoannaMediaPluginService::ClearNodeIdAndPlugin(DirectoryFilter& aFilter) +GeckoMediaPluginService::ClearNodeIdAndPlugin(DirectoryFilter& aFilter) { nsresult rv; nsCOMPtr path; @@ -1560,7 +1560,7 @@ GoannaMediaPluginService::ClearNodeIdAndPlugin(DirectoryFilter& aFilter) } void -GoannaMediaPluginService::ForgetThisSiteOnGMPThread(const nsACString& aSite) +GeckoMediaPluginService::ForgetThisSiteOnGMPThread(const nsACString& aSite) { MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); LOGD(("%s::%s: origin=%s", __CLASS__, __FUNCTION__, aSite.Data())); @@ -1578,7 +1578,7 @@ GoannaMediaPluginService::ForgetThisSiteOnGMPThread(const nsACString& aSite) } void -GoannaMediaPluginService::ClearRecentHistoryOnGMPThread(PRTime aSince) +GeckoMediaPluginService::ClearRecentHistoryOnGMPThread(PRTime aSince) { MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); LOGD(("%s::%s: since=%lld", __CLASS__, __FUNCTION__, (int64_t)aSince)); @@ -1665,11 +1665,11 @@ GoannaMediaPluginService::ClearRecentHistoryOnGMPThread(PRTime aSince) } NS_IMETHODIMP -GoannaMediaPluginService::ForgetThisSite(const nsAString& aSite) +GeckoMediaPluginService::ForgetThisSite(const nsAString& aSite) { MOZ_ASSERT(NS_IsMainThread()); return GMPDispatch(NS_NewRunnableMethodWithArg( - this, &GoannaMediaPluginService::ForgetThisSiteOnGMPThread, + this, &GeckoMediaPluginService::ForgetThisSiteOnGMPThread, NS_ConvertUTF16toUTF8(aSite))); } @@ -1678,13 +1678,13 @@ static bool IsNodeIdValid(GMPParent* aParent) { } void -GoannaMediaPluginService::ClearStorage() +GeckoMediaPluginService::ClearStorage() { MOZ_ASSERT(NS_GetCurrentThread() == mGMPThread); LOGD(("%s::%s", __CLASS__, __FUNCTION__)); #ifdef MOZ_WIDGET_GONK - NS_WARNING("GoannaMediaPluginService::ClearStorage not implemented on B2G"); + NS_WARNING("GeckoMediaPluginService::ClearStorage not implemented on B2G"); return; #endif diff --git a/dom/media/gmp/GMPService.h b/dom/media/gmp/GMPService.h index 05f7992ed4..1efa3c3246 100644 --- a/dom/media/gmp/GMPService.h +++ b/dom/media/gmp/GMPService.h @@ -7,7 +7,7 @@ #define GMPService_h_ #include "nsString.h" -#include "mozIGoannaMediaPluginService.h" +#include "mozIGeckoMediaPluginService.h" #include "nsIObserver.h" #include "nsTArray.h" #include "mozilla/Attributes.h" @@ -30,17 +30,17 @@ class GMPParent; #define GMP_DEFAULT_ASYNC_SHUTDONW_TIMEOUT 3000 -class GoannaMediaPluginService final : public mozIGoannaMediaPluginService - , public nsIObserver +class GeckoMediaPluginService final : public mozIGeckoMediaPluginService + , public nsIObserver { public: - static already_AddRefed GetGoannaMediaPluginService(); + static already_AddRefed GetGeckoMediaPluginService(); - GoannaMediaPluginService(); + GeckoMediaPluginService(); nsresult Init(); NS_DECL_THREADSAFE_ISUPPORTS - NS_DECL_MOZIGOANNAMEDIAPLUGINSERVICE + NS_DECL_MOZIGECKOMEDIAPLUGINSERVICE NS_DECL_NSIOBSERVER void AsyncShutdownNeeded(GMPParent* aParent); @@ -78,7 +78,7 @@ public: const nsAString& aPluginDumpId); private: - ~GoannaMediaPluginService(); + ~GeckoMediaPluginService(); nsresult GMPDispatch(nsIRunnable* event, uint32_t flags = NS_DISPATCH_NORMAL); @@ -132,7 +132,7 @@ private: REMOVE_AND_DELETE_FROM_DISK, }; - PathRunnable(GoannaMediaPluginService* aService, const nsAString& aPath, + PathRunnable(GeckoMediaPluginService* aService, const nsAString& aPath, EOperation aOperation, bool aDefer = false) : mService(aService) , mPath(aPath) @@ -143,7 +143,7 @@ private: NS_DECL_NSIRUNNABLE private: - nsRefPtr mService; + nsRefPtr mService; nsString mPath; EOperation mOperation; bool mDefer; diff --git a/dom/media/gmp/GMPStorageParent.cpp b/dom/media/gmp/GMPStorageParent.cpp index e9bf852684..121db32d02 100644 --- a/dom/media/gmp/GMPStorageParent.cpp +++ b/dom/media/gmp/GMPStorageParent.cpp @@ -15,7 +15,7 @@ #include "nsTHashtable.h" #include "nsDataHashtable.h" #include "prio.h" -#include "mozIGoannaMediaPluginService.h" +#include "mozIGeckoMediaPluginService.h" #include "nsContentCID.h" #include "nsServiceManagerUtils.h" #include "nsISimpleEnumerator.h" @@ -52,8 +52,8 @@ GetGMPStorageDir(nsIFile** aTempDir, const nsCString& aNodeId) return NS_ERROR_INVALID_ARG; } - nsCOMPtr mps = - do_GetService("@mozilla.org/goanna-media-plugin-service;1"); + nsCOMPtr mps = + do_GetService("@mozilla.org/gecko-media-plugin-service;1"); if (NS_WARN_IF(!mps)) { return NS_ERROR_FAILURE; } @@ -468,8 +468,8 @@ GMPStorageParent::Init() if (NS_WARN_IF(mNodeId.IsEmpty())) { return NS_ERROR_FAILURE; } - nsCOMPtr mps = - do_GetService("@mozilla.org/goanna-media-plugin-service;1"); + nsCOMPtr mps = + do_GetService("@mozilla.org/gecko-media-plugin-service;1"); if (NS_WARN_IF(!mps)) { return NS_ERROR_FAILURE; } diff --git a/dom/media/gmp/moz.build b/dom/media/gmp/moz.build index 34bfca1493..1fe607f7ae 100644 --- a/dom/media/gmp/moz.build +++ b/dom/media/gmp/moz.build @@ -4,10 +4,10 @@ # 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/. -XPIDL_MODULE = 'content_goannamediaplugins' +XPIDL_MODULE = 'content_geckomediaplugins' XPIDL_SOURCES += [ - 'mozIGoannaMediaPluginService.idl', + 'mozIGeckoMediaPluginService.idl', ] EXPORTS += [ diff --git a/dom/media/gmp/mozIGoannaMediaPluginService.idl b/dom/media/gmp/mozIGeckoMediaPluginService.idl similarity index 97% rename from dom/media/gmp/mozIGoannaMediaPluginService.idl rename to dom/media/gmp/mozIGeckoMediaPluginService.idl index 3ea6944a40..c4c331da6e 100644 --- a/dom/media/gmp/mozIGoannaMediaPluginService.idl +++ b/dom/media/gmp/mozIGeckoMediaPluginService.idl @@ -27,7 +27,7 @@ class GMPVideoHost; [ptr] native GMPAudioDecoderProxy(GMPAudioDecoderProxy); [scriptable, uuid(46c7cd80-a19d-49e7-a147-ca314ad8d8b0)] -interface mozIGoannaMediaPluginService : nsISupports +interface mozIGeckoMediaPluginService : nsISupports { /** @@ -92,7 +92,7 @@ interface mozIGoannaMediaPluginService : nsISupports void addPluginDirectory(in AString directory); /** - * Remove a directory for goanna media plugins. + * Remove a directory for gecko media plugins. * @note Main-thread API. */ void removePluginDirectory(in AString directory); diff --git a/dom/media/ogg/OggWriter.cpp b/dom/media/ogg/OggWriter.cpp index 0d6133302e..1845c0638c 100644 --- a/dom/media/ogg/OggWriter.cpp +++ b/dom/media/ogg/OggWriter.cpp @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "OggWriter.h" #include "prtime.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #undef LOG #ifdef MOZ_WIDGET_GONK diff --git a/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp b/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp index 357b20c796..d402122634 100644 --- a/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp +++ b/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp @@ -12,7 +12,7 @@ namespace mozilla { #if defined(DEBUG) bool IsOnGMPThread() { - nsCOMPtr mps = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); + nsCOMPtr mps = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); MOZ_ASSERT(mps); nsCOMPtr gmpThread; @@ -138,7 +138,7 @@ GMPAudioDecoder::Init() { MOZ_ASSERT(IsOnGMPThread()); - mMPS = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); + mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); MOZ_ASSERT(mMPS); nsTArray tags; diff --git a/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.h b/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.h index 446e4c7385..68d70b09bd 100644 --- a/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.h +++ b/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.h @@ -10,7 +10,7 @@ #include "GMPAudioDecoderProxy.h" #include "MediaDataDecoderProxy.h" #include "PlatformDecoderModule.h" -#include "mozIGoannaMediaPluginService.h" +#include "mozIGeckoMediaPluginService.h" namespace mozilla { @@ -82,7 +82,7 @@ protected: private: const AudioInfo& mConfig; MediaDataDecoderCallbackProxy* mCallback; - nsCOMPtr mMPS; + nsCOMPtr mMPS; GMPAudioDecoderProxy* mGMP; nsAutoPtr mAdapter; }; diff --git a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp index b70d847036..df7cd31294 100644 --- a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp +++ b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp @@ -8,7 +8,7 @@ #include "GMPAudioDecoder.h" #include "GMPVideoDecoder.h" #include "MediaDataDecoderProxy.h" -#include "mozIGoannaMediaPluginService.h" +#include "mozIGeckoMediaPluginService.h" #include "nsServiceManagerUtils.h" namespace mozilla { @@ -24,7 +24,7 @@ GMPDecoderModule::~GMPDecoderModule() static already_AddRefed CreateDecoderWrapper(MediaDataDecoderCallback* aCallback) { - nsCOMPtr gmpService = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); + nsCOMPtr gmpService = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); if (!gmpService) { return nullptr; } diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp index e80f304bc4..591a98b649 100644 --- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp +++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp @@ -163,7 +163,7 @@ GMPVideoDecoder::Init() { MOZ_ASSERT(IsOnGMPThread()); - mMPS = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); + mMPS = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); MOZ_ASSERT(mMPS); nsTArray tags; diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.h b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.h index c52a9e5c0c..bcb2248bc4 100644 --- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.h +++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.h @@ -11,7 +11,7 @@ #include "ImageContainer.h" #include "MediaDataDecoderProxy.h" #include "PlatformDecoderModule.h" -#include "mozIGoannaMediaPluginService.h" +#include "mozIGeckoMediaPluginService.h" #include "MediaInfo.h" namespace mozilla { @@ -98,7 +98,7 @@ protected: private: const VideoInfo& mConfig; MediaDataDecoderCallbackProxy* mCallback; - nsCOMPtr mMPS; + nsCOMPtr mMPS; GMPVideoDecoderProxy* mGMP; GMPVideoHost* mHost; nsAutoPtr mAdapter; diff --git a/dom/media/webm/WebMWriter.cpp b/dom/media/webm/WebMWriter.cpp index 9a4f307cd9..4a6c2368fb 100644 --- a/dom/media/webm/WebMWriter.cpp +++ b/dom/media/webm/WebMWriter.cpp @@ -5,7 +5,7 @@ #include "WebMWriter.h" #include "EbmlComposer.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" namespace mozilla { diff --git a/dom/media/webspeech/synth/nsSpeechTask.cpp b/dom/media/webspeech/synth/nsSpeechTask.cpp index 4a41c5b216..b1db6e6740 100644 --- a/dom/media/webspeech/synth/nsSpeechTask.cpp +++ b/dom/media/webspeech/synth/nsSpeechTask.cpp @@ -131,7 +131,7 @@ NS_IMETHODIMP nsSpeechTask::Setup(nsISpeechTaskCallback* aCallback, uint32_t aChannels, uint32_t aRate, uint8_t argc) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); LOG(PR_LOG_DEBUG, ("nsSpeechTask::Setup")); @@ -180,7 +180,7 @@ NS_IMETHODIMP nsSpeechTask::SendAudio(JS::Handle aData, JS::Handle aLandmarks, JSContext* aCx) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); NS_ENSURE_TRUE(mStream, NS_ERROR_NOT_AVAILABLE); NS_ENSURE_FALSE(mStream->IsDestroyed(), NS_ERROR_NOT_AVAILABLE); @@ -222,7 +222,7 @@ nsSpeechTask::SendAudio(JS::Handle aData, JS::Handle aLand NS_IMETHODIMP nsSpeechTask::SendAudioNative(int16_t* aData, uint32_t aDataLen) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); NS_ENSURE_TRUE(mStream, NS_ERROR_NOT_AVAILABLE); NS_ENSURE_FALSE(mStream->IsDestroyed(), NS_ERROR_NOT_AVAILABLE); @@ -459,7 +459,7 @@ nsSpeechTask::DispatchMarkImpl(const nsAString& aName, void nsSpeechTask::Pause() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); if (mUtterance->IsPaused() || mUtterance->GetState() == SpeechSynthesisUtterance::STATE_ENDED) { @@ -481,7 +481,7 @@ nsSpeechTask::Pause() void nsSpeechTask::Resume() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); if (!mUtterance->IsPaused()) { return; @@ -502,7 +502,7 @@ nsSpeechTask::Resume() void nsSpeechTask::Cancel() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); LOG(PR_LOG_DEBUG, ("nsSpeechTask::Cancel")); diff --git a/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp b/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp index 3f00220f45..f71169e140 100644 --- a/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp +++ b/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp @@ -104,7 +104,7 @@ NS_IMPL_ISUPPORTS(nsSynthVoiceRegistry, nsISynthVoiceRegistry) nsSynthVoiceRegistry::nsSynthVoiceRegistry() : mSpeechSynthChild(nullptr) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { mSpeechSynthChild = new SpeechSynthesisChild(); ContentChild::GetSingleton()->SendPSpeechSynthesisConstructor(mSpeechSynthChild); @@ -161,7 +161,7 @@ void nsSynthVoiceRegistry::Shutdown() { LOG(PR_LOG_DEBUG, ("[%s] nsSynthVoiceRegistry::Shutdown()", - (XRE_GetProcessType() == GoannaProcessType_Content) ? "Content" : "Default")); + (XRE_GetProcessType() == GeckoProcessType_Content) ? "Content" : "Default")); gSynthVoiceRegistry = nullptr; } @@ -232,7 +232,7 @@ nsSynthVoiceRegistry::AddVoice(nsISpeechService* aService, NS_ConvertUTF16toUTF8(aLang).get(), aLocalService ? "true" : "false")); - NS_ENSURE_FALSE(XRE_GetProcessType() == GoannaProcessType_Content, + NS_ENSURE_FALSE(XRE_GetProcessType() == GeckoProcessType_Content, NS_ERROR_NOT_AVAILABLE); return AddVoiceImpl(aService, aUri, aName, aLang, @@ -246,7 +246,7 @@ nsSynthVoiceRegistry::RemoveVoice(nsISpeechService* aService, LOG(PR_LOG_DEBUG, ("nsSynthVoiceRegistry::RemoveVoice uri='%s' (%s)", NS_ConvertUTF16toUTF8(aUri).get(), - (XRE_GetProcessType() == GoannaProcessType_Content) ? "child" : "parent")); + (XRE_GetProcessType() == GeckoProcessType_Content) ? "child" : "parent")); bool found = false; VoiceData* retval = mUriVoiceMap.GetWeak(aUri, &found); @@ -285,7 +285,7 @@ nsSynthVoiceRegistry::SetDefaultVoice(const nsAString& aUri, mDefaultVoices.AppendElement(retval); } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsTArray ssplist; GetAllSpeechSynthActors(ssplist); @@ -517,7 +517,7 @@ nsSynthVoiceRegistry::SpeakUtterance(SpeechSynthesisUtterance& aUtterance, } nsRefPtr task; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { task = new SpeechTaskChild(&aUtterance); SpeechSynthesisRequestChild* actor = new SpeechSynthesisRequestChild(static_cast(task.get())); diff --git a/dom/media/webspeech/synth/pico/nsPicoService.cpp b/dom/media/webspeech/synth/pico/nsPicoService.cpp index 6f53da4343..a176652ac5 100644 --- a/dom/media/webspeech/synth/pico/nsPicoService.cpp +++ b/dom/media/webspeech/synth/pico/nsPicoService.cpp @@ -714,7 +714,7 @@ nsPicoService* nsPicoService::GetInstance() { MOZ_ASSERT(NS_IsMainThread()); - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { MOZ_ASSERT(false, "nsPicoService can only be started on main goanna process"); return nullptr; } diff --git a/dom/mobileconnection/MobileConnectionArray.cpp b/dom/mobileconnection/MobileConnectionArray.cpp index d89ae8fcab..6377e6a54a 100644 --- a/dom/mobileconnection/MobileConnectionArray.cpp +++ b/dom/mobileconnection/MobileConnectionArray.cpp @@ -101,7 +101,7 @@ NS_CreateMobileConnectionService() { nsCOMPtr service; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { service = new mozilla::dom::mobileconnection::MobileConnectionIPCService(); } else { #if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL) diff --git a/dom/mobilemessage/MobileMessageManager.cpp b/dom/mobilemessage/MobileMessageManager.cpp index 37bb2b1eab..8000b5a0f4 100644 --- a/dom/mobilemessage/MobileMessageManager.cpp +++ b/dom/mobilemessage/MobileMessageManager.cpp @@ -705,7 +705,7 @@ NS_CreateSmsService() { nsCOMPtr smsService; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { smsService = SmsIPCService::GetSingleton(); } else { #ifdef MOZ_WIDGET_ANDROID @@ -722,7 +722,7 @@ already_AddRefed NS_CreateMobileMessageDatabaseService() { nsCOMPtr mobileMessageDBService; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { mobileMessageDBService = SmsIPCService::GetSingleton(); } else { #ifdef MOZ_WIDGET_ANDROID @@ -741,7 +741,7 @@ NS_CreateMmsService() { nsCOMPtr mmsService; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { mmsService = SmsIPCService::GetSingleton(); } else { #if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL) diff --git a/dom/network/UDPSocket.cpp b/dom/network/UDPSocket.cpp index e7d910cf9c..310d66e061 100644 --- a/dom/network/UDPSocket.cpp +++ b/dom/network/UDPSocket.cpp @@ -555,7 +555,7 @@ UDPSocket::Init(const nsString& aLocalAddress, } nsresult rv; - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { rv = mSocket->InitRemote(mSocket->mLocalAddress, localPort); } else { rv = mSocket->InitLocal(mSocket->mLocalAddress, localPort); diff --git a/dom/nfc/gonk/NfcService.cpp b/dom/nfc/gonk/NfcService.cpp index 7818bbc8ba..8aa0310ceb 100644 --- a/dom/nfc/gonk/NfcService.cpp +++ b/dom/nfc/gonk/NfcService.cpp @@ -270,7 +270,7 @@ NfcService::~NfcService() already_AddRefed NfcService::FactoryCreate() { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return nullptr; } diff --git a/dom/offline/nsDOMOfflineResourceList.cpp b/dom/offline/nsDOMOfflineResourceList.cpp index 6fffbbba20..27f5b50abb 100644 --- a/dom/offline/nsDOMOfflineResourceList.cpp +++ b/dom/offline/nsDOMOfflineResourceList.cpp @@ -24,7 +24,7 @@ #include "nsXULAppAPI.h" #define IS_CHILD_PROCESS() \ - (GoannaProcessType_Default != XRE_GetProcessType()) + (GeckoProcessType_Default != XRE_GetProcessType()) using namespace mozilla; using namespace mozilla::dom; diff --git a/dom/plugins/base/nsNPAPIPlugin.cpp b/dom/plugins/base/nsNPAPIPlugin.cpp index 7fdc5344f8..fdbaec9f34 100644 --- a/dom/plugins/base/nsNPAPIPlugin.cpp +++ b/dom/plugins/base/nsNPAPIPlugin.cpp @@ -247,7 +247,7 @@ nsNPAPIPlugin::PluginCrashed(const nsAString& pluginDumpID, bool nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return true; } @@ -403,7 +403,7 @@ GetNewPluginLibrary(nsPluginTag *aPluginTag) return nullptr; } - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return PluginModuleContentParent::LoadModule(aPluginTag->mId); } diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp index 62545d7c69..19dece6529 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -245,7 +245,7 @@ nsPluginHost::nsPluginHost() // good plugin list the first time it requests it. Normally we'd just // init this to 1, but due to the unique nature of our ctor we need to do // this manually. - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { IncrementChromeEpoch(); } @@ -1256,7 +1256,7 @@ nsresult nsPluginHost::EnsurePluginLoaded(nsPluginTag* aPluginTag) nsresult nsPluginHost::GetPluginForContentProcess(uint32_t aPluginId, nsNPAPIPlugin** aPlugin) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); // If plugins haven't been scanned yet, do so now LoadPlugins(); @@ -1314,7 +1314,7 @@ protected: void nsPluginHost::NotifyContentModuleDestroyed(uint32_t aPluginId) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); // This is called in response to a message from the plugin. Don't unload the // plugin until the message handler is off the stack. @@ -1820,7 +1820,7 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, bool aCreatePluginList, bool *aPluginsChanged) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); NS_ENSURE_ARG_POINTER(aPluginsChanged); nsresult rv; @@ -2027,7 +2027,7 @@ nsresult nsPluginHost::ScanPluginsDirectoryList(nsISimpleEnumerator *dirEnum, bool aCreatePluginList, bool *aPluginsChanged) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); bool hasMore; while (NS_SUCCEEDED(dirEnum->HasMoreElements(&hasMore)) && hasMore) { @@ -2056,28 +2056,28 @@ nsresult nsPluginHost::ScanPluginsDirectoryList(nsISimpleEnumerator *dirEnum, void nsPluginHost::IncrementChromeEpoch() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); mPluginEpoch++; } uint32_t nsPluginHost::ChromeEpoch() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); return mPluginEpoch; } uint32_t nsPluginHost::ChromeEpochForContent() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Content); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content); return mPluginEpoch; } void nsPluginHost::SetChromeEpochForContent(uint32_t aEpoch) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Content); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content); mPluginEpoch = aEpoch; } @@ -2107,7 +2107,7 @@ WatchRegKey(uint32_t aRoot, nsCOMPtr& aKey) nsresult nsPluginHost::LoadPlugins() { #ifdef ANDROID - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return NS_OK; } #endif @@ -2131,7 +2131,7 @@ nsresult nsPluginHost::LoadPlugins() // only if plugins have changed will we notify plugin-change observers if (pluginschanged) { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { IncrementChromeEpoch(); } @@ -2147,7 +2147,7 @@ nsresult nsPluginHost::LoadPlugins() nsresult nsPluginHost::FindPluginsInContent(bool aCreatePluginList, bool* aPluginsChanged) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Content); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content); dom::ContentChild* cp = dom::ContentChild::GetSingleton(); nsTArray plugins; @@ -2203,7 +2203,7 @@ nsresult nsPluginHost::FindPlugins(bool aCreatePluginList, bool * aPluginsChange *aPluginsChanged = false; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return FindPluginsInContent(aCreatePluginList, aPluginsChanged); } @@ -2370,7 +2370,7 @@ mozilla::plugins::FindPluginsForContent(uint32_t aPluginEpoch, nsTArray* aPlugins, uint32_t* aNewPluginEpoch) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); nsRefPtr host = nsPluginHost::GetInst(); host->FindPluginsForContent(aPluginEpoch, aPlugins, aNewPluginEpoch); @@ -2382,7 +2382,7 @@ nsPluginHost::FindPluginsForContent(uint32_t aPluginEpoch, nsTArray* aPlugins, uint32_t* aNewPluginEpoch) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); // Load plugins so that the epoch is correct. LoadPlugins(); @@ -2422,7 +2422,7 @@ nsPluginHost::FindPluginsForContent(uint32_t aPluginEpoch, void nsPluginHost::UpdatePluginInfo(nsPluginTag* aPluginTag) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); ReadPluginInfo(); WritePluginInfo(); @@ -2508,7 +2508,7 @@ nsPluginHost::RegisterWithCategoryManager(nsCString &aMimeType, nsresult nsPluginHost::WritePluginInfo() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); nsresult rv = NS_OK; nsCOMPtr directoryService(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID,&rv)); @@ -2653,7 +2653,7 @@ nsPluginHost::WritePluginInfo() nsresult nsPluginHost::ReadPluginInfo() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); const long PLUGIN_REG_MIMETYPES_ARRAY_SIZE = 12; const long PLUGIN_REG_MAX_MIMETYPES = 1000; diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp index c16b80ff34..a88d617ce6 100644 --- a/dom/plugins/base/nsPluginInstanceOwner.cpp +++ b/dom/plugins/base/nsPluginInstanceOwner.cpp @@ -689,7 +689,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetNetscapeWindow(void *value) // we only attempt to get the nearest window if this really is a "windowless" plugin so as not // to change any behaviour for the much more common windowed plugins, // though why this method would even be being called for a windowed plugin escapes me. - if (XRE_GetProcessType() != GoannaProcessType_Content && + if (XRE_GetProcessType() != GeckoProcessType_Content && mPluginWindow && mPluginWindow->type == NPWindowTypeDrawable) { // it turns out that flash also uses this window for determining focus, and is currently // unable to show a caret correctly if we return the enclosing window. Therefore for @@ -2888,7 +2888,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::CreateWidget(void) parentWidget = nsContentUtils::WidgetForDocument(doc); #ifndef XP_MACOSX // If we're running in the content process, we need a remote widget created in chrome. - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { if (nsCOMPtr window = doc->GetWindow()) { if (nsCOMPtr topWindow = window->GetTop()) { dom::TabChild* tc = dom::TabChild::GetFrom(topWindow); @@ -3007,7 +3007,7 @@ void nsPluginInstanceOwner::FixUpPluginWindow(int32_t inPaintState) mPluginWindow->clipRect.bottom = mPluginWindow->clipRect.top; mPluginWindow->clipRect.right = mPluginWindow->clipRect.left; } - else if (XRE_GetProcessType() != GoannaProcessType_Default) + else if (XRE_GetProcessType() != GeckoProcessType_Default) { // For e10s we only support async windowless plugin. This means that // we're always going to allocate a full window for the plugin to draw @@ -3201,7 +3201,7 @@ nsPluginInstanceOwner::UpdateDocumentActiveState(bool aIsActive) // to be forwarded over after the active state is updated. If we // don't hide plugin widgets in hidden tabs, the native child window // in chrome will remain visible after a tab switch. - if (mWidget && XRE_GetProcessType() == GoannaProcessType_Content) { + if (mWidget && XRE_GetProcessType() == GeckoProcessType_Content) { mWidget->Show(aIsActive); mWidget->Enable(aIsActive); } diff --git a/dom/plugins/base/nsPluginNativeWindowGtk.cpp b/dom/plugins/base/nsPluginNativeWindowGtk.cpp index 7f7d9034da..24f2385a40 100644 --- a/dom/plugins/base/nsPluginNativeWindowGtk.cpp +++ b/dom/plugins/base/nsPluginNativeWindowGtk.cpp @@ -72,7 +72,7 @@ nsresult nsPluginNativeWindowGtk::CallSetWindow(nsRefPtr { if (aPluginInstance) { if (type == NPWindowTypeWindow && - XRE_GetProcessType() == GoannaProcessType_Content) { + XRE_GetProcessType() == GeckoProcessType_Content) { // In this case, most of the initialization code here has already happened // in the chrome process. The window we have in content is the XID of the // socket widget we need to hand to plugins. diff --git a/dom/plugins/base/nsPluginNativeWindowWin.cpp b/dom/plugins/base/nsPluginNativeWindowWin.cpp index 188d471a90..500650a4a8 100644 --- a/dom/plugins/base/nsPluginNativeWindowWin.cpp +++ b/dom/plugins/base/nsPluginNativeWindowWin.cpp @@ -617,7 +617,7 @@ nsresult nsPluginNativeWindowWin::CallSetWindow(nsRefPtr // With e10s we execute in the content process and as such we don't // have access to native widgets. CallSetWindow and skip native widget // subclassing. - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { nsPluginNativeWindow::CallSetWindow(aPluginInstance); return NS_OK; } diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp index b37b3f2809..0f6f303ea3 100644 --- a/dom/plugins/base/nsPluginStreamListenerPeer.cpp +++ b/dom/plugins/base/nsPluginStreamListenerPeer.cpp @@ -29,7 +29,7 @@ #include "nsContentUtils.h" #include "nsNetUtil.h" #include "nsPluginNativeWindow.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsPluginInstanceOwner.h" #include "nsDataHashtable.h" diff --git a/dom/plugins/base/nsPluginsDirDarwin.cpp b/dom/plugins/base/nsPluginsDirDarwin.cpp index c0cf18502e..3cad48ea86 100644 --- a/dom/plugins/base/nsPluginsDirDarwin.cpp +++ b/dom/plugins/base/nsPluginsDirDarwin.cpp @@ -11,7 +11,7 @@ by Patrick C. Beard. */ -#include "GoannaChildProcessHost.h" +#include "GeckoChildProcessHost.h" #include "base/process_util.h" #include "prlink.h" @@ -383,14 +383,14 @@ static bool IsCompatibleArch(nsIFile *file) } uint32_t pluginLibArchitectures; - nsresult rv = mozilla::ipc::GoannaChildProcessHost::GetArchitecturesForBinary(executablePath, &pluginLibArchitectures); + nsresult rv = mozilla::ipc::GeckoChildProcessHost::GetArchitecturesForBinary(executablePath, &pluginLibArchitectures); if (NS_FAILED(rv)) { return false; } uint32_t supportedArchitectures = #ifdef __LP64__ - mozilla::ipc::GoannaChildProcessHost::GetSupportedArchitecturesForProcessType(GoannaProcessType_Plugin); + mozilla::ipc::GeckoChildProcessHost::GetSupportedArchitecturesForProcessType(GeckoProcessType_Plugin); #else base::GetCurrentProcessArchitecture(); #endif diff --git a/dom/plugins/ipc/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp index 3c6903d5a6..4508d68989 100644 --- a/dom/plugins/ipc/PluginInstanceParent.cpp +++ b/dom/plugins/ipc/PluginInstanceParent.cpp @@ -1819,7 +1819,7 @@ PluginInstanceParent::SubclassPluginWindow(HWND aWnd) return; } - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { if (!aWnd) { NS_WARNING("PluginInstanceParent::SubclassPluginWindow unexpected null window"); return; @@ -1849,7 +1849,7 @@ PluginInstanceParent::SubclassPluginWindow(HWND aWnd) void PluginInstanceParent::UnsubclassPluginWindow() { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { if (mPluginHWND) { // Remove 'this' from the plugin list safely nsAutoPtr tmp; diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp index 549ceb9d3b..cd1dc575d6 100644 --- a/dom/plugins/ipc/PluginModuleChild.cpp +++ b/dom/plugins/ipc/PluginModuleChild.cpp @@ -50,7 +50,7 @@ #include "PluginUtilsOSX.h" #endif -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" using namespace mozilla; using namespace mozilla::plugins; diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp index 3b556710c1..8d6fa3443b 100755 --- a/dom/plugins/ipc/PluginModuleParent.cpp +++ b/dom/plugins/ipc/PluginModuleParent.cpp @@ -31,7 +31,7 @@ #include "nsNPAPIPlugin.h" #include "nsPrintfCString.h" #include "prsystem.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsPluginTags.h" #include "nsUnicharUtils.h" @@ -255,7 +255,7 @@ bool PluginModuleMapping::sIsLoadModuleOnStack = false; void mozilla::plugins::TerminatePlugin(uint32_t aPluginId) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); nsRefPtr host = nsPluginHost::GetInst(); nsPluginTag* pluginTag = host->PluginWithId(aPluginId); @@ -274,7 +274,7 @@ PluginModuleContentParent::LoadModule(uint32_t aPluginId) PluginModuleMapping::NotifyLoadingModule loadingModule; nsAutoPtr mapping(new PluginModuleMapping(aPluginId)); - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Content); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content); /* * We send a LoadPlugin message to the chrome process using an intr diff --git a/dom/plugins/ipc/PluginProcessChild.cpp b/dom/plugins/ipc/PluginProcessChild.cpp index 0774b427d1..98ea1b48f0 100644 --- a/dom/plugins/ipc/PluginProcessChild.cpp +++ b/dom/plugins/ipc/PluginProcessChild.cpp @@ -58,7 +58,7 @@ PluginProcessChild::Init() #if defined(XP_MACOSX) // Remove the trigger for "dyld interposing" that we added in - // GoannaChildProcessHost::PerformAsyncLaunchInternal(), in the host + // GeckoChildProcessHost::PerformAsyncLaunchInternal(), in the host // process just before we were launched. Dyld interposing will still // happen in our process (the plugin child process). But we don't want // it to happen in any processes that the plugin might launch from our diff --git a/dom/plugins/ipc/PluginProcessParent.cpp b/dom/plugins/ipc/PluginProcessParent.cpp index b111130b8e..39e09bb12a 100644 --- a/dom/plugins/ipc/PluginProcessParent.cpp +++ b/dom/plugins/ipc/PluginProcessParent.cpp @@ -22,7 +22,7 @@ using std::vector; using std::string; using mozilla::ipc::BrowserProcessSubThread; -using mozilla::ipc::GoannaChildProcessHost; +using mozilla::ipc::GeckoChildProcessHost; using mozilla::plugins::LaunchCompleteTask; using mozilla::plugins::PluginProcessParent; using base::ProcessArchitecture; @@ -35,7 +35,7 @@ struct RunnableMethodTraits }; PluginProcessParent::PluginProcessParent(const std::string& aPluginFilePath) : - GoannaChildProcessHost(GoannaProcessType_Plugin), + GeckoChildProcessHost(GeckoProcessType_Plugin), mPluginFilePath(aPluginFilePath), mTaskFactory(this), mMainMsgLoop(MessageLoop::current()), @@ -116,7 +116,7 @@ PluginProcessParent::Launch(mozilla::UniquePtr aLaunchComple #endif ProcessArchitecture currentArchitecture = base::GetCurrentProcessArchitecture(); - uint32_t containerArchitectures = GetSupportedArchitecturesForProcessType(GoannaProcessType_Plugin); + uint32_t containerArchitectures = GetSupportedArchitecturesForProcessType(GeckoProcessType_Plugin); uint32_t pluginLibArchitectures = currentArchitecture; #ifdef XP_MACOSX @@ -200,7 +200,7 @@ PluginProcessParent::RunLaunchCompleteTask() bool PluginProcessParent::WaitUntilConnected(int32_t aTimeoutMs) { - bool result = GoannaChildProcessHost::WaitUntilConnected(aTimeoutMs); + bool result = GeckoChildProcessHost::WaitUntilConnected(aTimeoutMs); if (mRunCompleteTaskImmediately && mLaunchCompleteTask) { if (result) { mLaunchCompleteTask->SetLaunchSucceeded(); @@ -213,7 +213,7 @@ PluginProcessParent::WaitUntilConnected(int32_t aTimeoutMs) void PluginProcessParent::OnChannelConnected(int32_t peer_pid) { - GoannaChildProcessHost::OnChannelConnected(peer_pid); + GeckoChildProcessHost::OnChannelConnected(peer_pid); if (mLaunchCompleteTask && !mRunCompleteTaskImmediately) { mLaunchCompleteTask->SetLaunchSucceeded(); mMainMsgLoop->PostTask(FROM_HERE, mTaskFactory.NewRunnableMethod( @@ -224,7 +224,7 @@ PluginProcessParent::OnChannelConnected(int32_t peer_pid) void PluginProcessParent::OnChannelError() { - GoannaChildProcessHost::OnChannelError(); + GeckoChildProcessHost::OnChannelError(); if (mLaunchCompleteTask && !mRunCompleteTaskImmediately) { mMainMsgLoop->PostTask(FROM_HERE, mTaskFactory.NewRunnableMethod( &PluginProcessParent::RunLaunchCompleteTask)); diff --git a/dom/plugins/ipc/PluginProcessParent.h b/dom/plugins/ipc/PluginProcessParent.h index 4b20331228..9d5c4e72cd 100644 --- a/dom/plugins/ipc/PluginProcessParent.h +++ b/dom/plugins/ipc/PluginProcessParent.h @@ -16,7 +16,7 @@ #include "base/waitable_event.h" #include "chrome/common/child_process_host.h" -#include "mozilla/ipc/GoannaChildProcessHost.h" +#include "mozilla/ipc/GeckoChildProcessHost.h" #include "mozilla/plugins/ScopedMethodFactory.h" #include "mozilla/UniquePtr.h" #include "nsCOMPtr.h" @@ -39,7 +39,7 @@ protected: bool mLaunchSucceeded; }; -class PluginProcessParent : public mozilla::ipc::GoannaChildProcessHost +class PluginProcessParent : public mozilla::ipc::GeckoChildProcessHost { public: explicit PluginProcessParent(const std::string& aPluginFilePath); @@ -66,8 +66,8 @@ public: const std::string& GetPluginFilePath() { return mPluginFilePath; } - using mozilla::ipc::GoannaChildProcessHost::GetShutDownEvent; - using mozilla::ipc::GoannaChildProcessHost::GetChannel; + using mozilla::ipc::GeckoChildProcessHost::GetShutDownEvent; + using mozilla::ipc::GeckoChildProcessHost::GetChannel; void SetCallRunnableImmediately(bool aCallImmediately); virtual bool WaitUntilConnected(int32_t aTimeoutMs = 0) override; diff --git a/dom/plugins/ipc/PluginScriptableObjectUtils-inl.h b/dom/plugins/ipc/PluginScriptableObjectUtils-inl.h index 631871f022..fef663f4c0 100644 --- a/dom/plugins/ipc/PluginScriptableObjectUtils-inl.h +++ b/dom/plugins/ipc/PluginScriptableObjectUtils-inl.h @@ -94,7 +94,7 @@ mozilla::plugins::ConvertToVariant(const Variant& aRemoteVariant, case Variant::TPPluginScriptableObjectChild: { NS_ASSERTION(!aInstance, "No instance should be given!"); - NS_ASSERTION(XRE_GetProcessType() == GoannaProcessType_Plugin, + NS_ASSERTION(XRE_GetProcessType() == GeckoProcessType_Plugin, "Should be running on child only!"); NPObject* object = NPObjectFromVariant(aRemoteVariant); diff --git a/dom/plugins/ipc/PluginScriptableObjectUtils.h b/dom/plugins/ipc/PluginScriptableObjectUtils.h index cbbac47788..432c53b777 100644 --- a/dom/plugins/ipc/PluginScriptableObjectUtils.h +++ b/dom/plugins/ipc/PluginScriptableObjectUtils.h @@ -112,7 +112,7 @@ ReleaseRemoteVariant(Variant& aVariant) } case Variant::TPPluginScriptableObjectChild: { - NS_ASSERTION(XRE_GetProcessType() == GoannaProcessType_Plugin, + NS_ASSERTION(XRE_GetProcessType() == GeckoProcessType_Plugin, "Should only be running in the child!"); PluginScriptableObjectChild* actor = const_cast( diff --git a/dom/plugins/ipc/interpose/plugin_child_interpose.mm b/dom/plugins/ipc/interpose/plugin_child_interpose.mm index 09658dbcd9..58c39b0a1c 100644 --- a/dom/plugins/ipc/interpose/plugin_child_interpose.mm +++ b/dom/plugins/ipc/interpose/plugin_child_interpose.mm @@ -20,7 +20,7 @@ // This file lives in a seperate module (libplugin_child_interpose.dylib), // which will get loaded by the OS before any other modules when the plugin -// child process is launched (from GoannaChildProcessHost:: +// child process is launched (from GeckoChildProcessHost:: // PerformAsyncLaunchInternal()). For this reason it shouldn't link in other // browser modules when loaded. Instead it should use dlsym() to load // pointers to the methods it wants to call in other modules. diff --git a/dom/quota/QuotaManager.cpp b/dom/quota/QuotaManager.cpp index 24e16f0726..1183cf443d 100644 --- a/dom/quota/QuotaManager.cpp +++ b/dom/quota/QuotaManager.cpp @@ -25,7 +25,7 @@ #include "nsPIDOMWindow.h" #include -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/Atomics.h" #include "mozilla/CondVar.h" #include "mozilla/dom/asmjscache/AsmJSCache.h" @@ -772,7 +772,7 @@ struct MOZ_STACK_CLASS InactiveOriginsInfo bool IsMainProcess() { - return XRE_GetProcessType() == GoannaProcessType_Default; + return XRE_GetProcessType() == GeckoProcessType_Default; } void diff --git a/dom/speakermanager/SpeakerManagerService.cpp b/dom/speakermanager/SpeakerManagerService.cpp index 95da6f398f..5eabd704f5 100644 --- a/dom/speakermanager/SpeakerManagerService.cpp +++ b/dom/speakermanager/SpeakerManagerService.cpp @@ -30,7 +30,7 @@ SpeakerManagerService::GetOrCreateSpeakerManagerService() { MOZ_ASSERT(NS_IsMainThread()); - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return SpeakerManagerServiceChild::GetOrCreateSpeakerManagerService(); } @@ -52,7 +52,7 @@ SpeakerManagerService::GetSpeakerManagerService() { MOZ_ASSERT(NS_IsMainThread()); - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return SpeakerManagerServiceChild::GetSpeakerManagerService(); } @@ -62,7 +62,7 @@ SpeakerManagerService::GetSpeakerManagerService() void SpeakerManagerService::Shutdown() { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return SpeakerManagerServiceChild::Shutdown(); } @@ -182,7 +182,7 @@ SpeakerManagerService::SpeakerManagerService() mVisible(false) { MOZ_COUNT_CTOR(SpeakerManagerService); - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsCOMPtr obs = mozilla::services::GetObserverService(); if (obs) { obs->AddObserver(this, "ipc:content-shutdown", false); diff --git a/dom/storage/DOMStorageCache.cpp b/dom/storage/DOMStorageCache.cpp index 67d92d7bc1..d4f549970d 100644 --- a/dom/storage/DOMStorageCache.cpp +++ b/dom/storage/DOMStorageCache.cpp @@ -760,7 +760,7 @@ DOMStorageCache::StartDatabase() return sDatabase; } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsAutoPtr db(new DOMStorageDBThread()); nsresult rv = db->Init(); @@ -802,7 +802,7 @@ DOMStorageCache::StopDatabase() sDatabaseDown = true; nsresult rv = sDatabase->Shutdown(); - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { delete sDatabase; } else { DOMStorageDBChild* child = static_cast(sDatabase); diff --git a/dom/storage/DOMStorageManager.cpp b/dom/storage/DOMStorageManager.cpp index df5bc75ed6..319c0f4e05 100644 --- a/dom/storage/DOMStorageManager.cpp +++ b/dom/storage/DOMStorageManager.cpp @@ -611,7 +611,7 @@ DOMStorageManager::Observe(const char* aTopic, const nsACString& aScopePrefix) } if (!strcmp(aTopic, "test-flushed")) { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { nsCOMPtr obs = mozilla::services::GetObserverService(); if (obs) { obs->NotifyObservers(nullptr, "domstorage-test-flushed", nullptr); @@ -634,7 +634,7 @@ DOMLocalStorageManager::DOMLocalStorageManager() NS_ASSERTION(!sSelf, "Somebody is trying to do_CreateInstance(\"@mozilla/dom/localStorage-manager;1\""); sSelf = this; - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { // Do this only on the child process. The thread IPC bridge // is also used to communicate chrome observer notifications. // Note: must be called after we set sSelf @@ -652,7 +652,7 @@ DOMLocalStorageManager::~DOMLocalStorageManager() DOMSessionStorageManager::DOMSessionStorageManager() : DOMStorageManager(SessionStorage) { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { // Do this only on the child process. The thread IPC bridge // is also used to communicate chrome observer notifications. DOMStorageCache::StartDatabase(); diff --git a/dom/storage/DOMStorageObserver.cpp b/dom/storage/DOMStorageObserver.cpp index 5f73b48383..dc7e151718 100644 --- a/dom/storage/DOMStorageObserver.cpp +++ b/dom/storage/DOMStorageObserver.cpp @@ -74,7 +74,7 @@ DOMStorageObserver::Init() #ifdef DOM_STORAGE_TESTS // Testing obs->AddObserver(sSelf, "domstorage-test-flush-force", true); - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // Only to forward to child process. obs->AddObserver(sSelf, "domstorage-test-flushed", true); } diff --git a/dom/system/gonk/AudioManager.cpp b/dom/system/gonk/AudioManager.cpp index 68c0a066cc..eda7cf2088 100644 --- a/dom/system/gonk/AudioManager.cpp +++ b/dom/system/gonk/AudioManager.cpp @@ -546,7 +546,7 @@ already_AddRefed AudioManager::GetInstance() { // Avoid createing AudioManager from content process. - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { MOZ_CRASH("Non-chrome processes should not get here."); } diff --git a/dom/system/gonk/AutoMounter.cpp b/dom/system/gonk/AutoMounter.cpp index a1e1031e16..871b00b3b5 100644 --- a/dom/system/gonk/AutoMounter.cpp +++ b/dom/system/gonk/AutoMounter.cpp @@ -1159,7 +1159,7 @@ ShutdownAutoMounterIOThread() static void SetAutoMounterModeIOThread(const int32_t& aMode) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); MOZ_ASSERT(sAutoMounter); @@ -1169,7 +1169,7 @@ SetAutoMounterModeIOThread(const int32_t& aMode) static void SetAutoMounterSharingModeIOThread(const nsCString& aVolumeName, const bool& aAllowSharing) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); MOZ_ASSERT(sAutoMounter); @@ -1179,7 +1179,7 @@ SetAutoMounterSharingModeIOThread(const nsCString& aVolumeName, const bool& aAll static void AutoMounterFormatVolumeIOThread(const nsCString& aVolumeName) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); MOZ_ASSERT(sAutoMounter); @@ -1189,7 +1189,7 @@ AutoMounterFormatVolumeIOThread(const nsCString& aVolumeName) static void AutoMounterMountVolumeIOThread(const nsCString& aVolumeName) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); MOZ_ASSERT(sAutoMounter); @@ -1199,7 +1199,7 @@ AutoMounterMountVolumeIOThread(const nsCString& aVolumeName) static void AutoMounterUnmountVolumeIOThread(const nsCString& aVolumeName) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); MOZ_ASSERT(sAutoMounter); diff --git a/dom/system/gonk/NetworkWorker.cpp b/dom/system/gonk/NetworkWorker.cpp index 7845f083cf..ed67d3182c 100644 --- a/dom/system/gonk/NetworkWorker.cpp +++ b/dom/system/gonk/NetworkWorker.cpp @@ -134,7 +134,7 @@ NetworkWorker::~NetworkWorker() already_AddRefed NetworkWorker::FactoryCreate() { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return nullptr; } diff --git a/dom/system/gonk/SystemWorkerManager.cpp b/dom/system/gonk/SystemWorkerManager.cpp index 933fa6d868..edf8fb6dad 100644 --- a/dom/system/gonk/SystemWorkerManager.cpp +++ b/dom/system/gonk/SystemWorkerManager.cpp @@ -72,7 +72,7 @@ SystemWorkerManager::~SystemWorkerManager() nsresult SystemWorkerManager::Init() { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return NS_ERROR_NOT_AVAILABLE; } diff --git a/dom/system/gonk/Volume.cpp b/dom/system/gonk/Volume.cpp index 8490e64d93..fce564d403 100644 --- a/dom/system/gonk/Volume.cpp +++ b/dom/system/gonk/Volume.cpp @@ -233,7 +233,7 @@ Volume::SetConfig(const nsCString& aConfigName, const nsCString& aConfigValue) void Volume::SetMediaPresent(bool aMediaPresent) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); // mMediaPresent is slightly redunant to the state, however @@ -308,7 +308,7 @@ Volume::SetUnmountRequested(bool aUnmountRequested) void Volume::SetState(Volume::STATE aNewState) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); if (aNewState == mState) { return; @@ -380,7 +380,7 @@ Volume::SetState(Volume::STATE aNewState) void Volume::SetMountPoint(const nsCSubstring& aMountPoint) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); if (mMountPoint.Equals(aMountPoint)) { @@ -393,7 +393,7 @@ Volume::SetMountPoint(const nsCSubstring& aMountPoint) void Volume::StartMount(VolumeResponseCallback* aCallback) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); StartCommand(new VolumeActionCommand(this, "mount", "", aCallback)); @@ -402,7 +402,7 @@ Volume::StartMount(VolumeResponseCallback* aCallback) void Volume::StartUnmount(VolumeResponseCallback* aCallback) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); StartCommand(new VolumeActionCommand(this, "unmount", "force", aCallback)); @@ -411,7 +411,7 @@ Volume::StartUnmount(VolumeResponseCallback* aCallback) void Volume::StartFormat(VolumeResponseCallback* aCallback) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); StartCommand(new VolumeActionCommand(this, "format", "", aCallback)); @@ -420,7 +420,7 @@ Volume::StartFormat(VolumeResponseCallback* aCallback) void Volume::StartShare(VolumeResponseCallback* aCallback) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); StartCommand(new VolumeActionCommand(this, "share", "ums", aCallback)); @@ -429,7 +429,7 @@ Volume::StartShare(VolumeResponseCallback* aCallback) void Volume::StartUnshare(VolumeResponseCallback* aCallback) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); StartCommand(new VolumeActionCommand(this, "unshare", "ums", aCallback)); @@ -438,7 +438,7 @@ Volume::StartUnshare(VolumeResponseCallback* aCallback) void Volume::StartCommand(VolumeCommand* aCommand) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); VolumeManager::PostCommand(aCommand); @@ -448,7 +448,7 @@ Volume::StartCommand(VolumeCommand* aCommand) void Volume::RegisterVolumeObserver(Volume::EventObserver* aObserver, const char* aName) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); sEventObserverList.AddObserver(aObserver); @@ -468,7 +468,7 @@ Volume::RegisterVolumeObserver(Volume::EventObserver* aObserver, const char* aNa void Volume::UnregisterVolumeObserver(Volume::EventObserver* aObserver, const char* aName) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); sEventObserverList.RemoveObserver(aObserver); @@ -483,7 +483,7 @@ Volume::UpdateMountLock(const nsACString& aVolumeName, const int32_t& aMountGeneration, const bool& aMountLocked) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); RefPtr vol = VolumeManager::FindVolumeByName(aVolumeName); @@ -500,7 +500,7 @@ Volume::UpdateMountLock(const nsACString& aVolumeName, void Volume::HandleVoldResponse(int aResponseCode, nsCWhitespaceTokenizer& aTokenizer) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); // The volume name will have already been parsed, and the tokenizer will point diff --git a/dom/system/gonk/nsVolume.cpp b/dom/system/gonk/nsVolume.cpp index 24bcd25a41..45f97a08ee 100644 --- a/dom/system/gonk/nsVolume.cpp +++ b/dom/system/gonk/nsVolume.cpp @@ -229,7 +229,7 @@ NS_IMETHODIMP nsVolume::GetIsHotSwappable(bool *aIsHotSwappable) NS_IMETHODIMP nsVolume::Format() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); XRE_GetIOMessageLoop()->PostTask( FROM_HERE, @@ -241,7 +241,7 @@ NS_IMETHODIMP nsVolume::Format() /* static */ void nsVolume::FormatVolumeIOThread(const nsCString& aVolume) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); if (VolumeManager::State() != VolumeManager::VOLUMES_READY) { @@ -253,7 +253,7 @@ void nsVolume::FormatVolumeIOThread(const nsCString& aVolume) NS_IMETHODIMP nsVolume::Mount() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); XRE_GetIOMessageLoop()->PostTask( FROM_HERE, @@ -265,7 +265,7 @@ NS_IMETHODIMP nsVolume::Mount() /* static */ void nsVolume::MountVolumeIOThread(const nsCString& aVolume) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); if (VolumeManager::State() != VolumeManager::VOLUMES_READY) { @@ -277,7 +277,7 @@ void nsVolume::MountVolumeIOThread(const nsCString& aVolume) NS_IMETHODIMP nsVolume::Unmount() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); XRE_GetIOMessageLoop()->PostTask( FROM_HERE, @@ -289,7 +289,7 @@ NS_IMETHODIMP nsVolume::Unmount() /* static */ void nsVolume::UnmountVolumeIOThread(const nsCString& aVolume) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); if (VolumeManager::State() != VolumeManager::VOLUMES_READY) { @@ -347,7 +347,7 @@ void nsVolume::Set(nsIVolume* aVolume) mMountGeneration = volMountGeneration; - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { // Child processes just track the state, not maintain it. aVolume->GetIsMountLocked(&mMountLocked); return; @@ -369,7 +369,7 @@ void nsVolume::Set(nsIVolume* aVolume) void nsVolume::UpdateMountLock(const nsAString& aMountLockState) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); // There are 3 states, unlocked, locked-background, and locked-foreground @@ -380,7 +380,7 @@ nsVolume::UpdateMountLock(const nsAString& aMountLockState) void nsVolume::UpdateMountLock(bool aMountLocked) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); if (aMountLocked == mMountLocked) { @@ -430,7 +430,7 @@ nsVolume::SetState(int32_t aState) { static int32_t sMountGeneration = 0; - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(IsFake()); diff --git a/dom/system/gonk/nsVolumeService.cpp b/dom/system/gonk/nsVolumeService.cpp index 61f5d61306..a4858d6743 100644 --- a/dom/system/gonk/nsVolumeService.cpp +++ b/dom/system/gonk/nsVolumeService.cpp @@ -68,7 +68,7 @@ nsVolumeService::Shutdown() if (!sSingleton) { return; } - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { sSingleton = nullptr; return; } @@ -92,7 +92,7 @@ nsVolumeService::nsVolumeService() { sSingleton = this; - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { // VolumeServiceIOThread and the WakeLock listener should only run in the // parent, so we return early. return; @@ -246,7 +246,7 @@ nsVolumeService::GetVolumeNames(nsIArray** aVolNames) void nsVolumeService::GetVolumesForIPC(nsTArray* aResult) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); MonitorAutoLock autoLock(mArrayMonitor); @@ -274,7 +274,7 @@ nsVolumeService::GetVolumesForIPC(nsTArray* aResult) void nsVolumeService::RecvVolumesFromParent(const nsTArray& aVolumes) { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // We are the parent. Therefore our volumes are already correct. return; } @@ -314,7 +314,7 @@ void nsVolumeService::CheckMountLock(const nsAString& aMountLockName, const nsAString& aMountLockState) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(NS_IsMainThread()); nsRefPtr vol = FindVolumeByMountLockName(aMountLockName); @@ -412,7 +412,7 @@ nsVolumeService::UpdateVolume(nsIVolume* aVolume, bool aNotifyObservers) NS_IMETHODIMP nsVolumeService::CreateFakeVolume(const nsAString& name, const nsAString& path) { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsRefPtr vol = new nsVolume(name, path, nsIVolume::STATE_INIT, -1 /* mountGeneration */, true /* isMediaPresent */, @@ -434,7 +434,7 @@ nsVolumeService::CreateFakeVolume(const nsAString& name, const nsAString& path) NS_IMETHODIMP nsVolumeService::SetFakeVolumeState(const nsAString& name, int32_t state) { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsRefPtr vol; { MonitorAutoLock autoLock(mArrayMonitor); diff --git a/dom/telephony/Telephony.cpp b/dom/telephony/Telephony.cpp index 6bc68646c0..fa31778198 100644 --- a/dom/telephony/Telephony.cpp +++ b/dom/telephony/Telephony.cpp @@ -739,7 +739,7 @@ NS_CreateTelephonyService() { nsCOMPtr service; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { service = new mozilla::dom::telephony::TelephonyIPCService(); } else { #if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL) diff --git a/dom/voicemail/Voicemail.cpp b/dom/voicemail/Voicemail.cpp index fbf5550ca8..41097f1e0a 100644 --- a/dom/voicemail/Voicemail.cpp +++ b/dom/voicemail/Voicemail.cpp @@ -250,7 +250,7 @@ NS_CreateVoicemailService() { nsCOMPtr service; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { service = new mozilla::dom::voicemail::VoicemailIPCService(); } else { #if defined(MOZ_B2G_RIL) diff --git a/dom/wifi/WifiCertService.cpp b/dom/wifi/WifiCertService.cpp index 79565e26c8..3f3087227a 100644 --- a/dom/wifi/WifiCertService.cpp +++ b/dom/wifi/WifiCertService.cpp @@ -273,7 +273,7 @@ WifiCertService::~WifiCertService() already_AddRefed WifiCertService::FactoryCreate() { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return nullptr; } diff --git a/dom/wifi/WifiProxyService.cpp b/dom/wifi/WifiProxyService.cpp index d08520da4b..8bb34273e1 100644 --- a/dom/wifi/WifiProxyService.cpp +++ b/dom/wifi/WifiProxyService.cpp @@ -151,7 +151,7 @@ WifiProxyService::~WifiProxyService() already_AddRefed WifiProxyService::FactoryCreate() { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return nullptr; } diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index b3322e3da0..dc0033e8ab 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -23,7 +23,7 @@ #include #include "BackgroundChild.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "jsfriendapi.h" #include "mozilla/ArrayUtils.h" #include "mozilla/CycleCollectedJSRuntime.h" diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp index da4eaf716f..fb6804b627 100644 --- a/dom/workers/ServiceWorkerManager.cpp +++ b/dom/workers/ServiceWorkerManager.cpp @@ -219,7 +219,7 @@ ServiceWorkerManager::ServiceWorkerManager() // Register this component to PBackground. MOZ_ALWAYS_TRUE(BackgroundChild::GetOrCreateForCurrentThread(this)); - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsRefPtr swr = ServiceWorkerRegistrar::Get(); MOZ_ASSERT(swr); diff --git a/dom/workers/ServiceWorkerRegistrar.cpp b/dom/workers/ServiceWorkerRegistrar.cpp index da14ccb7c3..41778f03eb 100644 --- a/dom/workers/ServiceWorkerRegistrar.cpp +++ b/dom/workers/ServiceWorkerRegistrar.cpp @@ -46,7 +46,7 @@ ServiceWorkerRegistrar::Initialize() { MOZ_ASSERT(!gServiceWorkerRegistrar); - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return; } @@ -68,7 +68,7 @@ ServiceWorkerRegistrar::Initialize() /* static */ already_AddRefed ServiceWorkerRegistrar::Get() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); MOZ_ASSERT(gServiceWorkerRegistrar); nsRefPtr service = gServiceWorkerRegistrar.get(); diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp index 6cafc3864c..56c53c2baa 100644 --- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp @@ -2604,7 +2604,7 @@ private: mAlreadyMappedToAddon = true; - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { // Only try to access the service from the main process. return; } diff --git a/embedding/browser/nsWebBrowser.cpp b/embedding/browser/nsWebBrowser.cpp index dd328c9775..95d9e518d7 100644 --- a/embedding/browser/nsWebBrowser.cpp +++ b/embedding/browser/nsWebBrowser.cpp @@ -1174,7 +1174,7 @@ NS_IMETHODIMP nsWebBrowser::Create() } mDocShellAsNav->SetSessionHistory(mInitInfo->sessionHistory); - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // Hook up global history. Do not fail if we can't - just warn. rv = EnableGlobalHistory(mShouldEnableHistory); NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "EnableGlobalHistory() failed"); diff --git a/embedding/components/windowwatcher/nsWindowWatcher.cpp b/embedding/components/windowwatcher/nsWindowWatcher.cpp index 65b200d22c..b90bfa2533 100644 --- a/embedding/components/windowwatcher/nsWindowWatcher.cpp +++ b/embedding/components/windowwatcher/nsWindowWatcher.cpp @@ -463,7 +463,7 @@ nsWindowWatcher::OpenWindowInternal(nsIDOMWindow *aParent, aParent = parent->GetOuterWindow(); } - MOZ_ASSERT_IF(openedFromRemoteTab, XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT_IF(openedFromRemoteTab, XRE_GetProcessType() == GeckoProcessType_Default); NS_ENSURE_ARG_POINTER(_retval); *_retval = 0; diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index 78738a0280..83f9fffcd7 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -46,7 +46,7 @@ using mozilla::unused; // ha! static bool IsChildProcess() { - return XRE_GetProcessType() == GoannaProcessType_Content; + return XRE_GetProcessType() == GeckoProcessType_Content; } /** diff --git a/extensions/spellcheck/src/mozSpellChecker.cpp b/extensions/spellcheck/src/mozSpellChecker.cpp index 61af2b1ea9..1da9118947 100644 --- a/extensions/spellcheck/src/mozSpellChecker.cpp +++ b/extensions/spellcheck/src/mozSpellChecker.cpp @@ -49,7 +49,7 @@ mozSpellChecker::~mozSpellChecker() mPersonalDictionary = nullptr; if (mEngine) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Content); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content); mEngine->Send__delete__(mEngine); MOZ_ASSERT(!mEngine); } @@ -59,7 +59,7 @@ nsresult mozSpellChecker::Init() { mSpellCheckingEngine = nullptr; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { mozilla::dom::ContentChild* contentChild = mozilla::dom::ContentChild::GetSingleton(); MOZ_ASSERT(contentChild); mEngine = new RemoteSpellcheckEngineChild(this); @@ -130,7 +130,7 @@ mozSpellChecker::CheckWord(const nsAString &aWord, bool *aIsMisspelled, nsTArray nsresult result; bool correct; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { nsString wordwrapped = nsString(aWord); bool rv; if (aSuggestions) { @@ -309,7 +309,7 @@ mozSpellChecker::GetPersonalDictionary(nsTArray *aWordList) NS_IMETHODIMP mozSpellChecker::GetDictionaryList(nsTArray *aDictionaryList) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild *child = ContentChild::GetSingleton(); child->GetAvailableDictionaries(*aDictionaryList); return NS_OK; @@ -357,7 +357,7 @@ mozSpellChecker::GetDictionaryList(nsTArray *aDictionaryList) NS_IMETHODIMP mozSpellChecker::GetCurrentDictionary(nsAString &aDictionary) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { aDictionary = mCurrentDictionary; return NS_OK; } @@ -376,7 +376,7 @@ mozSpellChecker::GetCurrentDictionary(nsAString &aDictionary) NS_IMETHODIMP mozSpellChecker::SetCurrentDictionary(const nsAString &aDictionary) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { nsString wrappedDict = nsString(aDictionary); bool isSuccess; mEngine->SendSetDictionary(wrappedDict, &isSuccess); @@ -536,7 +536,7 @@ mozSpellChecker::GetCurrentBlockIndex(nsITextServicesDocument *aDoc, int32_t *ou nsresult mozSpellChecker::GetEngineList(nsCOMArray* aSpellCheckingEngines) { - MOZ_ASSERT(XRE_GetProcessType() != GoannaProcessType_Content); + MOZ_ASSERT(XRE_GetProcessType() != GeckoProcessType_Content); nsresult rv; bool hasMoreEngines; diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h index 53c0456173..31b9e64a89 100644 --- a/gfx/gl/GLContext.h +++ b/gfx/gl/GLContext.h @@ -49,7 +49,7 @@ #include "base/platform_thread.h" // for PlatformThreadId #include "mozilla/GenericRefCounted.h" #include "gfx2DGlue.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" class nsIntRegion; class nsIRunnable; diff --git a/gfx/gl/GLContextProviderCGL.mm b/gfx/gl/GLContextProviderCGL.mm index de63977a74..a5c3a9baf3 100644 --- a/gfx/gl/GLContextProviderCGL.mm +++ b/gfx/gl/GLContextProviderCGL.mm @@ -13,7 +13,7 @@ #include "gfxFailure.h" #include "prenv.h" #include "mozilla/Preferences.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/gfx/MacIOSurface.h" namespace mozilla { diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h index 1390e2a7a9..4e055344c8 100644 --- a/gfx/gl/GLLibraryEGL.h +++ b/gfx/gl/GLLibraryEGL.h @@ -12,7 +12,7 @@ #include "GLLibraryLoader.h" #include "mozilla/ThreadLocal.h" #include "nsIFile.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include #include diff --git a/gfx/gl/GLScreenBuffer.cpp b/gfx/gl/GLScreenBuffer.cpp index 57be2c3f58..eb51c3be08 100755 --- a/gfx/gl/GLScreenBuffer.cpp +++ b/gfx/gl/GLScreenBuffer.cpp @@ -46,7 +46,7 @@ GLScreenBuffer::Create(GLContext* gl, layers::ISurfaceAllocator* allocator = caps.surfaceAllocator; if (!factory && allocator && - XRE_GetProcessType() != GoannaProcessType_Default) + XRE_GetProcessType() != GeckoProcessType_Default) { layers::TextureFlags flags = layers::TextureFlags::DEALLOCATE_CLIENT | layers::TextureFlags::ORIGIN_BOTTOM_LEFT; diff --git a/gfx/ipc/GfxMessageUtils.h b/gfx/ipc/GfxMessageUtils.h index 0b67490773..2ff02e1834 100644 --- a/gfx/ipc/GfxMessageUtils.h +++ b/gfx/ipc/GfxMessageUtils.h @@ -25,7 +25,7 @@ #include "mozilla/layers/CompositorTypes.h" #include "FrameMetrics.h" #include "FilterSupport.h" -#include "mozilla/layers/GoannaContentController.h" +#include "mozilla/layers/GeckoContentController.h" #ifdef _MSC_VER #pragma warning( disable : 4800 ) @@ -1116,7 +1116,7 @@ struct ParamTraits } }; -typedef mozilla::layers::GoannaContentController::APZStateChange APZStateChange; +typedef mozilla::layers::GeckoContentController::APZStateChange APZStateChange; template <> struct ParamTraits diff --git a/gfx/layers/CompositorTypes.h b/gfx/layers/CompositorTypes.h index b76492b5a9..10f5a9fbbc 100644 --- a/gfx/layers/CompositorTypes.h +++ b/gfx/layers/CompositorTypes.h @@ -9,7 +9,7 @@ #include // for uint32_t #include // for int32_t #include "LayersTypes.h" // for LayersBackend, etc -#include "nsXULAppAPI.h" // for GoannaProcessType, etc +#include "nsXULAppAPI.h" // for GeckoProcessType, etc #include "mozilla/gfx/Types.h" #include "mozilla/EnumSet.h" @@ -156,7 +156,7 @@ typedef uintptr_t SyncHandle; struct TextureFactoryIdentifier { LayersBackend mParentBackend; - GoannaProcessType mParentProcessId; + GeckoProcessType mParentProcessId; EnumSet mSupportedBlendModes; int32_t mMaxTextureSize; bool mSupportsTextureBlitting; @@ -164,7 +164,7 @@ struct TextureFactoryIdentifier SyncHandle mSyncHandle; explicit TextureFactoryIdentifier(LayersBackend aLayersBackend = LayersBackend::LAYERS_NONE, - GoannaProcessType aParentProcessId = GoannaProcessType_Default, + GeckoProcessType aParentProcessId = GeckoProcessType_Default, int32_t aMaxTextureSize = 4096, bool aSupportsTextureBlitting = false, bool aSupportsPartialUploads = false, diff --git a/gfx/layers/RotatedBuffer.cpp b/gfx/layers/RotatedBuffer.cpp index 8199db9a6c..5bfb835914 100644 --- a/gfx/layers/RotatedBuffer.cpp +++ b/gfx/layers/RotatedBuffer.cpp @@ -9,7 +9,7 @@ #include "BasicImplData.h" // for BasicImplData #include "BasicLayersImpl.h" // for ToData #include "BufferUnrotate.h" // for BufferUnrotate -#include "GoannaProfiler.h" // for PROFILER_LABEL +#include "GeckoProfiler.h" // for PROFILER_LABEL #include "Layers.h" // for PaintedLayer, Layer, etc #include "gfxPlatform.h" // for gfxPlatform #include "gfxPrefs.h" // for gfxPrefs diff --git a/gfx/layers/apz/public/GoannaContentController.h b/gfx/layers/apz/public/GeckoContentController.h similarity index 95% rename from gfx/layers/apz/public/GoannaContentController.h rename to gfx/layers/apz/public/GeckoContentController.h index f81eee22eb..546ce92a90 100644 --- a/gfx/layers/apz/public/GoannaContentController.h +++ b/gfx/layers/apz/public/GeckoContentController.h @@ -4,8 +4,8 @@ * 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/. */ -#ifndef mozilla_layers_GoannaContentController_h -#define mozilla_layers_GoannaContentController_h +#ifndef mozilla_layers_GeckoContentController_h +#define mozilla_layers_GeckoContentController_h #include "FrameMetrics.h" // for FrameMetrics, etc #include "Units.h" // for CSSPoint, CSSRect, etc @@ -18,10 +18,10 @@ class Task; namespace mozilla { namespace layers { -class GoannaContentController +class GeckoContentController { public: - NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GoannaContentController) + NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GeckoContentController) /** * Requests a paint of the given FrameMetrics |aFrameMetrics| from Goanna. @@ -165,15 +165,15 @@ public: APZStateChange aChange, int aArg = 0) {} - GoannaContentController() {} + GeckoContentController() {} virtual void Destroy() {} protected: // Protected destructor, to discourage deletion outside of Release(): - virtual ~GoannaContentController() {} + virtual ~GeckoContentController() {} }; } } -#endif // mozilla_layers_GoannaContentController_h +#endif // mozilla_layers_GeckoContentController_h diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp index b90eab6602..a337628743 100644 --- a/gfx/layers/apz/src/APZCTreeManager.cpp +++ b/gfx/layers/apz/src/APZCTreeManager.cpp @@ -107,7 +107,7 @@ APZCTreeManager::~APZCTreeManager() AsyncPanZoomController* APZCTreeManager::MakeAPZCInstance(uint64_t aLayersId, - GoannaContentController* aController) + GeckoContentController* aController) { return new AsyncPanZoomController(aLayersId, this, mInputQueue, aController, AsyncPanZoomController::USE_GESTURE_DETECTOR); @@ -197,7 +197,7 @@ APZCTreeManager::UpdateHitTestingTree(CompositorParent* aCompositor, // Compute the clip region to be used for a layer with an APZC. This function // is only called for layers which actually have scrollable metrics and an APZC. static nsIntRegion -ComputeClipRegion(GoannaContentController* aController, +ComputeClipRegion(GeckoContentController* aController, const LayerMetricsWrapper& aLayer) { nsIntRegion clipRegion; @@ -212,7 +212,7 @@ ComputeClipRegion(GoannaContentController* aController, RoundedToInt(aLayer.Metrics().mCompositionBounds))); } - // Optionally, the GoannaContentController can provide a touch-sensitive + // Optionally, the GeckoContentController can provide a touch-sensitive // region that constrains all frames associated with the controller. // In this case we intersect the composition bounds with that region. CSSRect touchSensitiveRegion; @@ -342,7 +342,7 @@ APZCTreeManager::PrepareNodeForLayer(const LayerMetricsWrapper& aLayer, AsyncPanZoomController* apzc = nullptr; // If we get here, aLayer is a scrollable layer and somebody - // has registered a GoannaContentController for it, so we need to ensure + // has registered a GeckoContentController for it, so we need to ensure // it has an APZC instance to manage its scrolling. // aState.mApzcMap allows reusing the exact same APZC instance for different layers diff --git a/gfx/layers/apz/src/APZCTreeManager.h b/gfx/layers/apz/src/APZCTreeManager.h index 04a9abe069..19be754813 100644 --- a/gfx/layers/apz/src/APZCTreeManager.h +++ b/gfx/layers/apz/src/APZCTreeManager.h @@ -48,7 +48,7 @@ class OverscrollHandoffChain; struct OverscrollHandoffState; class LayerMetricsWrapper; class InputQueue; -class GoannaContentController; +class GeckoContentController; class HitTestingTreeNode; /** @@ -397,7 +397,7 @@ protected: // Hook for gtests subclass virtual AsyncPanZoomController* MakeAPZCInstance(uint64_t aLayersId, - GoannaContentController* aController); + GeckoContentController* aController); public: /* Some helper functions to find an APZC given some identifying input. These functions diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp index ab9eae9d85..a2eff2b005 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.cpp +++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp @@ -88,7 +88,7 @@ namespace mozilla { namespace layers { typedef mozilla::layers::AllowedTouchBehavior AllowedTouchBehavior; -typedef GoannaContentController::APZStateChange APZStateChange; +typedef GeckoContentController::APZStateChange APZStateChange; typedef mozilla::gfx::Point Point; typedef mozilla::gfx::Matrix4x4 Matrix4x4; using mozilla::gfx::PointTyped; @@ -811,11 +811,11 @@ AsyncPanZoomController::InitializeGlobalState() AsyncPanZoomController::AsyncPanZoomController(uint64_t aLayersId, APZCTreeManager* aTreeManager, const nsRefPtr& aInputQueue, - GoannaContentController* aGoannaContentController, + GeckoContentController* aGeckoContentController, GestureBehavior aGestures) : mLayersId(aLayersId), mPaintThrottler(GetFrameTime(), TimeDuration::FromMilliseconds(500)), - mGoannaContentController(aGoannaContentController), + mGeckoContentController(aGeckoContentController), mRefPtrMonitor("RefPtrMonitor"), mSharingFrameMetricsAcrossProcesses(false), mMonitor("AsyncPanZoomController"), @@ -859,10 +859,10 @@ AsyncPanZoomController::GetSharedFrameMetricsCompositor() return mCompositorParent.get(); } -already_AddRefed -AsyncPanZoomController::GetGoannaContentController() const { +already_AddRefed +AsyncPanZoomController::GetGeckoContentController() const { MonitorAutoLock lock(mRefPtrMonitor); - nsRefPtr controller = mGoannaContentController; + nsRefPtr controller = mGeckoContentController; return controller.forget(); } @@ -887,7 +887,7 @@ AsyncPanZoomController::Destroy() { // scope the lock MonitorAutoLock lock(mRefPtrMonitor); - mGoannaContentController = nullptr; + mGeckoContentController = nullptr; mGestureEventListener = nullptr; } mParent = nullptr; @@ -1077,7 +1077,7 @@ nsEventStatus AsyncPanZoomController::OnTouchStart(const MultiTouchInput& aEvent case NOTHING: { mX.StartTouch(point.x, aEvent.mTime); mY.StartTouch(point.y, aEvent.mTime); - if (nsRefPtr controller = GetGoannaContentController()) { + if (nsRefPtr controller = GetGeckoContentController()) { controller->NotifyAPZStateChange( GetGuid(), APZStateChange::StartTouch, CurrentTouchBlock()->GetOverscrollHandoffChain()->CanBePanned(this)); @@ -1617,7 +1617,7 @@ nsEventStatus AsyncPanZoomController::OnPanMomentumEnd(const PanGestureInput& aE nsEventStatus AsyncPanZoomController::OnLongPress(const TapGestureInput& aEvent) { APZC_LOG("%p got a long-press in state %d\n", this, mState); - nsRefPtr controller = GetGoannaContentController(); + nsRefPtr controller = GetGeckoContentController(); if (controller) { CSSPoint goannaScreenPoint; if (ConvertToGoanna(aEvent.mLocalPoint, &goannaScreenPoint)) { @@ -1635,7 +1635,7 @@ nsEventStatus AsyncPanZoomController::OnLongPress(const TapGestureInput& aEvent) nsEventStatus AsyncPanZoomController::OnLongPressUp(const TapGestureInput& aEvent) { APZC_LOG("%p got a long-tap-up in state %d\n", this, mState); - nsRefPtr controller = GetGoannaContentController(); + nsRefPtr controller = GetGeckoContentController(); if (controller) { CSSPoint goannaScreenPoint; if (ConvertToGoanna(aEvent.mLocalPoint, &goannaScreenPoint)) { @@ -1647,7 +1647,7 @@ nsEventStatus AsyncPanZoomController::OnLongPressUp(const TapGestureInput& aEven } nsEventStatus AsyncPanZoomController::GenerateSingleTap(const ParentLayerPoint& aPoint, mozilla::Modifiers aModifiers) { - nsRefPtr controller = GetGoannaContentController(); + nsRefPtr controller = GetGeckoContentController(); if (controller) { CSSPoint goannaScreenPoint; if (ConvertToGoanna(aPoint, &goannaScreenPoint)) { @@ -1660,7 +1660,7 @@ nsEventStatus AsyncPanZoomController::GenerateSingleTap(const ParentLayerPoint& // schedule the singletap message to run on the next spin of the event loop. // See bug 965381 for the issue this was causing. controller->PostDelayedTask( - NewRunnableMethod(controller.get(), &GoannaContentController::HandleSingleTap, + NewRunnableMethod(controller.get(), &GeckoContentController::HandleSingleTap, goannaScreenPoint, aModifiers, GetGuid()), 0); @@ -1671,7 +1671,7 @@ nsEventStatus AsyncPanZoomController::GenerateSingleTap(const ParentLayerPoint& } void AsyncPanZoomController::OnTouchEndOrCancel() { - if (nsRefPtr controller = GetGoannaContentController()) { + if (nsRefPtr controller = GetGeckoContentController()) { controller->NotifyAPZStateChange( GetGuid(), APZStateChange::EndTouch, CurrentTouchBlock()->SingleTapOccurred()); } @@ -1694,7 +1694,7 @@ nsEventStatus AsyncPanZoomController::OnSingleTapConfirmed(const TapGestureInput nsEventStatus AsyncPanZoomController::OnDoubleTap(const TapGestureInput& aEvent) { APZC_LOG("%p got a double-tap in state %d\n", this, mState); - nsRefPtr controller = GetGoannaContentController(); + nsRefPtr controller = GetGeckoContentController(); if (controller) { if (mZoomConstraints.mAllowDoubleTapZoom && CurrentTouchBlock()->TouchActionAllowsDoubleTapZoom()) { CSSPoint goannaScreenPoint; @@ -1870,7 +1870,7 @@ nsEventStatus AsyncPanZoomController::StartPanning(const MultiTouchInput& aEvent } if (IsInPanningState()) { - if (nsRefPtr controller = GetGoannaContentController()) { + if (nsRefPtr controller = GetGeckoContentController()) { controller->NotifyAPZStateChange(GetGuid(), APZStateChange::StartPanning); } return nsEventStatus_eConsumeNoDefault; @@ -2019,7 +2019,7 @@ void AsyncPanZoomController::AcceptFling(const ParentLayerPoint& aVelocity, } CSSPoint predictedDestination = mFrameMetrics.GetScrollOffset() + predictedDelta / mFrameMetrics.GetZoom(); - nsRefPtr controller = GetGoannaContentController(); + nsRefPtr controller = GetGeckoContentController(); if (controller) { APZC_LOG("%p fling snapping. friction: %f velocity: %f, %f " "predictedDelta: %f, %f position: %f, %f " @@ -2409,7 +2409,7 @@ GetDisplayPortRect(const FrameMetrics& aFrameMetrics) void AsyncPanZoomController::DispatchRepaintRequest(const FrameMetrics& aFrameMetrics) { - nsRefPtr controller = GetGoannaContentController(); + nsRefPtr controller = GetGeckoContentController(); if (controller) { APZC_LOG_FM(aFrameMetrics, "%p requesting content repaint", this); LogRendertraceRect(GetGuid(), "requested displayport", "yellow", GetDisplayPortRect(aFrameMetrics)); @@ -2418,7 +2418,7 @@ AsyncPanZoomController::DispatchRepaintRequest(const FrameMetrics& aFrameMetrics controller->RequestContentRepaint(aFrameMetrics); } else { NS_DispatchToMainThread(NS_NewRunnableMethodWithArg( - controller, &GoannaContentController::RequestContentRepaint, aFrameMetrics)); + controller, &GeckoContentController::RequestContentRepaint, aFrameMetrics)); } mLastDispatchedPaintMetrics = aFrameMetrics; } @@ -2814,7 +2814,7 @@ void AsyncPanZoomController::NotifyLayersUpdated(const FrameMetrics& aLayerMetri // scroll offset updates from APZ until we acknowledge the update it sent. // This prevents APZ updates from clobbering scroll updates from other // more "legitimate" sources like content scripts. - nsRefPtr controller = GetGoannaContentController(); + nsRefPtr controller = GetGeckoContentController(); if (controller) { APZC_LOG("%p sending scroll update acknowledgement with gen %u\n", this, aLayerMetrics.GetScrollGeneration()); controller->AcknowledgeScrollUpdate(aLayerMetrics.GetScrollId(), @@ -2986,7 +2986,7 @@ void AsyncPanZoomController::DispatchStateChangeNotification(PanZoomState aOldSt } } - if (nsRefPtr controller = GetGoannaContentController()) { + if (nsRefPtr controller = GetGeckoContentController()) { if (!IsTransformingState(aOldState) && IsTransformingState(aNewState)) { controller->NotifyAPZStateChange( GetGuid(), APZStateChange::TransformBegin); @@ -3031,14 +3031,14 @@ AsyncPanZoomController::GetZoomConstraints() const void AsyncPanZoomController::PostDelayedTask(Task* aTask, int aDelayMs) { APZThreadUtils::AssertOnControllerThread(); - nsRefPtr controller = GetGoannaContentController(); + nsRefPtr controller = GetGeckoContentController(); if (controller) { controller->PostDelayedTask(aTask, aDelayMs); } } void AsyncPanZoomController::SendAsyncScrollEvent() { - nsRefPtr controller = GetGoannaContentController(); + nsRefPtr controller = GetGeckoContentController(); if (!controller) { return; } diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h index a1b77a2d5e..0472949880 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.h +++ b/gfx/layers/apz/src/AsyncPanZoomController.h @@ -8,7 +8,7 @@ #define mozilla_layers_AsyncPanZoomController_h #include "CrossProcessMutex.h" -#include "mozilla/layers/GoannaContentController.h" +#include "mozilla/layers/GeckoContentController.h" #include "mozilla/layers/APZCTreeManager.h" #include "mozilla/Attributes.h" #include "mozilla/EventForwards.h" @@ -99,7 +99,7 @@ public: AsyncPanZoomController(uint64_t aLayersId, APZCTreeManager* aTreeManager, const nsRefPtr& aInputQueue, - GoannaContentController* aController, + GeckoContentController* aController, GestureBehavior aGestures = DEFAULT_GESTURES); // -------------------------------------------------------------------------- @@ -534,7 +534,7 @@ protected: /** * Utility function to send updated FrameMetrics to Goanna so that it can paint - * the displayport area. Calls into GoannaContentController to do the actual + * the displayport area. Calls into GeckoContentController to do the actual * work. Note that only one paint request can be active at a time. If a paint * request is made while a paint is currently happening, it gets queued up. If * a new paint request arrives before a paint is completed, the old request @@ -546,7 +546,7 @@ protected: * Tell the paint throttler to request a content repaint with the given * metrics. (Helper function used by RequestContentRepaint.) If aThrottled * is set to false, the repaint request is sent directly without going through - * the paint throttler. In particular, the GoannaContentController::RequestContentRepaint + * the paint throttler. In particular, the GeckoContentController::RequestContentRepaint * function will be invoked before this function returns. */ void RequestContentRepaint(FrameMetrics& aFrameMetrics, bool aThrottled = true); @@ -611,12 +611,12 @@ protected: /* Access to the following two fields is protected by the mRefPtrMonitor, since they are accessed on the UI thread but can be cleared on the compositor thread. */ - nsRefPtr mGoannaContentController; + nsRefPtr mGeckoContentController; nsRefPtr mGestureEventListener; mutable Monitor mRefPtrMonitor; /* Utility functions that return a addrefed pointer to the corresponding fields. */ - already_AddRefed GetGoannaContentController() const; + already_AddRefed GetGeckoContentController() const; already_AddRefed GetGestureEventListener() const; // If we are sharing our frame metrics with content across processes diff --git a/gfx/layers/apz/src/HitTestingTreeNode.h b/gfx/layers/apz/src/HitTestingTreeNode.h index 01a7dfe245..d065742c60 100644 --- a/gfx/layers/apz/src/HitTestingTreeNode.h +++ b/gfx/layers/apz/src/HitTestingTreeNode.h @@ -121,7 +121,7 @@ private: /* This is clip rect for L that we wish to use for hit-testing purposes. Note * that this may not be exactly the same as the clip rect on layer L because - * of the touch-sensitive region provided by the GoannaContentController, or + * of the touch-sensitive region provided by the GeckoContentController, or * because we may use the composition bounds of the layer if the clip is not * present. This value is in L's ParentLayerPixels. */ Maybe mClipRegion; diff --git a/gfx/layers/apz/util/APZCCallbackHelper.h b/gfx/layers/apz/util/APZCCallbackHelper.h index 1e92221aae..e9f4270f14 100644 --- a/gfx/layers/apz/util/APZCCallbackHelper.h +++ b/gfx/layers/apz/util/APZCCallbackHelper.h @@ -30,7 +30,7 @@ protected: }; /* This class contains some helper methods that facilitate implementing the - GoannaContentController callback interface required by the AsyncPanZoomController. + GeckoContentController callback interface required by the AsyncPanZoomController. Since different platforms need to implement this interface in similar-but- not-quite-the-same ways, this utility class provides some helpful methods to hold code that can be shared across the different platform implementations. diff --git a/gfx/layers/apz/util/APZEventState.h b/gfx/layers/apz/util/APZEventState.h index fc63954d4b..ff3da521a4 100644 --- a/gfx/layers/apz/util/APZEventState.h +++ b/gfx/layers/apz/util/APZEventState.h @@ -11,7 +11,7 @@ #include "FrameMetrics.h" // for ScrollableLayerGuid #include "Units.h" #include "mozilla/EventForwards.h" -#include "mozilla/layers/GoannaContentController.h" // for APZStateChange +#include "mozilla/layers/GeckoContentController.h" // for APZStateChange #include "nsCOMPtr.h" #include "nsISupportsImpl.h" // for NS_INLINE_DECL_REFCOUNTING #include "nsIWeakReferenceUtils.h" // for nsWeakPtr @@ -41,7 +41,7 @@ protected: * gestures and sending APZ notifications. */ class APZEventState { - typedef GoannaContentController::APZStateChange APZStateChange; + typedef GeckoContentController::APZStateChange APZStateChange; typedef FrameMetrics::ViewID ViewID; public: APZEventState(nsIWidget* aWidget, diff --git a/gfx/layers/apz/util/ChromeProcessController.h b/gfx/layers/apz/util/ChromeProcessController.h index 9f3aea8a7c..11f8a3704e 100644 --- a/gfx/layers/apz/util/ChromeProcessController.h +++ b/gfx/layers/apz/util/ChromeProcessController.h @@ -6,7 +6,7 @@ #ifndef mozilla_layers_ChromeProcessController_h #define mozilla_layers_ChromeProcessController_h -#include "mozilla/layers/GoannaContentController.h" +#include "mozilla/layers/GeckoContentController.h" #include "nsCOMPtr.h" #include "mozilla/nsRefPtr.h" @@ -26,7 +26,7 @@ class CompositorParent; // A ChromeProcessController is attached to the root of a compositor's layer // tree. -class ChromeProcessController : public mozilla::layers::GoannaContentController +class ChromeProcessController : public mozilla::layers::GeckoContentController { typedef mozilla::layers::FrameMetrics FrameMetrics; typedef mozilla::layers::ScrollableLayerGuid ScrollableLayerGuid; @@ -35,7 +35,7 @@ public: explicit ChromeProcessController(nsIWidget* aWidget, APZEventState* aAPZEventState); virtual void Destroy() override; - // GoannaContentController interface + // GeckoContentController interface virtual void RequestContentRepaint(const FrameMetrics& aFrameMetrics) override; virtual void PostDelayedTask(Task* aTask, int aDelayMs) override; virtual void RequestFlingSnap(const FrameMetrics::ViewID& aScrollId, diff --git a/gfx/layers/basic/BasicLayerManager.cpp b/gfx/layers/basic/BasicLayerManager.cpp index 25a2312f19..dbea682e2a 100644 --- a/gfx/layers/basic/BasicLayerManager.cpp +++ b/gfx/layers/basic/BasicLayerManager.cpp @@ -8,7 +8,7 @@ #include // for int32_t #include "BasicContainerLayer.h" // for BasicContainerLayer #include "BasicLayersImpl.h" // for ToData, BasicReadbackLayer, etc -#include "GoannaProfiler.h" // for PROFILER_LABEL +#include "GeckoProfiler.h" // for PROFILER_LABEL #include "ImageContainer.h" // for ImageFactory #include "Layers.h" // for Layer, ContainerLayer, etc #include "ReadbackLayer.h" // for ReadbackLayer diff --git a/gfx/layers/basic/BasicPaintedLayer.cpp b/gfx/layers/basic/BasicPaintedLayer.cpp index bbbccaa14a..ab7fa7e1b9 100644 --- a/gfx/layers/basic/BasicPaintedLayer.cpp +++ b/gfx/layers/basic/BasicPaintedLayer.cpp @@ -5,7 +5,7 @@ #include "BasicPaintedLayer.h" #include // for uint32_t -#include "GoannaProfiler.h" // for PROFILER_LABEL +#include "GeckoProfiler.h" // for PROFILER_LABEL #include "ReadbackLayer.h" // for ReadbackLayer, ReadbackSink #include "ReadbackProcessor.h" // for ReadbackProcessor::Update, etc #include "RenderTrace.h" // for RenderTraceInvalidateEnd, etc diff --git a/gfx/layers/client/CanvasClient.cpp b/gfx/layers/client/CanvasClient.cpp index 909424265b..31d07239d4 100644 --- a/gfx/layers/client/CanvasClient.cpp +++ b/gfx/layers/client/CanvasClient.cpp @@ -38,7 +38,7 @@ CanvasClient::CreateCanvasClient(CanvasClientType aType, TextureFlags aFlags) { #ifndef MOZ_WIDGET_GONK - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { NS_WARNING("Most platforms still need an optimized way to share GL cross process."); return MakeAndAddRef(aForwarder, aFlags); } diff --git a/gfx/layers/client/ClientCanvasLayer.cpp b/gfx/layers/client/ClientCanvasLayer.cpp index 6376d0e55b..fadfd5d230 100644 --- a/gfx/layers/client/ClientCanvasLayer.cpp +++ b/gfx/layers/client/ClientCanvasLayer.cpp @@ -6,7 +6,7 @@ #include "ClientCanvasLayer.h" #include "GLContext.h" // for GLContext #include "GLScreenBuffer.h" // for GLScreenBuffer -#include "GoannaProfiler.h" // for PROFILER_LABEL +#include "GeckoProfiler.h" // for PROFILER_LABEL #include "SharedSurfaceEGL.h" // for SurfaceFactory_EGLImage #include "SharedSurfaceGL.h" // for SurfaceFactory_GLTexture, etc #include "ClientLayerManager.h" // for ClientLayerManager, etc @@ -87,7 +87,7 @@ ClientCanvasLayer::Initialize(const Data& aData) flags, ClientManager()->AsShadowForwarder()); #else - bool isCrossProcess = !(XRE_GetProcessType() == GoannaProcessType_Default); + bool isCrossProcess = !(XRE_GetProcessType() == GeckoProcessType_Default); if (!isCrossProcess) { // [Basic/OGL Layers, OMTC] WebGL layer init. factory = SurfaceFactory_EGLImage::Create(mGLContext, caps); diff --git a/gfx/layers/client/ClientLayerManager.cpp b/gfx/layers/client/ClientLayerManager.cpp index 48a964121b..19eac9f4c5 100644 --- a/gfx/layers/client/ClientLayerManager.cpp +++ b/gfx/layers/client/ClientLayerManager.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "ClientLayerManager.h" -#include "GoannaProfiler.h" // for PROFILER_LABEL +#include "GeckoProfiler.h" // for PROFILER_LABEL #include "gfxPrefs.h" // for gfxPrefs::LayersTile... #include "mozilla/Assertions.h" // for MOZ_ASSERT, etc #include "mozilla/Hal.h" @@ -219,7 +219,7 @@ ClientLayerManager::BeginTransactionWithTarget(gfxContext* aTarget) // If we have a non-default target, we need to let our shadow manager draw // to it. This will happen at the end of the transaction. - if (aTarget && XRE_GetProcessType() == GoannaProcessType_Default) { + if (aTarget && XRE_GetProcessType() == GeckoProcessType_Default) { mShadowTarget = aTarget; } else { NS_ASSERTION(!aTarget, @@ -368,7 +368,7 @@ ClientLayerManager::GetRemoteRenderer() CompositorChild* ClientLayerManager::GetCompositorChild() { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return CompositorChild::Get(); } return GetRemoteRenderer(); diff --git a/gfx/layers/client/ClientPaintedLayer.cpp b/gfx/layers/client/ClientPaintedLayer.cpp index 60cffaa638..5870892277 100644 --- a/gfx/layers/client/ClientPaintedLayer.cpp +++ b/gfx/layers/client/ClientPaintedLayer.cpp @@ -6,7 +6,7 @@ #include "ClientPaintedLayer.h" #include "ClientTiledPaintedLayer.h" // for ClientTiledPaintedLayer #include // for uint32_t -#include "GoannaProfiler.h" // for PROFILER_LABEL +#include "GeckoProfiler.h" // for PROFILER_LABEL #include "client/ClientLayerManager.h" // for ClientLayerManager, etc #include "gfxContext.h" // for gfxContext #include "gfxRect.h" // for gfxRect diff --git a/gfx/layers/client/TiledContentClient.cpp b/gfx/layers/client/TiledContentClient.cpp index a6d5a57ad4..d7235df394 100644 --- a/gfx/layers/client/TiledContentClient.cpp +++ b/gfx/layers/client/TiledContentClient.cpp @@ -7,7 +7,7 @@ #include // for ceil, ceilf, floor #include #include "ClientTiledPaintedLayer.h" // for ClientTiledPaintedLayer -#include "GoannaProfiler.h" // for PROFILER_LABEL +#include "GeckoProfiler.h" // for PROFILER_LABEL #include "ClientLayerManager.h" // for ClientLayerManager #include "gfxContext.h" // for gfxContext, etc #include "gfxPlatform.h" // for gfxPlatform diff --git a/gfx/layers/composite/AsyncCompositionManager.cpp b/gfx/layers/composite/AsyncCompositionManager.cpp index 91588e70da..82b72d2f0b 100644 --- a/gfx/layers/composite/AsyncCompositionManager.cpp +++ b/gfx/layers/composite/AsyncCompositionManager.cpp @@ -36,7 +36,7 @@ # include # include "AndroidBridge.h" #endif -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" struct nsCSSValueSharedList; diff --git a/gfx/layers/composite/ContainerLayerComposite.cpp b/gfx/layers/composite/ContainerLayerComposite.cpp index 58d38d57c2..91ced0992f 100755 --- a/gfx/layers/composite/ContainerLayerComposite.cpp +++ b/gfx/layers/composite/ContainerLayerComposite.cpp @@ -35,7 +35,7 @@ #include "nsTArray.h" // for nsAutoTArray #include "TextRenderer.h" // for TextRenderer #include -#include "GoannaProfiler.h" // for GoannaProfiler +#include "GeckoProfiler.h" // for GeckoProfiler #define CULLING_LOG(...) // #define CULLING_LOG(...) printf_stderr("CULLING: " __VA_ARGS__) diff --git a/gfx/layers/composite/LayerManagerComposite.cpp b/gfx/layers/composite/LayerManagerComposite.cpp index 9730074b9d..6e89a4716b 100644 --- a/gfx/layers/composite/LayerManagerComposite.cpp +++ b/gfx/layers/composite/LayerManagerComposite.cpp @@ -13,7 +13,7 @@ #include "ContainerLayerComposite.h" // for ContainerLayerComposite, etc #include "FPSCounter.h" // for FPSState, FPSCounter #include "FrameMetrics.h" // for FrameMetrics -#include "GoannaProfiler.h" // for profiler_set_frame_number, etc +#include "GeckoProfiler.h" // for profiler_set_frame_number, etc #include "ImageLayerComposite.h" // for ImageLayerComposite #include "Layers.h" // for Layer, ContainerLayer, etc #include "LayerScope.h" // for LayerScope Tool @@ -55,7 +55,7 @@ #ifdef MOZ_WIDGET_ANDROID #include #endif -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "TextRenderer.h" // for TextRenderer class gfxContext; diff --git a/gfx/layers/composite/PaintedLayerComposite.cpp b/gfx/layers/composite/PaintedLayerComposite.cpp index 16edda58df..fb03879a37 100644 --- a/gfx/layers/composite/PaintedLayerComposite.cpp +++ b/gfx/layers/composite/PaintedLayerComposite.cpp @@ -27,7 +27,7 @@ #include "nsSize.h" // for nsIntSize #include "nsString.h" // for nsAutoCString #include "TextRenderer.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" namespace mozilla { namespace layers { diff --git a/gfx/layers/ipc/CompositorBench.cpp b/gfx/layers/ipc/CompositorBench.cpp index 22acc07f4a..5d3ea43c24 100644 --- a/gfx/layers/ipc/CompositorBench.cpp +++ b/gfx/layers/ipc/CompositorBench.cpp @@ -13,7 +13,7 @@ #include "gfxColor.h" #include "gfxPrefs.h" #include -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #ifdef MOZ_WIDGET_GONK #include "mozilla/layers/GrallocTextureHost.h" diff --git a/gfx/layers/ipc/CompositorChild.cpp b/gfx/layers/ipc/CompositorChild.cpp index 7c975d3e92..769ac1703e 100644 --- a/gfx/layers/ipc/CompositorChild.cpp +++ b/gfx/layers/ipc/CompositorChild.cpp @@ -162,7 +162,7 @@ CompositorChild::OpenSameProcess(CompositorParent* aParent) CompositorChild::Get() { // This is only expected to be used in child processes. - MOZ_ASSERT(XRE_GetProcessType() != GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() != GeckoProcessType_Default); return sCompositor; } diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp index e57d6b0163..be079c1fce 100644 --- a/gfx/layers/ipc/CompositorParent.cpp +++ b/gfx/layers/ipc/CompositorParent.cpp @@ -55,7 +55,7 @@ #include "mozilla/layers/CompositorD3D11.h" #include "mozilla/layers/CompositorD3D9.h" #endif -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/ipc/ProtocolTypes.h" #include "mozilla/unused.h" #include "mozilla/Hal.h" @@ -64,7 +64,7 @@ #include "mozilla/VsyncDispatcher.h" #ifdef MOZ_WIDGET_GONK -#include "GoannaTouchDispatcher.h" +#include "GeckoTouchDispatcher.h" #endif namespace mozilla { @@ -228,7 +228,7 @@ CompositorVsyncObserver::CompositorVsyncObserver(CompositorParent* aCompositorPa MOZ_ASSERT(aWidget != nullptr); mCompositorVsyncDispatcher = aWidget->GetCompositorVsyncDispatcher(); #ifdef MOZ_WIDGET_GONK - GoannaTouchDispatcher::SetCompositorVsyncObserver(this); + GeckoTouchDispatcher::SetCompositorVsyncObserver(this); #endif } @@ -366,7 +366,7 @@ void CompositorVsyncObserver::DispatchTouchEvents(TimeStamp aVsyncTimestamp) { #ifdef MOZ_WIDGET_GONK - GoannaTouchDispatcher::NotifyVsync(aVsyncTimestamp); + GeckoTouchDispatcher::NotifyVsync(aVsyncTimestamp); #endif } @@ -1350,17 +1350,17 @@ CompositorParent::DeallocateLayerTreeId(uint64_t aId) static void UpdateControllerForLayersId(uint64_t aLayersId, - GoannaContentController* aController) + GeckoContentController* aController) { // Adopt ref given to us by SetControllerForLayerTree() MonitorAutoLock lock(*sIndirectLayerTreesLock); sIndirectLayerTrees[aLayersId].mController = - already_AddRefed(aController); + already_AddRefed(aController); } ScopedLayerTreeRegistration::ScopedLayerTreeRegistration(uint64_t aLayersId, Layer* aRoot, - GoannaContentController* aController) + GeckoContentController* aController) : mLayersId(aLayersId) { EnsureLayerTreeMapReady(); @@ -1377,7 +1377,7 @@ ScopedLayerTreeRegistration::~ScopedLayerTreeRegistration() /*static*/ void CompositorParent::SetControllerForLayerTree(uint64_t aLayersId, - GoannaContentController* aController) + GeckoContentController* aController) { // This ref is adopted by UpdateControllerForLayersId(). aController->AddRef(); diff --git a/gfx/layers/ipc/CompositorParent.h b/gfx/layers/ipc/CompositorParent.h index 8bf5eb6b78..e7165d196e 100644 --- a/gfx/layers/ipc/CompositorParent.h +++ b/gfx/layers/ipc/CompositorParent.h @@ -26,7 +26,7 @@ #include "mozilla/RefPtr.h" // for RefPtr #include "mozilla/TimeStamp.h" // for TimeStamp #include "mozilla/ipc/ProtocolUtils.h" -#include "mozilla/layers/GoannaContentController.h" +#include "mozilla/layers/GeckoContentController.h" #include "mozilla/layers/LayersMessages.h" // for TargetConfig #include "mozilla/layers/PCompositorParent.h" #include "mozilla/layers/ShadowLayersManager.h" // for ShadowLayersManager @@ -60,7 +60,7 @@ struct ScopedLayerTreeRegistration { ScopedLayerTreeRegistration(uint64_t aLayersId, Layer* aRoot, - GoannaContentController* aController); + GeckoContentController* aController); ~ScopedLayerTreeRegistration(); private: @@ -285,7 +285,7 @@ public: * Must run on content main thread. */ static void SetControllerForLayerTree(uint64_t aLayersId, - GoannaContentController* aController); + GeckoContentController* aController); /** * This returns a reference to the APZCTreeManager to which @@ -304,7 +304,7 @@ public: LayerTreeState(); ~LayerTreeState(); nsRefPtr mRoot; - nsRefPtr mController; + nsRefPtr mController; CompositorParent* mParent; LayerManagerComposite* mLayerManager; // Pointer to the CrossProcessCompositorParent. Used by APZCs to share diff --git a/gfx/layers/ipc/FenceUtilsGonk.cpp b/gfx/layers/ipc/FenceUtilsGonk.cpp index ef6f5e42dd..e27e3b227c 100644 --- a/gfx/layers/ipc/FenceUtilsGonk.cpp +++ b/gfx/layers/ipc/FenceUtilsGonk.cpp @@ -91,7 +91,7 @@ ParamTraits::Read(const Message* aMsg, // SCM_RIGHTS doesn't dup the fd. That's surprising, but we just // deal with it here. NB: only the "default" (master) process can // alloc gralloc buffers. - bool sameProcess = (XRE_GetProcessType() == GoannaProcessType_Default); + bool sameProcess = (XRE_GetProcessType() == GeckoProcessType_Default); int dupFd = sameProcess ? dup(fd.fd) : fd.fd; fds[n] = dupFd; } @@ -154,7 +154,7 @@ ParamTraits::Write(Message* aMsg, // SCM_RIGHTS doesn't dup the fd. That's surprising, but we just // deal with it here. NB: only the "default" (master) process can // alloc gralloc buffers. - bool sameProcess = (XRE_GetProcessType() == GoannaProcessType_Default); + bool sameProcess = (XRE_GetProcessType() == GeckoProcessType_Default); int dupFd = sameProcess ? dup(fds[n]) : fds[n]; //int dupFd = fds[n]; diff --git a/gfx/layers/ipc/LayerTransactionParent.cpp b/gfx/layers/ipc/LayerTransactionParent.cpp index 401d20d642..c0c6bcce4d 100644 --- a/gfx/layers/ipc/LayerTransactionParent.cpp +++ b/gfx/layers/ipc/LayerTransactionParent.cpp @@ -39,7 +39,7 @@ #include "nsMathUtils.h" // for NS_round #include "nsPoint.h" // for nsPoint #include "nsTArray.h" // for nsTArray, nsTArray_Impl, etc -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/layers/TextureHost.h" #include "mozilla/layers/AsyncCompositionManager.h" diff --git a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp index 945f4ce473..34d149866c 100644 --- a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp +++ b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp @@ -26,7 +26,7 @@ #include "gfx2DGlue.h" #include "GLContext.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "cutils/properties.h" @@ -126,7 +126,7 @@ ParamTraits::Read(const Message* aMsg, size_t nfds = aMsg->num_fds(); int fds[nfds]; - bool sameProcess = (XRE_GetProcessType() == GoannaProcessType_Default); + bool sameProcess = (XRE_GetProcessType() == GeckoProcessType_Default); for (size_t n = 0; n < nfds; ++n) { FileDescriptor fd; if (!aMsg->ReadFileDescriptor(aIter, &fd)) { @@ -214,7 +214,7 @@ GetGraphicBufferFrom(MaybeMagicGrallocBufferHandle aHandle) { if (aHandle.type() != MaybeMagicGrallocBufferHandle::TMagicGrallocBufferHandle) { if (aHandle.type() == MaybeMagicGrallocBufferHandle::TGrallocBufferRef) { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { return SharedBufferManagerParent::GetGraphicBuffer(aHandle.get_GrallocBufferRef()); } return SharedBufferManagerChild::GetSingleton()->GetGraphicBuffer(aHandle.get_GrallocBufferRef().mKey); diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp index 3cf2481a9f..655eefc5b5 100644 --- a/gfx/layers/ipc/ShadowLayers.cpp +++ b/gfx/layers/ipc/ShadowLayers.cpp @@ -8,7 +8,7 @@ #include "ShadowLayers.h" #include // for _Rb_tree_const_iterator, etc #include // for vector -#include "GoannaProfiler.h" // for PROFILER_LABEL +#include "GeckoProfiler.h" // for PROFILER_LABEL #include "ISurfaceAllocator.h" // for IsSurfaceDescriptorValid #include "Layers.h" // for Layer #include "RenderTrace.h" // for RenderTraceScope diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index b33e5e0d7e..fd694e93a0 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -89,7 +89,7 @@ EXPORTS.gfxipc += [ ] EXPORTS.mozilla.layers += [ - 'apz/public/GoannaContentController.h', + 'apz/public/GeckoContentController.h', # exporting things from apz/src is temporary until we extract a # proper interface for the code there 'apz/src/APZCTreeManager.h', diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp index b55b7cf007..915e31748e 100644 --- a/gfx/layers/opengl/CompositorOGL.cpp +++ b/gfx/layers/opengl/CompositorOGL.cpp @@ -52,7 +52,7 @@ #include "nsCocoaFeatures.h" #endif -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17 #include "libdisplay/GonkDisplay.h" // for GonkDisplay diff --git a/gfx/layers/opengl/TextureClientOGL.cpp b/gfx/layers/opengl/TextureClientOGL.cpp index 307e4bfadf..d6b35eb767 100644 --- a/gfx/layers/opengl/TextureClientOGL.cpp +++ b/gfx/layers/opengl/TextureClientOGL.cpp @@ -29,7 +29,7 @@ EGLImageTextureClient::EGLImageTextureClient(ISurfaceAllocator* aAllocator, , mSize(aSize) , mIsLocked(false) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default, + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default, "Can't pass an `EGLImage` between processes."); AddFlags(TextureFlags::DEALLOCATE_CLIENT); @@ -83,7 +83,7 @@ SurfaceTextureClient::SurfaceTextureClient(ISurfaceAllocator* aAllocator, , mSize(aSize) , mIsLocked(false) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default, + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default, "Can't pass pointers between processes."); // Our data is always owned externally. diff --git a/gfx/layers/opengl/TextureHostOGL.cpp b/gfx/layers/opengl/TextureHostOGL.cpp index 8dfa6239c8..03ac2dd7ff 100644 --- a/gfx/layers/opengl/TextureHostOGL.cpp +++ b/gfx/layers/opengl/TextureHostOGL.cpp @@ -31,7 +31,7 @@ #include "SharedSurfaceIO.h" #include "mozilla/layers/MacIOSurfaceTextureHostOGL.h" #endif -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" using namespace mozilla::gl; using namespace mozilla::gfx; diff --git a/gfx/tests/gtest/TestAsyncPanZoomController.cpp b/gfx/tests/gtest/TestAsyncPanZoomController.cpp index 280eda8691..938ccb2378 100644 --- a/gfx/tests/gtest/TestAsyncPanZoomController.cpp +++ b/gfx/tests/gtest/TestAsyncPanZoomController.cpp @@ -8,7 +8,7 @@ #include "mozilla/Attributes.h" #include "mozilla/layers/AsyncCompositionManager.h" // for ViewTransform -#include "mozilla/layers/GoannaContentController.h" +#include "mozilla/layers/GeckoContentController.h" #include "mozilla/layers/CompositorParent.h" #include "mozilla/layers/APZCTreeManager.h" #include "mozilla/layers/LayerMetricsWrapper.h" @@ -58,7 +58,7 @@ private: &(gfxPrefs::Set##prefBase), \ prefValue) -class MockContentController : public GoannaContentController { +class MockContentController : public GeckoContentController { public: MOCK_METHOD1(RequestContentRepaint, void(const FrameMetrics&)); MOCK_METHOD2(RequestFlingSnap, void(const FrameMetrics::ViewID& aScrollId, const mozilla::CSSPoint& aDestination)); @@ -129,12 +129,12 @@ public: } protected: - AsyncPanZoomController* MakeAPZCInstance(uint64_t aLayersId, GoannaContentController* aController) override; + AsyncPanZoomController* MakeAPZCInstance(uint64_t aLayersId, GeckoContentController* aController) override; }; class TestAsyncPanZoomController : public AsyncPanZoomController { public: - TestAsyncPanZoomController(uint64_t aLayersId, GoannaContentController* aMcc, + TestAsyncPanZoomController(uint64_t aLayersId, GeckoContentController* aMcc, TestAPZCTreeManager* aTreeManager, GestureBehavior aBehavior = DEFAULT_GESTURES) : AsyncPanZoomController(aLayersId, aTreeManager, aTreeManager->GetInputQueue(), aMcc, aBehavior) @@ -216,7 +216,7 @@ private: }; AsyncPanZoomController* -TestAPZCTreeManager::MakeAPZCInstance(uint64_t aLayersId, GoannaContentController* aController) +TestAPZCTreeManager::MakeAPZCInstance(uint64_t aLayersId, GeckoContentController* aController) { return new TestAsyncPanZoomController(aLayersId, aController, this, AsyncPanZoomController::USE_GESTURE_DETECTOR); } @@ -1068,17 +1068,17 @@ TEST_F(APZCBasicTester, PanningTransformNotifications) { { InSequence s; EXPECT_CALL(check, Call("Simple pan")); - EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GoannaContentController::APZStateChange::StartTouch,_)).Times(1); - EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GoannaContentController::APZStateChange::TransformBegin,_)).Times(1); - EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GoannaContentController::APZStateChange::StartPanning,_)).Times(1); - EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GoannaContentController::APZStateChange::EndTouch,_)).Times(1); - EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GoannaContentController::APZStateChange::TransformEnd,_)).Times(1); + EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GeckoContentController::APZStateChange::StartTouch,_)).Times(1); + EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GeckoContentController::APZStateChange::TransformBegin,_)).Times(1); + EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GeckoContentController::APZStateChange::StartPanning,_)).Times(1); + EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GeckoContentController::APZStateChange::EndTouch,_)).Times(1); + EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GeckoContentController::APZStateChange::TransformEnd,_)).Times(1); EXPECT_CALL(check, Call("Complex pan")); - EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GoannaContentController::APZStateChange::StartTouch,_)).Times(1); - EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GoannaContentController::APZStateChange::TransformBegin,_)).Times(1); - EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GoannaContentController::APZStateChange::StartPanning,_)).Times(1); - EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GoannaContentController::APZStateChange::EndTouch,_)).Times(1); - EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GoannaContentController::APZStateChange::TransformEnd,_)).Times(1); + EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GeckoContentController::APZStateChange::StartTouch,_)).Times(1); + EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GeckoContentController::APZStateChange::TransformBegin,_)).Times(1); + EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GeckoContentController::APZStateChange::StartPanning,_)).Times(1); + EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GeckoContentController::APZStateChange::EndTouch,_)).Times(1); + EXPECT_CALL(*mcc, NotifyAPZStateChange(_,GeckoContentController::APZStateChange::TransformEnd,_)).Times(1); EXPECT_CALL(check, Call("Done")); } diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp index c08d186a04..d400f2c2c4 100644 --- a/gfx/thebes/gfxAndroidPlatform.cpp +++ b/gfx/thebes/gfxAndroidPlatform.cpp @@ -393,7 +393,7 @@ gfxAndroidPlatform::RequiresLinearZoom() // On B2G, we need linear zoom for the browser, but otherwise prefer // the improved glyph spacing that results from respecting the device // pixel resolution for glyph layout (see bug 816614). - return XRE_GetProcessType() == GoannaProcessType_Content && + return XRE_GetProcessType() == GeckoProcessType_Content && ContentChild::GetSingleton()->IsForBrowser(); #endif diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp index 15e12ff1cd..ebda38e93c 100644 --- a/gfx/thebes/gfxContext.cpp +++ b/gfx/thebes/gfxContext.cpp @@ -21,7 +21,7 @@ #include "gfxPattern.h" #include "gfxPlatform.h" #include "gfxTeeSurface.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "gfx2DGlue.h" #include "mozilla/gfx/PathHelpers.h" #include "mozilla/gfx/DrawTargetTiled.h" diff --git a/gfx/thebes/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp index 6eeeb75b43..1b5ab232d1 100644 --- a/gfx/thebes/gfxFT2FontList.cpp +++ b/gfx/thebes/gfxFT2FontList.cpp @@ -631,7 +631,7 @@ public: PL_DHashTableInit(&mMap, &mOps, sizeof(FNCMapEntry), 0); - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default, + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default, "StartupCacheFontNameCache should only be used in chrome " "process"); mCache = mozilla::scache::StartupCache::GetSingleton(); @@ -1165,7 +1165,7 @@ gfxFT2FontList::FindFonts() mCodepointsWithNoFonts.SetRange(0,0x1f); // C0 controls mCodepointsWithNoFonts.SetRange(0x7f,0x9f); // C1 controls - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { // Content process: ask the Chrome process to give us the list InfallibleTArray fonts; mozilla::dom::ContentChild::GetSingleton()->SendReadFontList(&fonts); diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index 23ef6f0b47..111e97690e 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -660,7 +660,7 @@ gfxPlatform::InitLayersIPC() AsyncTransactionTrackersHolder::Initialize(); - if (XRE_GetProcessType() == GoannaProcessType_Default) + if (XRE_GetProcessType() == GeckoProcessType_Default) { mozilla::layers::CompositorParent::StartUp(); #ifndef MOZ_WIDGET_GONK @@ -682,7 +682,7 @@ gfxPlatform::ShutdownLayersIPC() } sLayersIPCIsUp = false; - if (XRE_GetProcessType() == GoannaProcessType_Default) + if (XRE_GetProcessType() == GeckoProcessType_Default) { // This must happen after the shutdown of media and widgets, which // are triggered by the NS_XPCOM_SHUTDOWN_OBSERVER_ID notification. @@ -1008,7 +1008,7 @@ gfxPlatform::ComputeTileSize() { // The tile size should be picked in the parent processes // and sent to the child processes over IPDL GetTileSize. - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { NS_RUNTIMEABORT("wrong process."); } diff --git a/gfx/thebes/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp index 2f387cd1f6..2d14bc8ec4 100644 --- a/gfx/thebes/gfxUtils.cpp +++ b/gfx/thebes/gfxUtils.cpp @@ -26,7 +26,7 @@ #include "nsServiceManagerUtils.h" #include "yuv_convert.h" #include "ycbcr_to_rgb565.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "ImageContainer.h" #include "ImageRegion.h" #include "gfx2DGlue.h" diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 4b9f2aae47..0e25b138e1 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -634,7 +634,7 @@ gfxWindowsPlatform::CreateDevice(nsRefPtr &adapter1, mD2DDevice = cairo_d2d_create_device_from_d3d10device(device); // Setup a pref for future launch optimizaitons when in main process. - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { Preferences::SetInt(kFeatureLevelPref, featureLevelIndex); } } diff --git a/hal/Hal.cpp b/hal/Hal.cpp index 6d0f8a23c4..d189888ae2 100644 --- a/hal/Hal.cpp +++ b/hal/Hal.cpp @@ -81,13 +81,13 @@ AssertMainThread() bool InSandbox() { - return GoannaProcessType_Content == XRE_GetProcessType(); + return GeckoProcessType_Content == XRE_GetProcessType(); } void AssertMainProcess() { - MOZ_ASSERT(GoannaProcessType_Default == XRE_GetProcessType()); + MOZ_ASSERT(GeckoProcessType_Default == XRE_GetProcessType()); } bool diff --git a/image/Decoder.cpp b/image/Decoder.cpp index d59fb71a5e..c886061c17 100644 --- a/image/Decoder.cpp +++ b/image/Decoder.cpp @@ -8,7 +8,7 @@ #include "mozilla/gfx/2D.h" #include "DecodePool.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "imgIContainer.h" #include "nsIConsoleService.h" #include "nsIScriptError.h" diff --git a/image/RasterImage.cpp b/image/RasterImage.cpp index c42e0422cf..1ca1f6bb49 100644 --- a/image/RasterImage.cpp +++ b/image/RasterImage.cpp @@ -50,7 +50,7 @@ #include "mozilla/ClearOnShutdown.h" #include "mozilla/gfx/Scale.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "gfx2DGlue.h" #include "gfxPrefs.h" #include diff --git a/image/decoders/icon/android/nsIconChannel.cpp b/image/decoders/icon/android/nsIconChannel.cpp index dd36a5009f..00ae54539d 100644 --- a/image/decoders/icon/android/nsIconChannel.cpp +++ b/image/decoders/icon/android/nsIconChannel.cpp @@ -80,7 +80,7 @@ moz_icon_to_channel(nsIURI* aURI, const nsACString& aFileExt, *(out++) = height; nsresult rv; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { rv = GetIconForExtension(aFileExt, aIconSize, out); } else { rv = CallRemoteGetIconForExtension(aFileExt, aIconSize, out); diff --git a/image/imgFrame.cpp b/image/imgFrame.cpp index 1175f9977c..c0ec6f22be 100644 --- a/image/imgFrame.cpp +++ b/image/imgFrame.cpp @@ -17,7 +17,7 @@ static bool gDisableOptimize = false; -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/Likely.h" #include "MainThreadUtils.h" #include "mozilla/MemoryReporting.h" diff --git a/ipc/app/MozillaRuntimeMainAndroid.cpp b/ipc/app/MozillaRuntimeMainAndroid.cpp index 7b805f4008..81b89eef5a 100644 --- a/ipc/app/MozillaRuntimeMainAndroid.cpp +++ b/ipc/app/MozillaRuntimeMainAndroid.cpp @@ -17,7 +17,7 @@ main(int argc, char* argv[]) void *mozloader_handle = dlopen("libmozglue.so", RTLD_LAZY); if (!mozloader_handle) { - __android_log_print(ANDROID_LOG_ERROR, "GoannaChildLoad", + __android_log_print(ANDROID_LOG_ERROR, "GeckoChildLoad", "Couldn't load mozloader because %s", dlerror()); return 1; } @@ -26,7 +26,7 @@ main(int argc, char* argv[]) ChildProcessInit_t fChildProcessInit = (ChildProcessInit_t)dlsym(mozloader_handle, "ChildProcessInit"); if (!fChildProcessInit) { - __android_log_print(ANDROID_LOG_ERROR, "GoannaChildLoad", + __android_log_print(ANDROID_LOG_ERROR, "GeckoChildLoad", "Couldn't load cpi_t because %s", dlerror()); return 1; } diff --git a/ipc/chromium/src/base/message_pump_default.cc b/ipc/chromium/src/base/message_pump_default.cc index c22095a67d..0c93f87a97 100644 --- a/ipc/chromium/src/base/message_pump_default.cc +++ b/ipc/chromium/src/base/message_pump_default.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/scoped_nsautorelease_pool.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/BackgroundHangMonitor.h" @@ -56,7 +56,7 @@ void MessagePumpDefault::Run(Delegate* delegate) { PROFILER_LABEL("MessagePump", "Wait", js::ProfileEntry::Category::OTHER); { - GoannaProfilerSleepRAII profiler_sleep; + GeckoProfilerSleepRAII profiler_sleep; event_.Wait(); } } else { @@ -66,7 +66,7 @@ void MessagePumpDefault::Run(Delegate* delegate) { PROFILER_LABEL("MessagePump", "Wait", js::ProfileEntry::Category::OTHER); { - GoannaProfilerSleepRAII profiler_sleep; + GeckoProfilerSleepRAII profiler_sleep; event_.TimedWait(delay); } } else { diff --git a/ipc/chromium/src/base/thread.cc b/ipc/chromium/src/base/thread.cc index bd9c240700..2e8d599fe2 100644 --- a/ipc/chromium/src/base/thread.cc +++ b/ipc/chromium/src/base/thread.cc @@ -7,7 +7,7 @@ #include "base/string_util.h" #include "base/thread_local.h" #include "base/waitable_event.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/IOInterposer.h" #ifdef MOZ_TASK_TRACER diff --git a/ipc/contentproc/plugin-container.cpp b/ipc/contentproc/plugin-container.cpp index 14e4d94207..7e6e9432d9 100644 --- a/ipc/contentproc/plugin-container.cpp +++ b/ipc/contentproc/plugin-container.cpp @@ -182,7 +182,7 @@ content_process_main(int argc, char* argv[]) // For plugins, this is done in PluginProcessChild::Init, as we need to // avoid it for unsupported plugins. See PluginProcessChild::Init for // the details. - if (XRE_GetProcessType() != GoannaProcessType_Plugin) { + if (XRE_GetProcessType() != GeckoProcessType_Plugin) { mozilla::SanitizeEnvironmentVariables(); SetDllDirectory(L""); } @@ -210,7 +210,7 @@ content_process_main(int argc, char* argv[]) // On desktop, the GMPLoader lives in plugin-container, so that its // code can be covered by an EME/GMP vendor's voucher. nsAutoPtr starter(MakeSandboxStarter()); - if (XRE_GetProcessType() == GoannaProcessType_GMPlugin) { + if (XRE_GetProcessType() == GeckoProcessType_GMPlugin) { loader = mozilla::gmp::CreateGMPLoader(starter); } #endif diff --git a/ipc/glue/BackgroundImpl.cpp b/ipc/glue/BackgroundImpl.cpp index 1a7a91d484..13b45da164 100644 --- a/ipc/glue/BackgroundImpl.cpp +++ b/ipc/glue/BackgroundImpl.cpp @@ -9,7 +9,7 @@ #include "BackgroundParentImpl.h" #include "base/process_util.h" #include "FileDescriptor.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "InputStreamUtils.h" #include "mozilla/Assertions.h" #include "mozilla/Atomics.h" @@ -73,7 +73,7 @@ bool IsMainProcess() { static const bool isMainProcess = - XRE_GetProcessType() == GoannaProcessType_Default; + XRE_GetProcessType() == GeckoProcessType_Default; return isMainProcess; } diff --git a/ipc/glue/BackgroundParentImpl.cpp b/ipc/glue/BackgroundParentImpl.cpp index ffdaf9eb15..10ec07c75c 100644 --- a/ipc/glue/BackgroundParentImpl.cpp +++ b/ipc/glue/BackgroundParentImpl.cpp @@ -41,7 +41,7 @@ namespace { void AssertIsInMainProcess() { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); } void diff --git a/ipc/glue/GoannaChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp similarity index 89% rename from ipc/glue/GoannaChildProcessHost.cpp rename to ipc/glue/GeckoChildProcessHost.cpp index c532cf2d69..a2e985040a 100644 --- a/ipc/glue/GoannaChildProcessHost.cpp +++ b/ipc/glue/GeckoChildProcessHost.cpp @@ -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/. */ -#include "GoannaChildProcessHost.h" +#include "GeckoChildProcessHost.h" #include "base/command_line.h" #include "base/string_util.h" @@ -46,7 +46,7 @@ #include "nsNativeCharsetUtils.h" using mozilla::MonitorAutoLock; -using mozilla::ipc::GoannaChildProcessHost; +using mozilla::ipc::GeckoChildProcessHost; #ifdef ANDROID // This is the magic number of a file descriptor @@ -67,25 +67,25 @@ static const bool kLowRightsSubprocesses = static bool ShouldHaveDirectoryService() { - return GoannaProcessType_Default == XRE_GetProcessType(); + return GeckoProcessType_Default == XRE_GetProcessType(); } template<> -struct RunnableMethodTraits +struct RunnableMethodTraits { - static void RetainCallee(GoannaChildProcessHost* obj) { } - static void ReleaseCallee(GoannaChildProcessHost* obj) { } + static void RetainCallee(GeckoChildProcessHost* obj) { } + static void ReleaseCallee(GeckoChildProcessHost* obj) { } }; /*static*/ base::ChildPrivileges -GoannaChildProcessHost::DefaultChildPrivileges() +GeckoChildProcessHost::DefaultChildPrivileges() { return (kLowRightsSubprocesses ? base::PRIVILEGES_UNPRIVILEGED : base::PRIVILEGES_INHERIT); } -GoannaChildProcessHost::GoannaChildProcessHost(GoannaProcessType aProcessType, +GeckoChildProcessHost::GeckoChildProcessHost(GeckoProcessType aProcessType, ChildPrivileges aPrivileges) : ChildProcessHost(RENDER_PROCESS), // FIXME/cjones: we should own this enum mProcessType(aProcessType), @@ -103,15 +103,15 @@ GoannaChildProcessHost::GoannaChildProcessHost(GoannaProcessType aProcessType, , mChildTask(MACH_PORT_NULL) #endif { - MOZ_COUNT_CTOR(GoannaChildProcessHost); + MOZ_COUNT_CTOR(GeckoChildProcessHost); } -GoannaChildProcessHost::~GoannaChildProcessHost() +GeckoChildProcessHost::~GeckoChildProcessHost() { AssertIOThread(); - MOZ_COUNT_DTOR(GoannaChildProcessHost); + MOZ_COUNT_DTOR(GeckoChildProcessHost); if (mChildProcessHandle > 0) ProcessWatcher::EnsureProcessTerminated(mChildProcessHandle @@ -128,7 +128,7 @@ GoannaChildProcessHost::~GoannaChildProcessHost() //static void -GoannaChildProcessHost::GetPathToBinary(FilePath& exePath) +GeckoChildProcessHost::GetPathToBinary(FilePath& exePath) { if (ShouldHaveDirectoryService()) { MOZ_ASSERT(gGREBinPath); @@ -185,7 +185,7 @@ private: }; #endif -nsresult GoannaChildProcessHost::GetArchitecturesForBinary(const char *path, uint32_t *result) +nsresult GeckoChildProcessHost::GetArchitecturesForBinary(const char *path, uint32_t *result) { *result = 0; @@ -233,10 +233,10 @@ nsresult GoannaChildProcessHost::GetArchitecturesForBinary(const char *path, uin #endif } -uint32_t GoannaChildProcessHost::GetSupportedArchitecturesForProcessType(GoannaProcessType type) +uint32_t GeckoChildProcessHost::GetSupportedArchitecturesForProcessType(GeckoProcessType type) { #ifdef MOZ_WIDGET_COCOA - if (type == GoannaProcessType_Plugin) { + if (type == GeckoProcessType_Plugin) { // Cache this, it shouldn't ever change. static uint32_t pluginContainerArchs = 0; @@ -257,17 +257,17 @@ uint32_t GoannaChildProcessHost::GetSupportedArchitecturesForProcessType(GoannaP } void -GoannaChildProcessHost::PrepareLaunch() +GeckoChildProcessHost::PrepareLaunch() { #ifdef XP_WIN - if (mProcessType == GoannaProcessType_Plugin) { + if (mProcessType == GeckoProcessType_Plugin) { InitWindowsGroupID(); } #if defined(MOZ_CONTENT_SANDBOX) // We need to get the pref here as the process is launched off main thread. - if (mProcessType == GoannaProcessType_Content) { + if (mProcessType == GeckoProcessType_Content) { mMoreStrictSandbox = Preferences::GetBool("security.sandbox.windows.content.moreStrict"); mEnableSandboxLogging = @@ -286,7 +286,7 @@ GoannaChildProcessHost::PrepareLaunch() } #ifdef XP_WIN -void GoannaChildProcessHost::InitWindowsGroupID() +void GeckoChildProcessHost::InitWindowsGroupID() { // On Win7+, pass the application user model to the child, so it can // register with it. This insures windows created by the container @@ -307,7 +307,7 @@ void GoannaChildProcessHost::InitWindowsGroupID() #endif bool -GoannaChildProcessHost::SyncLaunch(std::vector aExtraOpts, int aTimeoutMs, base::ProcessArchitecture arch) +GeckoChildProcessHost::SyncLaunch(std::vector aExtraOpts, int aTimeoutMs, base::ProcessArchitecture arch) { PrepareLaunch(); @@ -316,14 +316,14 @@ GoannaChildProcessHost::SyncLaunch(std::vector aExtraOpts, int aTim ioLoop->PostTask(FROM_HERE, NewRunnableMethod(this, - &GoannaChildProcessHost::RunPerformAsyncLaunch, + &GeckoChildProcessHost::RunPerformAsyncLaunch, aExtraOpts, arch)); return WaitUntilConnected(aTimeoutMs); } bool -GoannaChildProcessHost::AsyncLaunch(std::vector aExtraOpts, +GeckoChildProcessHost::AsyncLaunch(std::vector aExtraOpts, base::ProcessArchitecture arch) { PrepareLaunch(); @@ -331,7 +331,7 @@ GoannaChildProcessHost::AsyncLaunch(std::vector aExtraOpts, MessageLoop* ioLoop = XRE_GetIOMessageLoop(); ioLoop->PostTask(FROM_HERE, NewRunnableMethod(this, - &GoannaChildProcessHost::RunPerformAsyncLaunch, + &GeckoChildProcessHost::RunPerformAsyncLaunch, aExtraOpts, arch)); // This may look like the sync launch wait, but we only delay as @@ -345,7 +345,7 @@ GoannaChildProcessHost::AsyncLaunch(std::vector aExtraOpts, } bool -GoannaChildProcessHost::WaitUntilConnected(int32_t aTimeoutMs) +GeckoChildProcessHost::WaitUntilConnected(int32_t aTimeoutMs) { // NB: this uses a different mechanism than the chromium parent // class. @@ -381,14 +381,14 @@ GoannaChildProcessHost::WaitUntilConnected(int32_t aTimeoutMs) } bool -GoannaChildProcessHost::LaunchAndWaitForProcessHandle(StringVector aExtraOpts) +GeckoChildProcessHost::LaunchAndWaitForProcessHandle(StringVector aExtraOpts) { PrepareLaunch(); MessageLoop* ioLoop = XRE_GetIOMessageLoop(); ioLoop->PostTask(FROM_HERE, NewRunnableMethod(this, - &GoannaChildProcessHost::RunPerformAsyncLaunch, + &GeckoChildProcessHost::RunPerformAsyncLaunch, aExtraOpts, base::GetCurrentProcessArchitecture())); MonitorAutoLock lock(mMonitor); @@ -401,7 +401,7 @@ GoannaChildProcessHost::LaunchAndWaitForProcessHandle(StringVector aExtraOpts) } void -GoannaChildProcessHost::InitializeChannel() +GeckoChildProcessHost::InitializeChannel() { CreateChannel(); @@ -411,7 +411,7 @@ GoannaChildProcessHost::InitializeChannel() } void -GoannaChildProcessHost::Join() +GeckoChildProcessHost::Join() { AssertIOThread(); @@ -425,7 +425,7 @@ GoannaChildProcessHost::Join() } void -GoannaChildProcessHost::SetAlreadyDead() +GeckoChildProcessHost::SetAlreadyDead() { if (mChildProcessHandle && mChildProcessHandle != kInvalidProcessHandle) { @@ -435,13 +435,13 @@ GoannaChildProcessHost::SetAlreadyDead() mChildProcessHandle = 0; } -int32_t GoannaChildProcessHost::mChildCounter = 0; +int32_t GeckoChildProcessHost::mChildCounter = 0; // // Wrapper function for handling GECKO_SEPARATE_NSPR_LOGS // bool -GoannaChildProcessHost::PerformAsyncLaunch(std::vector aExtraOpts, base::ProcessArchitecture arch) +GeckoChildProcessHost::PerformAsyncLaunch(std::vector aExtraOpts, base::ProcessArchitecture arch) { // If NSPR log files are not requested, we're done. const char* origLogName = PR_GetEnv("NSPR_LOG_FILE"); @@ -480,7 +480,7 @@ GoannaChildProcessHost::PerformAsyncLaunch(std::vector aExtraOpts, } bool -GoannaChildProcessHost::RunPerformAsyncLaunch(std::vector aExtraOpts, +GeckoChildProcessHost::RunPerformAsyncLaunch(std::vector aExtraOpts, base::ProcessArchitecture aArch) { InitializeChannel(); @@ -522,7 +522,7 @@ AddAppDirToCommandLine(std::vector& aCmdLine) } bool -GoannaChildProcessHost::PerformAsyncLaunchInternal(std::vector& aExtraOpts, base::ProcessArchitecture arch) +GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector& aExtraOpts, base::ProcessArchitecture arch) { // We rely on the fact that InitializeChannel() has already been processed // on the IO thread before this point is reached. @@ -579,7 +579,7 @@ GoannaChildProcessHost::PerformAsyncLaunchInternal(std::vector& aEx } # if (MOZ_WIDGET_GTK == 3) - if (mProcessType == GoannaProcessType_Plugin) { + if (mProcessType == GeckoProcessType_Plugin) { const char *ld_preload = PR_GetEnv("LD_PRELOAD"); nsCString new_ld_preload; @@ -788,7 +788,7 @@ GoannaChildProcessHost::PerformAsyncLaunchInternal(std::vector& aEx // sandboxing in this class at some point. Unfortunately it will take a bit // of reorganizing so I don't think this patch is the right time. switch (mProcessType) { - case GoannaProcessType_Content: + case GeckoProcessType_Content: #if defined(MOZ_CONTENT_SANDBOX) if (!PR_GetEnv("MOZ_DISABLE_CONTENT_SANDBOX")) { mSandboxBroker.SetSecurityLevelForContentProcess(mMoreStrictSandbox); @@ -797,7 +797,7 @@ GoannaChildProcessHost::PerformAsyncLaunchInternal(std::vector& aEx } #endif // MOZ_CONTENT_SANDBOX break; - case GoannaProcessType_Plugin: + case GeckoProcessType_Plugin: if (mSandboxLevel > 0 && !PR_GetEnv("MOZ_DISABLE_NPAPI_SANDBOX")) { mSandboxBroker.SetSecurityLevelForPluginProcess(mSandboxLevel); @@ -805,22 +805,22 @@ GoannaChildProcessHost::PerformAsyncLaunchInternal(std::vector& aEx shouldSandboxCurrentProcess = true; } break; - case GoannaProcessType_IPDLUnitTest: + case GeckoProcessType_IPDLUnitTest: // XXX: We don't sandbox this process type yet // mSandboxBroker.SetSecurityLevelForIPDLUnitTestProcess(); // cmdLine.AppendLooseValue(UTF8ToWide("-sandbox")); // shouldSandboxCurrentProcess = true; break; - case GoannaProcessType_GMPlugin: + case GeckoProcessType_GMPlugin: if (!PR_GetEnv("MOZ_DISABLE_GMP_SANDBOX")) { mSandboxBroker.SetSecurityLevelForGMPlugin(); cmdLine.AppendLooseValue(UTF8ToWide("-sandbox")); shouldSandboxCurrentProcess = true; } break; - case GoannaProcessType_Default: + case GeckoProcessType_Default: default: - MOZ_CRASH("Bad process type in GoannaChildProcessHost"); + MOZ_CRASH("Bad process type in GeckoChildProcessHost"); break; }; @@ -896,7 +896,7 @@ GoannaChildProcessHost::PerformAsyncLaunchInternal(std::vector& aEx } void -GoannaChildProcessHost::OpenPrivilegedHandle(base::ProcessId aPid) +GeckoChildProcessHost::OpenPrivilegedHandle(base::ProcessId aPid) { if (mChildProcessHandle) { MOZ_ASSERT(aPid == base::GetProcId(mChildProcessHandle)); @@ -908,7 +908,7 @@ GoannaChildProcessHost::OpenPrivilegedHandle(base::ProcessId aPid) } void -GoannaChildProcessHost::OnChannelConnected(int32_t peer_pid) +GeckoChildProcessHost::OnChannelConnected(int32_t peer_pid) { OpenPrivilegedHandle(peer_pid); { @@ -919,7 +919,7 @@ GoannaChildProcessHost::OnChannelConnected(int32_t peer_pid) } void -GoannaChildProcessHost::OnMessageReceived(const IPC::Message& aMsg) +GeckoChildProcessHost::OnMessageReceived(const IPC::Message& aMsg) { // We never process messages ourself, just save them up for the next // listener. @@ -927,7 +927,7 @@ GoannaChildProcessHost::OnMessageReceived(const IPC::Message& aMsg) } void -GoannaChildProcessHost::OnChannelError() +GeckoChildProcessHost::OnChannelError() { // Update the process state to an error state if we have a channel // error before we're connected. This fixes certain failures, @@ -942,7 +942,7 @@ GoannaChildProcessHost::OnChannelError() } void -GoannaChildProcessHost::GetQueuedMessages(std::queue& queue) +GeckoChildProcessHost::GetQueuedMessages(std::queue& queue) { // If this is called off the IO thread, bad things will happen. DCHECK(MessageLoopForIO::current()); @@ -951,7 +951,7 @@ GoannaChildProcessHost::GetQueuedMessages(std::queue& queue) } void -GoannaChildProcessHost::OnWaitableEventSignaled(base::WaitableEvent *event) +GeckoChildProcessHost::OnWaitableEventSignaled(base::WaitableEvent *event) { if (mDelegate) { mDelegate->OnWaitableEventSignaled(event); @@ -961,15 +961,15 @@ GoannaChildProcessHost::OnWaitableEventSignaled(base::WaitableEvent *event) #ifdef MOZ_NUWA_PROCESS -using mozilla::ipc::GoannaExistingProcessHost; +using mozilla::ipc::GeckoExistingProcessHost; using mozilla::ipc::FileDescriptor; -GoannaExistingProcessHost:: -GoannaExistingProcessHost(GoannaProcessType aProcessType, +GeckoExistingProcessHost:: +GeckoExistingProcessHost(GeckoProcessType aProcessType, base::ProcessHandle aProcess, const FileDescriptor& aFileDescriptor, ChildPrivileges aPrivileges) - : GoannaChildProcessHost(aProcessType, aPrivileges) + : GeckoChildProcessHost(aProcessType, aPrivileges) , mExistingProcessHandle(aProcess) , mExistingFileDescriptor(aFileDescriptor) { @@ -977,16 +977,16 @@ GoannaExistingProcessHost(GoannaProcessType aProcessType, "Expected file descriptor to be valid"); } -GoannaExistingProcessHost::~GoannaExistingProcessHost() +GeckoExistingProcessHost::~GeckoExistingProcessHost() { - // Bug 943174: If we don't do this, ~GoannaChildProcessHost will try + // Bug 943174: If we don't do this, ~GeckoChildProcessHost will try // to wait on a process that isn't a direct child, and bad things // will happen. SetAlreadyDead(); } bool -GoannaExistingProcessHost::PerformAsyncLaunch(StringVector aExtraOpts, +GeckoExistingProcessHost::PerformAsyncLaunch(StringVector aExtraOpts, base::ProcessArchitecture aArch) { SetHandle(mExistingProcessHandle); @@ -1001,7 +1001,7 @@ GoannaExistingProcessHost::PerformAsyncLaunch(StringVector aExtraOpts, } void -GoannaExistingProcessHost::InitializeChannel() +GeckoExistingProcessHost::InitializeChannel() { CreateChannel(mExistingFileDescriptor); diff --git a/ipc/glue/GoannaChildProcessHost.h b/ipc/glue/GeckoChildProcessHost.h similarity index 92% rename from ipc/glue/GoannaChildProcessHost.h rename to ipc/glue/GeckoChildProcessHost.h index e24e44b1ab..0534c5e46f 100644 --- a/ipc/glue/GoannaChildProcessHost.h +++ b/ipc/glue/GeckoChildProcessHost.h @@ -16,7 +16,7 @@ #include "mozilla/StaticPtr.h" #include "nsCOMPtr.h" -#include "nsXULAppAPI.h" // for GoannaProcessType +#include "nsXULAppAPI.h" // for GeckoProcessType #include "nsString.h" #if defined(XP_WIN) && defined(MOZ_SANDBOX) @@ -28,7 +28,7 @@ class nsIFile; namespace mozilla { namespace ipc { -class GoannaChildProcessHost : public ChildProcessHost +class GeckoChildProcessHost : public ChildProcessHost { protected: typedef mozilla::Monitor Monitor; @@ -40,14 +40,14 @@ public: static ChildPrivileges DefaultChildPrivileges(); - explicit GoannaChildProcessHost(GoannaProcessType aProcessType, + explicit GeckoChildProcessHost(GeckoProcessType aProcessType, ChildPrivileges aPrivileges=base::PRIVILEGES_DEFAULT); - ~GoannaChildProcessHost(); + ~GeckoChildProcessHost(); static nsresult GetArchitecturesForBinary(const char *path, uint32_t *result); - static uint32_t GetSupportedArchitecturesForProcessType(GoannaProcessType type); + static uint32_t GetSupportedArchitecturesForProcessType(GeckoProcessType type); // Block until the IPC channel for our subprocess is initialized, // but no longer. The child process may or may not have been @@ -106,7 +106,7 @@ public: return mChildProcessHandle; } - GoannaProcessType GetProcessType() { + GeckoProcessType GetProcessType() { return mProcessType; } @@ -126,7 +126,7 @@ public: void SetAlreadyDead(); protected: - GoannaProcessType mProcessType; + GeckoProcessType mProcessType; ChildPrivileges mPrivileges; Monitor mMonitor; FilePath mProcessPath; @@ -180,7 +180,7 @@ protected: void OpenPrivilegedHandle(base::ProcessId aPid); private: - DISALLOW_EVIL_CONSTRUCTORS(GoannaChildProcessHost); + DISALLOW_EVIL_CONSTRUCTORS(GeckoChildProcessHost); // Does the actual work for AsyncLaunch, on the IO thread. bool PerformAsyncLaunchInternal(std::vector& aExtraOpts, @@ -202,15 +202,15 @@ private: }; #ifdef MOZ_NUWA_PROCESS -class GoannaExistingProcessHost final : public GoannaChildProcessHost +class GeckoExistingProcessHost final : public GeckoChildProcessHost { public: - GoannaExistingProcessHost(GoannaProcessType aProcessType, + GeckoExistingProcessHost(GeckoProcessType aProcessType, base::ProcessHandle aProcess, const FileDescriptor& aFileDescriptor, ChildPrivileges aPrivileges=base::PRIVILEGES_DEFAULT); - ~GoannaExistingProcessHost(); + ~GeckoExistingProcessHost(); virtual bool PerformAsyncLaunch(StringVector aExtraOpts=StringVector(), base::ProcessArchitecture aArch=base::GetCurrentProcessArchitecture()) override; diff --git a/ipc/glue/InputStreamUtils.cpp b/ipc/glue/InputStreamUtils.cpp index 632085456d..9ef59efe4f 100644 --- a/ipc/glue/InputStreamUtils.cpp +++ b/ipc/glue/InputStreamUtils.cpp @@ -106,7 +106,7 @@ DeserializeInputStream(const InputStreamParams& aParams, // When the input stream already exists in this process, all we need to do // is retrieve the original instead of sending any data over the wire. case InputStreamParams::TRemoteInputStreamParams: { - if (NS_WARN_IF(XRE_GetProcessType() != GoannaProcessType_Default)) { + if (NS_WARN_IF(XRE_GetProcessType() != GeckoProcessType_Default)) { return nullptr; } diff --git a/ipc/glue/ScopedXREEmbed.cpp b/ipc/glue/ScopedXREEmbed.cpp index 7824d9f1c4..342decf42b 100644 --- a/ipc/glue/ScopedXREEmbed.cpp +++ b/ipc/glue/ScopedXREEmbed.cpp @@ -67,7 +67,7 @@ ScopedXREEmbed::Start() NS_ENSURE_TRUE_VOID(localFile); #ifdef OS_MACOSX - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { // We're an XPCOM-using subprocess. Walk out of // [subprocess].app/Contents/MacOS to the real GRE dir. rv = localFile->GetParent(getter_AddRefs(parent)); diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build index 79fb454a41..36bad8765e 100644 --- a/ipc/glue/moz.build +++ b/ipc/glue/moz.build @@ -20,7 +20,7 @@ EXPORTS.mozilla.ipc += [ 'FileDescriptorSetChild.h', 'FileDescriptorSetParent.h', 'FileDescriptorUtils.h', - 'GoannaChildProcessHost.h', + 'GeckoChildProcessHost.h', 'InputStreamUtils.h', 'IOThreadChild.h', 'MessageChannel.h', @@ -118,14 +118,14 @@ UNIFIED_SOURCES += [ 'StringUtil.cpp', ] -# GoannaChildProcessHost.cpp cannot be built in unified mode because it uses plarena.h. +# GeckoChildProcessHost.cpp cannot be built in unified mode because it uses plarena.h. # URIUtils.cpp cannot be built in unified mode because of name clashes on strdup. SOURCES += [ 'BackgroundChildImpl.cpp', 'BackgroundParentImpl.cpp', 'FileDescriptorSetChild.cpp', 'FileDescriptorSetParent.cpp', - 'GoannaChildProcessHost.cpp', + 'GeckoChildProcessHost.cpp', 'URIUtils.cpp', ] diff --git a/ipc/ipdl/ipdl/builtin.py b/ipc/ipdl/ipdl/builtin.py index dfbd2be82d..b141df9fb5 100644 --- a/ipc/ipdl/ipdl/builtin.py +++ b/ipc/ipdl/ipdl/builtin.py @@ -54,5 +54,5 @@ HeaderIncludes = ( CppIncludes = ( 'nsIFile.h', - 'GoannaProfiler.h', + 'GeckoProfiler.h', ) diff --git a/ipc/ipdl/test/cxx/IPDLUnitTestSubprocess.cpp b/ipc/ipdl/test/cxx/IPDLUnitTestSubprocess.cpp index 5e512920c0..87fe0ddc7c 100644 --- a/ipc/ipdl/test/cxx/IPDLUnitTestSubprocess.cpp +++ b/ipc/ipdl/test/cxx/IPDLUnitTestSubprocess.cpp @@ -5,13 +5,13 @@ #include "IPDLUnitTestSubprocess.h" -using mozilla::ipc::GoannaChildProcessHost; +using mozilla::ipc::GeckoChildProcessHost; namespace mozilla { namespace _ipdltest { IPDLUnitTestSubprocess::IPDLUnitTestSubprocess() : - GoannaChildProcessHost(GoannaProcessType_IPDLUnitTest) + GeckoChildProcessHost(GeckoProcessType_IPDLUnitTest) { } diff --git a/ipc/ipdl/test/cxx/IPDLUnitTestSubprocess.h b/ipc/ipdl/test/cxx/IPDLUnitTestSubprocess.h index fe453b0552..cdb212df20 100644 --- a/ipc/ipdl/test/cxx/IPDLUnitTestSubprocess.h +++ b/ipc/ipdl/test/cxx/IPDLUnitTestSubprocess.h @@ -7,13 +7,13 @@ #define mozilla__ipdltest_IPDLUnitTestTestSubprocess_h 1 -#include "mozilla/ipc/GoannaChildProcessHost.h" +#include "mozilla/ipc/GeckoChildProcessHost.h" namespace mozilla { namespace _ipdltest { //----------------------------------------------------------------------------- -class IPDLUnitTestSubprocess : public mozilla::ipc::GoannaChildProcessHost +class IPDLUnitTestSubprocess : public mozilla::ipc::GeckoChildProcessHost { public: IPDLUnitTestSubprocess(); diff --git a/ipc/ipdl/test/cxx/TestSyncHang.cpp b/ipc/ipdl/test/cxx/TestSyncHang.cpp index 5968d180da..2035ac5320 100644 --- a/ipc/ipdl/test/cxx/TestSyncHang.cpp +++ b/ipc/ipdl/test/cxx/TestSyncHang.cpp @@ -1,5 +1,5 @@ #include "TestSyncHang.h" -#include "mozilla/ipc/GoannaChildProcessHost.h" +#include "mozilla/ipc/GeckoChildProcessHost.h" #include "IPDLUnitTests.h" // fail etc. @@ -12,7 +12,7 @@ namespace _ipdltest { //----------------------------------------------------------------------------- // parent -mozilla::ipc::GoannaChildProcessHost* gSyncHangSubprocess; +mozilla::ipc::GeckoChildProcessHost* gSyncHangSubprocess; TestSyncHangParent::TestSyncHangParent() { @@ -44,7 +44,7 @@ TestSyncHangParent::Main() { vector args; args.push_back("fake/path"); - gSyncHangSubprocess = new mozilla::ipc::GoannaChildProcessHost(GoannaProcessType_Plugin); + gSyncHangSubprocess = new mozilla::ipc::GeckoChildProcessHost(GeckoProcessType_Plugin); bool launched = gSyncHangSubprocess->SyncLaunch(args, 2); if (launched) fail("Calling SyncLaunch with an invalid path should return false"); diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp index 3c3950d8ee..f8ed6b47b4 100644 --- a/js/xpconnect/src/XPCJSRuntime.cpp +++ b/js/xpconnect/src/XPCJSRuntime.cpp @@ -45,7 +45,7 @@ #include "nsGlobalWindow.h" #include "nsAboutProtocolUtils.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsIXULRuntime.h" #include "nsJSPrincipals.h" @@ -1389,7 +1389,7 @@ XPCJSRuntime::InterruptCallback(JSContext* cx) if (!nsContentUtils::IsInitialized()) return true; - bool contentProcess = XRE_GetProcessType() == GoannaProcessType_Content; + bool contentProcess = XRE_GetProcessType() == GeckoProcessType_Content; // This is at least the second interrupt callback we've received since // returning to the event loop. See how long it's been, and what the limit @@ -2600,7 +2600,7 @@ ReportJSRuntimeExplicitTreeStats(const JS::RuntimeStats& rtStats, size_t* rtTotalOut) { nsCOMPtr am; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // Only try to access the service from the main process. am = do_GetService("@mozilla.org/addons/integration;1"); } @@ -2856,7 +2856,7 @@ JSReporter::CollectReports(WindowPaths* windowPaths, // stats seems like a bad idea. nsCOMPtr addonManager; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // Only try to access the service from the main process. addonManager = do_GetService("@mozilla.org/addons/integration;1"); } diff --git a/js/xpconnect/wrappers/AccessCheck.cpp b/js/xpconnect/wrappers/AccessCheck.cpp index 1cd36d6014..e4f4d5662a 100644 --- a/js/xpconnect/wrappers/AccessCheck.cpp +++ b/js/xpconnect/wrappers/AccessCheck.cpp @@ -231,7 +231,7 @@ AccessCheck::checkPassToPrivilegedCode(JSContext* cx, HandleObject wrapper, Hand // pass any objects at all to CPOWs. if (mozilla::jsipc::IsWrappedCPOW(obj) && js::GetObjectCompartment(wrapper) == js::GetObjectCompartment(xpc::UnprivilegedJunkScope()) && - XRE_GetProcessType() == GoannaProcessType_Default) + XRE_GetProcessType() == GeckoProcessType_Default) { return true; } diff --git a/js/xpconnect/wrappers/WrapperFactory.cpp b/js/xpconnect/wrappers/WrapperFactory.cpp index 0261fe293a..111b388607 100644 --- a/js/xpconnect/wrappers/WrapperFactory.cpp +++ b/js/xpconnect/wrappers/WrapperFactory.cpp @@ -428,7 +428,7 @@ WrapperFactory::Rewrap(JSContext* cx, HandleObject existing, HandleObject obj) // here, but only in the content process. if ((IdentifyStandardInstance(obj) == JSProto_Function || (jsipc::IsCPOW(obj) && JS::IsCallable(obj) && - XRE_GetProcessType() == GoannaProcessType_Content))) + XRE_GetProcessType() == GeckoProcessType_Content))) { wrapper = &FilteringWrapper::singleton; } diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp index 906edfaf88..4647b5e067 100644 --- a/layout/base/FrameLayerBuilder.cpp +++ b/layout/base/FrameLayerBuilder.cpp @@ -28,7 +28,7 @@ #include "nsImageFrame.h" #include "mozilla/dom/ProfileTimelineMarkerBinding.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/gfx/Tools.h" #include "mozilla/gfx/2D.h" #include "gfxPrefs.h" diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp index 37470e67b0..3a77c84fe2 100644 --- a/layout/base/RestyleManager.cpp +++ b/layout/base/RestyleManager.cpp @@ -14,7 +14,7 @@ #include "nsLayoutUtils.h" #include "AnimationCommon.h" // For GetLayerAnimationInfo #include "FrameLayerBuilder.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsStyleChangeList.h" #include "nsRuleProcessorData.h" #include "nsStyleUtil.h" diff --git a/layout/base/RestyleTracker.cpp b/layout/base/RestyleTracker.cpp index a692aa57ee..914e314387 100644 --- a/layout/base/RestyleTracker.cpp +++ b/layout/base/RestyleTracker.cpp @@ -10,7 +10,7 @@ #include "RestyleTracker.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsFrameManager.h" #include "nsIDocument.h" #include "nsStyleChangeList.h" @@ -311,7 +311,7 @@ RestyleTracker::DoProcessRestyles() } #if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API) - Maybe profilerRAII; + Maybe profilerRAII; if (profiler_feature_active("restyle")) { profilerRAII.emplace("Paint", "Styles", Move(data->mBacktrace)); } @@ -353,7 +353,7 @@ RestyleTracker::DoProcessRestyles() LOG_RESTYLE_INDENT(); #if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API) - Maybe profilerRAII; + Maybe profilerRAII; if (profiler_feature_active("restyle")) { profilerRAII.emplace("Paint", "Styles", Move(currentRestyle->mBacktrace)); } diff --git a/layout/base/RestyleTracker.h b/layout/base/RestyleTracker.h index 5faf162283..b7f1243d9a 100644 --- a/layout/base/RestyleTracker.h +++ b/layout/base/RestyleTracker.h @@ -16,7 +16,7 @@ #include "nsContainerFrame.h" #include "mozilla/SplayTree.h" #include "mozilla/RestyleLogging.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #if defined(MOZ_ENABLE_PROFILER_SPS) #include "ProfilerBacktrace.h" diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp index 10ccdff960..6989ff737a 100644 --- a/layout/base/nsCSSRendering.cpp +++ b/layout/base/nsCSSRendering.cpp @@ -48,7 +48,7 @@ #include "nsSVGEffects.h" #include "nsSVGIntegrationUtils.h" #include "gfxDrawable.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsCSSRenderingBorders.h" #include "mozilla/css/ImageLoader.h" #include "ImageContainer.h" diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/base/nsCSSRenderingBorders.cpp index e511cefce0..13930124f9 100644 --- a/layout/base/nsCSSRenderingBorders.cpp +++ b/layout/base/nsCSSRenderingBorders.cpp @@ -14,7 +14,7 @@ #include "nsLayoutUtils.h" #include "nsStyleConsts.h" #include "nsCSSColorUtils.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsExpirationTracker.h" #include "RoundedRect.h" #include "nsClassHashtable.h" diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index 98b7742f67..c862139c38 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -44,7 +44,7 @@ #include "nsSVGEffects.h" #include "nsSVGElement.h" #include "nsSVGClipPathFrame.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsAnimationManager.h" #include "nsTransitionManager.h" #include "nsViewManager.h" @@ -1742,7 +1742,7 @@ already_AddRefed nsDisplayList::PaintRoot(nsDisplayListBuilder* aB // updates, so calculate that now before we call EndTransaction. if (rootPresContext && aBuilder->WillComputePluginGeometry() && - XRE_GetProcessType() == GoannaProcessType_Content) { + XRE_GetProcessType() == GeckoProcessType_Content) { rootPresContext->ComputePluginGeometryUpdates(aBuilder->RootReferenceFrame(), aBuilder, this); rootPresContext->CollectPluginGeometryUpdates(layerManager); } diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp index 8effc9177f..7b43cffd55 100644 --- a/layout/base/nsFrameManager.cpp +++ b/layout/base/nsFrameManager.cpp @@ -34,7 +34,7 @@ #include "ChildIterator.h" #include "nsFrameManager.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsIStatefulFrame.h" #include "nsContainerFrame.h" diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index b689b2fa7f..f25bd9f150 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -102,7 +102,7 @@ #include "nsXULPopupManager.h" #endif -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsAnimationManager.h" #include "nsTransitionManager.h" #include "RestyleManager.h" @@ -3276,7 +3276,7 @@ nsLayoutUtils::PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFram // except requesting composition. Geometry updates were calculated and // shipped to the chrome process in nsDisplayList when the layer // transaction completed. - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { rootPresContext->ComputePluginGeometryUpdates(aFrame, &builder, &list); // We're not going to get a WillPaintWindow event here if we didn't do // widget invalidation, so just apply the plugin geometry update here diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 29c5b10096..bc87da13ee 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -2760,7 +2760,7 @@ nsPresContext::IsCrossProcessRootContentDocument() return false; } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { return true; } @@ -2896,7 +2896,7 @@ nsRootPresContext::ComputePluginGeometryUpdates(nsIFrame* aFrame, // This is not happening during a paint event. ApplyPluginGeometryUpdates(); #else - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { InitApplyPluginGeometryTimer(); } #endif diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index af5f081420..82d8e35a35 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -157,7 +157,7 @@ #endif -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "gfxPlatform.h" #include "Layers.h" #include "LayerTreeInvalidation.h" @@ -4899,7 +4899,7 @@ PresShell::RenderDocument(const nsRect& aRect, uint32_t aFlags, // taking snapshots. if (layerManager && (!layerManager->AsClientLayerManager() || - XRE_GetProcessType() == GoannaProcessType_Default)) { + XRE_GetProcessType() == GeckoProcessType_Default)) { flags |= nsLayoutUtils::PAINT_WIDGET_LAYERS; } } @@ -5493,7 +5493,7 @@ void PresShell::UpdateCanvasBackground() if (!FrameConstructor()->GetRootElementFrame()) { mCanvasBackgroundColor = GetDefaultBackgroundColorToDraw(); } - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { if (TabChild* tabChild = TabChild::GetFrom(this)) { tabChild->SetBackgroundColor(mCanvasBackgroundColor); } @@ -6187,7 +6187,7 @@ public: } ~AutoUpdateHitRegion() { - if (XRE_GetProcessType() != GoannaProcessType_Content || + if (XRE_GetProcessType() != GeckoProcessType_Content || !mFrame || !mShell) { return; } @@ -10997,7 +10997,7 @@ nsIPresShell::RecomputeFontSizeInflationEnabled() mFontSizeInflationEnabled = false; return; } - } else if (XRE_GetProcessType() == GoannaProcessType_Default) { + } else if (XRE_GetProcessType() == GeckoProcessType_Default) { // We're in the master process. Cancel inflation if it's been // explicitly disabled. if (FontSizeInflationDisabledInMasterProcess()) { diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp index e07ca40c31..ffa53fed6d 100644 --- a/layout/base/nsRefreshDriver.cpp +++ b/layout/base/nsRefreshDriver.cpp @@ -41,7 +41,7 @@ #include "mozilla/PendingPlayerTracker.h" #include "mozilla/Preferences.h" #include "nsViewManager.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsNPAPIPluginInstance.h" #include "nsPerformance.h" #include "mozilla/dom/WindowBinding.h" diff --git a/layout/base/nsRefreshDriver.h b/layout/base/nsRefreshDriver.h index 7ce8f76dac..e001e7fa38 100644 --- a/layout/base/nsRefreshDriver.h +++ b/layout/base/nsRefreshDriver.h @@ -21,7 +21,7 @@ #include "nsHashKeys.h" #include "mozilla/Attributes.h" #include "mozilla/Maybe.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/layers/TransactionIdAllocator.h" class nsPresContext; diff --git a/layout/base/nsStyleSheetService.cpp b/layout/base/nsStyleSheetService.cpp index a2dd92d5fc..a09405ba55 100644 --- a/layout/base/nsStyleSheetService.cpp +++ b/layout/base/nsStyleSheetService.cpp @@ -101,7 +101,7 @@ nsStyleSheetService::Init() // SVGDocument::EnsureNonSVGUserAgentStyleSheetsLoaded should be updated too. // Child processes get their style sheets from the ContentParent. - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return NS_OK; } @@ -156,7 +156,7 @@ nsStyleSheetService::LoadAndRegisterSheet(nsIURI *aSheetURI, serv->NotifyObservers(sheets[sheets.Count() - 1], message, nullptr); } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsTArray children; dom::ContentParent::GetAll(children); @@ -265,7 +265,7 @@ nsStyleSheetService::UnregisterSheet(nsIURI *aSheetURI, uint32_t aSheetType) if (serv) serv->NotifyObservers(sheet, message, nullptr); - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsTArray children; dom::ContentParent::GetAll(children); diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index 0a969463d4..50c8b6206a 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -173,7 +173,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLEditor) class nsIDocumentLoaderFactory; -#define PRODUCT_NAME "Goanna" +#define PRODUCT_NAME "Gecko" /* 0ddf4df8-4dbb-4133-8b79-9afb966514f5 */ #define NS_PLUGINDOCLOADERFACTORY_CID \ @@ -266,7 +266,7 @@ using mozilla::dom::TCPServerSocketChild; using mozilla::dom::UDPSocketChild; using mozilla::dom::time::TimeService; using mozilla::net::StreamingProtocolControllerService; -using mozilla::gmp::GoannaMediaPluginService; +using mozilla::gmp::GeckoMediaPluginService; // Transformiix /* 5d5d92cd-6bf8-11d9-bf4a-000a95dc234c */ @@ -638,7 +638,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(TCPSocketParent) NS_GENERIC_FACTORY_CONSTRUCTOR(TCPServerSocketChild) NS_GENERIC_FACTORY_CONSTRUCTOR(UDPSocketChild) -NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(GoannaMediaPluginService, GoannaMediaPluginService::GetGoannaMediaPluginService) +NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(GeckoMediaPluginService, GeckoMediaPluginService::GetGeckoMediaPluginService) #ifdef ACCESSIBILITY #include "nsAccessibilityService.h" @@ -1099,7 +1099,7 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = { { &kTCPSOCKETPARENT_CID, false, nullptr, TCPSocketParentConstructor }, { &kTCPSERVERSOCKETCHILD_CID, false, nullptr, TCPServerSocketChildConstructor }, { &kUDPSOCKETCHILD_CID, false, nullptr, UDPSocketChildConstructor }, - { &kGECKO_MEDIA_PLUGIN_SERVICE_CID, true, nullptr, GoannaMediaPluginServiceConstructor }, + { &kGECKO_MEDIA_PLUGIN_SERVICE_CID, true, nullptr, GeckoMediaPluginServiceConstructor }, { &kNS_TIMESERVICE_CID, false, nullptr, nsITimeServiceConstructor }, { &kNS_MEDIASTREAMCONTROLLERSERVICE_CID, false, nullptr, nsIStreamingProtocolControllerServiceConstructor }, #ifdef MOZ_WIDGET_GONK @@ -1277,7 +1277,7 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = { { TV_TUNER_DATA_CONTRACTID, &kTV_TUNER_DATA_CID }, { TV_CHANNEL_DATA_CONTRACTID, &kTV_CHANNEL_DATA_CID }, { TV_PROGRAM_DATA_CONTRACTID, &kTV_PROGRAM_DATA_CID }, - { "@mozilla.org/goanna-media-plugin-service;1", &kGECKO_MEDIA_PLUGIN_SERVICE_CID }, + { "@mozilla.org/gecko-media-plugin-service;1", &kGECKO_MEDIA_PLUGIN_SERVICE_CID }, { NS_MOBILE_CONNECTION_SERVICE_CONTRACTID, &kNS_MOBILE_CONNECTION_SERVICE_CID }, { NS_VOICEMAIL_SERVICE_CONTRACTID, &kNS_VOICEMAIL_SERVICE_CID }, { PRESENTATION_DEVICE_MANAGER_CONTRACTID, &kPRESENTATION_DEVICE_MANAGER_CID }, diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 856836e96b..26e08ed604 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -1809,7 +1809,7 @@ nsListControlFrame::MouseDown(nsIDOMEvent* aMouseEvent) } else { // NOTE: the combo box is responsible for dropping it down if (mComboboxFrame) { - if (XRE_GetProcessType() == GoannaProcessType_Content && + if (XRE_GetProcessType() == GeckoProcessType_Content && Preferences::GetBool("browser.tabs.remote.desktopbehavior", false)) { nsContentUtils::DispatchChromeEvent(mContent->OwnerDoc(), mContent, NS_LITERAL_STRING("mozshowdropdown"), true, diff --git a/layout/generic/nsPluginFrame.cpp b/layout/generic/nsPluginFrame.cpp index 64be0bf7c6..2018164130 100644 --- a/layout/generic/nsPluginFrame.cpp +++ b/layout/generic/nsPluginFrame.cpp @@ -38,7 +38,7 @@ #include "nsLayoutUtils.h" #include "nsFrameManager.h" #include "nsIObserverService.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include #include "nsIObjectFrame.h" @@ -417,7 +417,7 @@ nsPluginFrame::GetWidgetConfiguration(nsTArray* aConfi configuration->mBounds = mNextConfigurationBounds; configuration->mClipRegion = mNextConfigurationClipRegion; #if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { configuration->mWindowID = (uintptr_t)mWidget->GetNativeData(NS_NATIVE_PLUGIN_PORT); configuration->mVisible = mWidget->IsVisible(); } diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp index 7cd8fef4c5..679696c0fe 100644 --- a/layout/generic/nsTextFrame.cpp +++ b/layout/generic/nsTextFrame.cpp @@ -74,7 +74,7 @@ #include "mozilla/dom/Element.h" #include "mozilla/LookAndFeel.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #ifdef DEBUG #undef NOISY_REFLOW diff --git a/layout/generic/nsViewportFrame.cpp b/layout/generic/nsViewportFrame.cpp index c7629fe3bc..dbc7f7dca9 100644 --- a/layout/generic/nsViewportFrame.cpp +++ b/layout/generic/nsViewportFrame.cpp @@ -13,7 +13,7 @@ #include "nsIScrollableFrame.h" #include "nsSubDocumentFrame.h" #include "nsAbsoluteContainingBlock.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" using namespace mozilla; diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp index 42187ffed3..fe45763c2e 100644 --- a/layout/ipc/RenderFrameParent.cpp +++ b/layout/ipc/RenderFrameParent.cpp @@ -84,7 +84,7 @@ GetFrom(nsFrameLoader* aFrameLoader) return nsContentUtils::LayerManagerForDocument(doc); } -class RemoteContentController : public GoannaContentController { +class RemoteContentController : public GeckoContentController { public: explicit RemoteContentController(RenderFrameParent* aRenderFrame) : mUILoop(MessageLoop::current()) @@ -321,7 +321,7 @@ RenderFrameParent::RenderFrameParent(nsFrameLoader* aFrameLoader, *aTextureFactoryIdentifier = TextureFactoryIdentifier(); } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // Our remote frame will push layers updates to the compositor, // and we'll keep an indirect reference to that tree. *aId = mLayersId = CompositorParent::AllocateLayerTreeId(); @@ -334,7 +334,7 @@ RenderFrameParent::RenderFrameParent(nsFrameLoader* aFrameLoader, mContentController = new RemoteContentController(this); CompositorParent::SetControllerForLayerTree(mLayersId, mContentController); } - } else if (XRE_GetProcessType() == GoannaProcessType_Content) { + } else if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild::GetSingleton()->SendAllocateLayerTreeId(aId); mLayersId = *aId; CompositorChild::Get()->SendNotifyChildCreated(mLayersId); @@ -442,7 +442,7 @@ void RenderFrameParent::ActorDestroy(ActorDestroyReason why) { if (mLayersId != 0) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild::GetSingleton()->SendDeallocateLayerTreeId(mLayersId); } else { CompositorParent::DeallocateLayerTreeId(mLayersId); diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp index f08a426efd..70a7f5e0f4 100644 --- a/layout/style/nsStyleContext.cpp +++ b/layout/style/nsStyleContext.cpp @@ -20,7 +20,7 @@ #include "nsRuleNode.h" #include "nsStyleContext.h" #include "mozilla/StyleAnimationValue.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsIDocument.h" #include "nsPrintfCString.h" diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp index 8f3d505f96..37f97455da 100644 --- a/layout/style/nsStyleSet.cpp +++ b/layout/style/nsStyleSet.cpp @@ -30,7 +30,7 @@ #include "nsAnimationManager.h" #include "nsStyleSheetService.h" #include "mozilla/dom/Element.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsHTMLCSSStyleSheet.h" #include "nsHTMLStyleSheet.h" #include "SVGAttrAnimationRuleProcessor.h" diff --git a/media/mtransport/nr_socket_prsock.cpp b/media/mtransport/nr_socket_prsock.cpp index d06d50120e..04bad9d39d 100644 --- a/media/mtransport/nr_socket_prsock.cpp +++ b/media/mtransport/nr_socket_prsock.cpp @@ -1166,7 +1166,7 @@ int nr_socket_local_create(nr_transport_addr *addr, nr_socket **sockp) { RefPtr sock; // create IPC bridge for content process - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { sock = new NrSocket(); } else { nsCOMPtr main_thread; diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp index 97b4c5ca6c..c1b9667968 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp @@ -341,10 +341,10 @@ static void GMPReady() { void PeerConnectionCtx::initGMP() { - mGMPService = do_GetService("@mozilla.org/goanna-media-plugin-service;1"); + mGMPService = do_GetService("@mozilla.org/gecko-media-plugin-service;1"); if (!mGMPService) { - CSFLogError(logTag, "%s failed to get the goanna-media-plugin-service", + CSFLogError(logTag, "%s failed to get the gecko-media-plugin-service", __FUNCTION__); return; } @@ -355,7 +355,7 @@ void PeerConnectionCtx::initGMP() if (NS_FAILED(rv)) { mGMPService = nullptr; CSFLogError(logTag, - "%s failed to get the goanna-media-plugin thread, err=%u", + "%s failed to get the gecko-media-plugin thread, err=%u", __FUNCTION__, static_cast(rv)); return; diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp index fa519e295c..afdf52bd8b 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp @@ -269,7 +269,7 @@ static nsresult InitNSSInContent() { NS_ENSURE_TRUE(NS_IsMainThread(), NS_ERROR_NOT_SAME_THREAD); - if (XRE_GetProcessType() != GoannaProcessType_Content) { + if (XRE_GetProcessType() != GeckoProcessType_Content) { MOZ_ASSERT_UNREACHABLE("Must be called in content process"); return NS_ERROR_FAILURE; } @@ -602,7 +602,7 @@ PeerConnectionImpl::AddIceServer(const RTCIceServer &aServer, // Bug 1039655 - TURN TCP is not e10s ready if ((transport == kNrIceTransportTcp) && - (XRE_GetProcessType() != GoannaProcessType_Default)) { + (XRE_GetProcessType() != GeckoProcessType_Default)) { continue; } @@ -649,7 +649,7 @@ PeerConnectionImpl::Initialize(PeerConnectionObserver& aObserver, // Initialize NSS if we are in content process. For chrome process, NSS should already // been initialized. - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // This code interferes with the C++ unit test startup code. nsCOMPtr nssDummy = do_GetService("@mozilla.org/psm;1", &res); NS_ENSURE_SUCCESS(res, res); diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 6068f91d36..5bbcf26f4b 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -127,7 +127,7 @@ @BINPATH@/components/compartments.xpt @BINPATH@/components/composer.xpt @BINPATH@/components/content_events.xpt -@BINPATH@/components/content_goannamediaplugins.xpt +@BINPATH@/components/content_geckomediaplugins.xpt @BINPATH@/components/content_html.xpt @BINPATH@/components/content_webrtc.xpt @BINPATH@/components/content_xslt.xpt @@ -492,7 +492,7 @@ @BINPATH@/@PREF_DIR@/mobile.js @BINPATH@/@PREF_DIR@/mobile-branding.js @BINPATH@/@PREF_DIR@/channel-prefs.js -@BINPATH@/goanna.js +@BINPATH@/gecko.js @BINPATH@/defaults/autoconfig/platform.js @BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/defaults/profile/prefs.js diff --git a/modules/libjar/nsJARProtocolHandler.cpp b/modules/libjar/nsJARProtocolHandler.cpp index 46ae9d15b0..eb789ee6ef 100644 --- a/modules/libjar/nsJARProtocolHandler.cpp +++ b/modules/libjar/nsJARProtocolHandler.cpp @@ -32,7 +32,7 @@ static NS_DEFINE_CID(kZipReaderCacheCID, NS_ZIPREADERCACHE_CID); nsJARProtocolHandler *gJarHandler = nullptr; nsJARProtocolHandler::nsJARProtocolHandler() -: mIsMainProcess(XRE_GetProcessType() == GoannaProcessType_Default) +: mIsMainProcess(XRE_GetProcessType() == GeckoProcessType_Default) { MOZ_ASSERT(NS_IsMainThread()); } diff --git a/modules/libpref/Makefile.in b/modules/libpref/Makefile.in index f8965daafa..4caefab779 100644 --- a/modules/libpref/Makefile.in +++ b/modules/libpref/Makefile.in @@ -9,7 +9,7 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \ mailnews.js editor.js \ aix.js unix.js winpref.js) -GARBAGE += goanna.js +GARBAGE += gecko.js # TODO bug 813259 external files should be defined near their location in the source tree. grepref_files = $(topsrcdir)/netwerk/base/security-prefs.js $(srcdir)/init/all.js @@ -26,8 +26,8 @@ grepref_files += $(topsrcdir)/mobile/android/chrome/content/healthreport-prefs.j endif endif -goanna.js: $(grepref_files) +gecko.js: $(grepref_files) $(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ -o $@) -libs:: goanna.js +libs:: gecko.js $(INSTALL) $^ $(DIST)/bin/ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp index 11acbf78d6..734b2bbe84 100644 --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp @@ -50,7 +50,7 @@ #ifdef DEBUG #define ENSURE_MAIN_PROCESS(message, pref) do { \ - if (MOZ_UNLIKELY(XRE_GetProcessType() != GoannaProcessType_Default)) { \ + if (MOZ_UNLIKELY(XRE_GetProcessType() != GeckoProcessType_Default)) { \ nsPrintfCString msg("ENSURE_MAIN_PROCESS failed. %s %s", message, pref); \ NS_WARNING(msg.get()); \ return NS_ERROR_NOT_AVAILABLE; \ @@ -58,7 +58,7 @@ } while (0); #else #define ENSURE_MAIN_PROCESS(message, pref) \ - if (MOZ_UNLIKELY(XRE_GetProcessType() != GoannaProcessType_Default)) { \ + if (MOZ_UNLIKELY(XRE_GetProcessType() != GeckoProcessType_Default)) { \ return NS_ERROR_NOT_AVAILABLE; \ } #endif @@ -530,7 +530,7 @@ Preferences::Init() NS_ENSURE_SUCCESS(rv, rv); using mozilla::dom::ContentChild; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { InfallibleTArray prefs; ContentChild::GetSingleton()->SendReadPrefsArray(&prefs); @@ -581,7 +581,7 @@ NS_IMETHODIMP Preferences::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *someData) { - if (XRE_GetProcessType() == GoannaProcessType_Content) + if (XRE_GetProcessType() == GeckoProcessType_Content) return NS_ERROR_NOT_AVAILABLE; nsresult rv = NS_OK; @@ -606,7 +606,7 @@ Preferences::Observe(nsISupports *aSubject, const char *aTopic, NS_IMETHODIMP Preferences::ReadUserPrefs(nsIFile *aFile) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { NS_ERROR("cannot load prefs from content process"); return NS_ERROR_NOT_AVAILABLE; } @@ -636,7 +636,7 @@ Preferences::ReadUserPrefs(nsIFile *aFile) NS_IMETHODIMP Preferences::ResetPrefs() { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { NS_ERROR("cannot reset prefs from content process"); return NS_ERROR_NOT_AVAILABLE; } @@ -653,7 +653,7 @@ Preferences::ResetPrefs() NS_IMETHODIMP Preferences::ResetUserPrefs() { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { NS_ERROR("cannot reset user prefs from content process"); return NS_ERROR_NOT_AVAILABLE; } @@ -665,7 +665,7 @@ Preferences::ResetUserPrefs() NS_IMETHODIMP Preferences::SavePrefFile(nsIFile *aFile) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { NS_ERROR("cannot save pref file from content process"); return NS_ERROR_NOT_AVAILABLE; } @@ -1214,10 +1214,10 @@ static nsresult pref_InitInitialObjects() nsresult rv; // In omni.jar case, we load the following prefs: - // - jar:$gre/omni.jar!/goanna.js + // - jar:$gre/omni.jar!/gecko.js // - jar:$gre/omni.jar!/defaults/pref/*.js // In non omni.jar case, we load: - // - $gre/goanna.js + // - $gre/gecko.js // // In both cases, we also load: // - $gre/defaults/pref/*.js @@ -1244,8 +1244,8 @@ static nsresult pref_InitInitialObjects() nsRefPtr jarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE); if (jarReader) { - // Load jar:$gre/omni.jar!/goanna.js - rv = pref_ReadPrefFromJar(jarReader, "goanna.js"); + // Load jar:$gre/omni.jar!/gecko.js + rv = pref_ReadPrefFromJar(jarReader, "gecko.js"); NS_ENSURE_SUCCESS(rv, rv); // Load jar:$gre/omni.jar!/defaults/pref/*.js @@ -1264,12 +1264,12 @@ static nsresult pref_InitInitialObjects() NS_WARNING("Error parsing preferences."); } } else { - // Load $gre/goanna.js + // Load $gre/gecko.js nsCOMPtr greprefsFile; rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greprefsFile)); NS_ENSURE_SUCCESS(rv, rv); - rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("goanna.js")); + rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("gecko.js")); NS_ENSURE_SUCCESS(rv, rv); rv = openPrefFile(greprefsFile); diff --git a/modules/libpref/nsPrefBranch.cpp b/modules/libpref/nsPrefBranch.cpp index fe97b3401f..4287badb4e 100644 --- a/modules/libpref/nsPrefBranch.cpp +++ b/modules/libpref/nsPrefBranch.cpp @@ -58,7 +58,7 @@ using mozilla::dom::ContentChild; static ContentChild* GetContentChild() { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cpc = ContentChild::GetSingleton(); if (!cpc) { NS_RUNTIMEABORT("Content Protocol is NULL! We're going to crash!"); diff --git a/mozglue/android/APKOpen.cpp b/mozglue/android/APKOpen.cpp index 6bc38610bb..c966e1ea24 100644 --- a/mozglue/android/APKOpen.cpp +++ b/mozglue/android/APKOpen.cpp @@ -407,7 +407,7 @@ Java_org_mozilla_goanna_mozglue_GoannaLoader_nativeRun(JNIEnv *jenv, jclass jc, free(args); } -typedef int GoannaProcessType; +typedef int GeckoProcessType; extern "C" NS_EXPORT mozglueresult ChildProcessInit(int argc, char* argv[]) diff --git a/netwerk/base/nsBaseChannel.cpp b/netwerk/base/nsBaseChannel.cpp index 1418ed616b..08cb7d8b07 100644 --- a/netwerk/base/nsBaseChannel.cpp +++ b/netwerk/base/nsBaseChannel.cpp @@ -294,7 +294,7 @@ nsBaseChannel::ClassifyURI() { // For channels created in the child process, delegate to the parent to // classify URIs. - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return; } diff --git a/netwerk/base/nsChannelClassifier.cpp b/netwerk/base/nsChannelClassifier.cpp index f7905a95a1..98802deac9 100644 --- a/netwerk/base/nsChannelClassifier.cpp +++ b/netwerk/base/nsChannelClassifier.cpp @@ -63,7 +63,7 @@ nsChannelClassifier::ShouldEnableTrackingProtection(nsIChannel *aChannel, bool *result) { // Should only be called in the parent process. - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); NS_ENSURE_ARG(result); *result = false; @@ -237,7 +237,7 @@ nsresult nsChannelClassifier::StartInternal() { // Should only be called in the parent process. - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); // Don't bother to run the classifier on a load that has already failed. // (this might happen after a redirect) @@ -350,7 +350,7 @@ void nsChannelClassifier::MarkEntryClassified(nsresult status) { // Should only be called in the parent process. - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); // Don't cache tracking classifications because we support allowlisting. if (status == NS_ERROR_TRACKING_URI || mIsAllowListed) { @@ -382,7 +382,7 @@ bool nsChannelClassifier::HasBeenClassified(nsIChannel *aChannel) { // Should only be called in the parent process. - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); nsCOMPtr cachingChannel = do_QueryInterface(aChannel); @@ -480,7 +480,7 @@ NS_IMETHODIMP nsChannelClassifier::OnClassifyComplete(nsresult aErrorCode) { // Should only be called in the parent process. - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); LOG(("nsChannelClassifier[%p]:OnClassifyComplete %d", this, aErrorCode)); if (mSuspendedChannel) { diff --git a/netwerk/base/nsFileStreams.cpp b/netwerk/base/nsFileStreams.cpp index 0ecd103f43..54a601d17a 100644 --- a/netwerk/base/nsFileStreams.cpp +++ b/netwerk/base/nsFileStreams.cpp @@ -622,7 +622,7 @@ nsFileInputStream::Deserialize(const InputStreamParams& aParams, mBehaviorFlags = params.behaviorFlags(); - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { // A child process shouldn't close when it reads the end because it will // not be able to reopen the file later. mBehaviorFlags &= ~nsIFileInputStream::CLOSE_ON_EOF; diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp index 77e365411d..5470b8e3dd 100644 --- a/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp @@ -271,7 +271,7 @@ nsIOService::InitializeNetworkLinkService() } // go into managed mode if we can, and chrome process - if (XRE_GetProcessType() == GoannaProcessType_Default) + if (XRE_GetProcessType() == GeckoProcessType_Default) { mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID, &rv); } @@ -843,7 +843,7 @@ nsIOService::SetOffline(bool offline) NS_ASSERTION(observerService, "The observer service should not be null"); - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { if (observerService) { (void)observerService->NotifyObservers(nullptr, NS_IPC_IOSERVICE_SET_OFFLINE_TOPIC, offline ? diff --git a/netwerk/base/nsInputStreamPump.cpp b/netwerk/base/nsInputStreamPump.cpp index f48caab3fb..83e789401e 100644 --- a/netwerk/base/nsInputStreamPump.cpp +++ b/netwerk/base/nsInputStreamPump.cpp @@ -13,7 +13,7 @@ #include "nsThreadUtils.h" #include "nsCOMPtr.h" #include "prlog.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsIStreamListener.h" #include "nsILoadGroup.h" #include "nsNetCID.h" diff --git a/netwerk/base/nsStreamLoader.cpp b/netwerk/base/nsStreamLoader.cpp index e4799ee12b..e91f478b28 100644 --- a/netwerk/base/nsStreamLoader.cpp +++ b/netwerk/base/nsStreamLoader.cpp @@ -7,7 +7,7 @@ #include "nsIInputStream.h" #include "nsIChannel.h" #include "nsError.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include diff --git a/netwerk/ipc/NeckoCommon.h b/netwerk/ipc/NeckoCommon.h index 8ef0354020..81ff7c4f16 100644 --- a/netwerk/ipc/NeckoCommon.h +++ b/netwerk/ipc/NeckoCommon.h @@ -94,7 +94,7 @@ IsNeckoChild() // TODO: Remove eventually when no longer supported (bug 571126) const char * e = PR_GetEnv("NECKO_SEPARATE_STACKS"); if (!e) - amChild = (XRE_GetProcessType() == GoannaProcessType_Content); + amChild = (XRE_GetProcessType() == GeckoProcessType_Content); didCheck = true; } return amChild; diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp index 3bff8ef73a..2fb30e1f5b 100644 --- a/netwerk/ipc/NeckoParent.cpp +++ b/netwerk/ipc/NeckoParent.cpp @@ -766,7 +766,7 @@ NeckoParent::NestedFrameAuthPrompt::AsyncPromptAuth( nsIAuthInformation* aInfo, nsICancelable**) { static uint64_t callbackId = 0; - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); nsCOMPtr uri; nsresult rv = aChannel->GetURI(getter_AddRefs(uri)); NS_ENSURE_SUCCESS(rv, rv); diff --git a/netwerk/protocol/app/AppProtocolHandler.cpp b/netwerk/protocol/app/AppProtocolHandler.cpp index 29a49490c2..1ced439b04 100644 --- a/netwerk/protocol/app/AppProtocolHandler.cpp +++ b/netwerk/protocol/app/AppProtocolHandler.cpp @@ -441,7 +441,7 @@ AppProtocolHandler::NewChannel2(nsIURI* aUri, } bool noRemote = (appInfo->mIsCoreApp || - XRE_GetProcessType() == GoannaProcessType_Default); + XRE_GetProcessType() == GeckoProcessType_Default); // In-parent and CoreApps can directly access files, so use jar:file:// nsAutoCString jarSpec(noRemote ? "jar:file://" diff --git a/netwerk/protocol/device/AndroidCaptureProvider.cpp b/netwerk/protocol/device/AndroidCaptureProvider.cpp index 23dea1c440..dd18f6c672 100644 --- a/netwerk/protocol/device/AndroidCaptureProvider.cpp +++ b/netwerk/protocol/device/AndroidCaptureProvider.cpp @@ -38,7 +38,7 @@ AndroidCameraInputStream::~AndroidCameraInputStream() { NS_IMETHODIMP AndroidCameraInputStream::Init(nsACString& aContentType, nsCaptureParams* aParams) { - if (XRE_GetProcessType() != GoannaProcessType_Default) + if (XRE_GetProcessType() != GeckoProcessType_Default) return NS_ERROR_NOT_IMPLEMENTED; mContentType = aContentType; diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 3b148ef4cc..f0614be69d 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -2134,7 +2134,7 @@ HttpBaseChannel::AddCookiesToRequest() } bool useCookieService = - (XRE_GetProcessType() == GoannaProcessType_Default); + (XRE_GetProcessType() == GeckoProcessType_Default); nsXPIDLCString cookie; if (useCookieService) { nsICookieService *cs = gHttpHandler->GetCookieService(); diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp index dc930b7232..348b510444 100644 --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -152,7 +152,7 @@ HttpChannelParent::GetInterface(const nsIID& aIID, void **result) } // Only support nsIAuthPromptProvider in Content process - if (XRE_GetProcessType() == GoannaProcessType_Default && + if (XRE_GetProcessType() == GeckoProcessType_Default && aIID.Equals(NS_GET_IID(nsIAuthPromptProvider))) { *result = nullptr; return NS_OK; diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 53b2761fb2..688f3f1ab7 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -37,7 +37,7 @@ #include "nsError.h" #include "nsPrintfCString.h" #include "nsAlgorithm.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsIConsoleService.h" #include "mozilla/Attributes.h" #include "mozilla/Preferences.h" diff --git a/netwerk/protocol/res/nsResProtocolHandler.cpp b/netwerk/protocol/res/nsResProtocolHandler.cpp index 97788082f2..6466ed51cf 100644 --- a/netwerk/protocol/res/nsResProtocolHandler.cpp +++ b/netwerk/protocol/res/nsResProtocolHandler.cpp @@ -324,7 +324,7 @@ nsResProtocolHandler::AllowPort(int32_t port, const char *scheme, bool *_retval) static void SendResourceSubstitution(const nsACString& root, nsIURI* baseURI) { - if (GoannaProcessType_Content == XRE_GetProcessType()) { + if (GeckoProcessType_Content == XRE_GetProcessType()) { return; } diff --git a/parser/html/nsHtml5StreamParser.cpp b/parser/html/nsHtml5StreamParser.cpp index 4265d2535c..6eab162e1d 100644 --- a/parser/html/nsHtml5StreamParser.cpp +++ b/parser/html/nsHtml5StreamParser.cpp @@ -947,7 +947,7 @@ nsHtml5StreamParser::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext) if (NS_FAILED(rv)) { // for now skip warning if we're on child process, since we don't support // off-main thread delivery there yet. This will change with bug 1015466 - if (XRE_GetProcessType() != GoannaProcessType_Content) { + if (XRE_GetProcessType() != GeckoProcessType_Content) { NS_WARNING("Failed to retarget HTML data delivery to the parser thread."); } } diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp index 1db9d1c1ad..5de31464ab 100644 --- a/parser/html/nsHtml5TreeOpExecutor.cpp +++ b/parser/html/nsHtml5TreeOpExecutor.cpp @@ -24,7 +24,7 @@ #include "nsHtml5TreeBuilder.h" #include "nsHtml5StreamParser.h" #include "mozilla/css/Loader.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsIScriptError.h" #include "nsIScriptContext.h" #include "mozilla/Preferences.h" diff --git a/python/mozbuild/mozpack/packager/formats.py b/python/mozbuild/mozpack/packager/formats.py index ae06db4ce7..39a46b622e 100644 --- a/python/mozbuild/mozpack/packager/formats.py +++ b/python/mozbuild/mozpack/packager/formats.py @@ -286,7 +286,7 @@ class OmniJarFormatter(JarFormatter): path[1] in ['pref', 'preferences']) return path[0] in [ 'modules', - 'goanna.js', + 'gecko.js', 'hyphenation', 'update.locale', ] or path[0] in STARTUP_CACHE_PATHS diff --git a/security/manager/boot/src/nsSiteSecurityService.cpp b/security/manager/boot/src/nsSiteSecurityService.cpp index cc91e3a6ea..7efd02f6ae 100644 --- a/security/manager/boot/src/nsSiteSecurityService.cpp +++ b/security/manager/boot/src/nsSiteSecurityService.cpp @@ -231,7 +231,7 @@ nsresult nsSiteSecurityService::Init() { // Child processes are not allowed direct access to this. - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { MOZ_CRASH("Child process: no direct access to nsSiteSecurityService"); } diff --git a/security/manager/ssl/src/TransportSecurityInfo.cpp b/security/manager/ssl/src/TransportSecurityInfo.cpp index 16c28be116..502b489260 100644 --- a/security/manager/ssl/src/TransportSecurityInfo.cpp +++ b/security/manager/ssl/src/TransportSecurityInfo.cpp @@ -240,7 +240,7 @@ TransportSecurityInfo::formatErrorMessage(MutexAutoLock const & proofOfLock, return NS_OK; } - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return NS_ERROR_UNEXPECTED; } diff --git a/security/manager/ssl/src/nsKeygenHandler.cpp b/security/manager/ssl/src/nsKeygenHandler.cpp index 4011229be1..ad0279b45c 100644 --- a/security/manager/ssl/src/nsKeygenHandler.cpp +++ b/security/manager/ssl/src/nsKeygenHandler.cpp @@ -270,7 +270,7 @@ nsKeygenFormProcessor::~nsKeygenFormProcessor() nsresult nsKeygenFormProcessor::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) { - if (GoannaProcessType_Content == XRE_GetProcessType()) { + if (GeckoProcessType_Content == XRE_GetProcessType()) { nsCOMPtr contentProcessor = new nsKeygenFormProcessorContent(); return contentProcessor->QueryInterface(aIID, aResult); } diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp index 621867be4e..320fbc14bb 100644 --- a/security/manager/ssl/src/nsNSSCertificate.cpp +++ b/security/manager/ssl/src/nsNSSCertificate.cpp @@ -72,7 +72,7 @@ NS_IMPL_ISUPPORTS(nsNSSCertificate, /*static*/ nsNSSCertificate* nsNSSCertificate::Create(CERTCertificate* cert, SECOidTag* evOidPolicy) { - if (GoannaProcessType_Default != XRE_GetProcessType()) { + if (GeckoProcessType_Default != XRE_GetProcessType()) { NS_ERROR("Trying to initialize nsNSSCertificate in a non-chrome process!"); return nullptr; } @@ -86,7 +86,7 @@ nsNSSCertificate* nsNSSCertificate::ConstructFromDER(char* certDER, int derLen) { // On non-chrome process prevent instantiation - if (GoannaProcessType_Default != XRE_GetProcessType()) + if (GeckoProcessType_Default != XRE_GetProcessType()) return nullptr; nsNSSCertificate* newObject = nsNSSCertificate::Create(); @@ -130,7 +130,7 @@ nsNSSCertificate::nsNSSCertificate(CERTCertificate* cert, , mCachedEVStatus(ev_status_unknown) { #if defined(DEBUG) - if (GoannaProcessType_Default != XRE_GetProcessType()) + if (GeckoProcessType_Default != XRE_GetProcessType()) NS_ERROR("Trying to initialize nsNSSCertificate in a non-chrome process!"); #endif @@ -158,7 +158,7 @@ nsNSSCertificate::nsNSSCertificate() : mCertType(CERT_TYPE_NOT_YET_INITIALIZED), mCachedEVStatus(ev_status_unknown) { - if (GoannaProcessType_Default != XRE_GetProcessType()) + if (GeckoProcessType_Default != XRE_GetProcessType()) NS_ERROR("Trying to initialize nsNSSCertificate in a non-chrome process!"); } diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp index 7c80ff2a9b..8d83ac8623 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -71,7 +71,7 @@ bool nsPSMInitPanic::isPanic = false; bool EnsureNSSInitializedChromeOrContent() { nsresult rv; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsCOMPtr nss = do_GetService(PSM_COMPONENT_CONTRACTID, &rv); if (NS_FAILED(rv)) { return false; @@ -107,7 +107,7 @@ bool EnsureNSSInitialized(EnsureNSSOperator op) if (nsPSMInitPanic::GetPanic()) return false; - if (GoannaProcessType_Default != XRE_GetProcessType()) + if (GeckoProcessType_Default != XRE_GetProcessType()) { if (op == nssEnsureOnChromeOnly) { diff --git a/security/manager/ssl/src/nsNSSModule.cpp b/security/manager/ssl/src/nsNSSModule.cpp index 3891333169..e3772dc621 100644 --- a/security/manager/ssl/src/nsNSSModule.cpp +++ b/security/manager/ssl/src/nsNSSModule.cpp @@ -45,7 +45,7 @@ #include "PSMContentListener.h" #define NS_IS_PROCESS_DEFAULT \ - (GoannaProcessType_Default == XRE_GetProcessType()) + (GeckoProcessType_Default == XRE_GetProcessType()) #define NS_NSS_INSTANTIATE(ensureOperator, _InstanceClass) \ PR_BEGIN_MACRO \ diff --git a/security/sandbox/chromium-shim/sandbox/win/loggingCallbacks.h b/security/sandbox/chromium-shim/sandbox/win/loggingCallbacks.h index 2274f40aa8..75747744b9 100644 --- a/security/sandbox/chromium-shim/sandbox/win/loggingCallbacks.h +++ b/security/sandbox/chromium-shim/sandbox/win/loggingCallbacks.h @@ -123,7 +123,7 @@ InitLoggingIfRequired() #if defined(MOZ_CONTENT_SANDBOX) && defined(MOZ_STACKWALKING) // We can only log the stack trace on process types where we know that the // sandbox won't prevent it. - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { Preferences::AddUintVarCache(&sStackTraceDepth, "security.sandbox.windows.log.stackTraceDepth"); } diff --git a/startupcache/StartupCache.cpp b/startupcache/StartupCache.cpp index 1911fbc053..1711996450 100644 --- a/startupcache/StartupCache.cpp +++ b/startupcache/StartupCache.cpp @@ -87,7 +87,7 @@ StartupCache* StartupCache::GetSingleton() { if (!gStartupCache) { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return nullptr; } #ifdef MOZ_DISABLE_STARTUPCACHE diff --git a/storage/src/VacuumManager.cpp b/storage/src/VacuumManager.cpp index 59b6cd4bfc..f6c229e932 100644 --- a/storage/src/VacuumManager.cpp +++ b/storage/src/VacuumManager.cpp @@ -319,7 +319,7 @@ VacuumManager * VacuumManager::getSingleton() { //Don't allocate it in the child Process. - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return nullptr; } diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp index 93cad4e007..62e6672d8e 100644 --- a/storage/src/mozStorageConnection.cpp +++ b/storage/src/mozStorageConnection.cpp @@ -35,7 +35,7 @@ #include "SQLCollations.h" #include "FileSystemModule.h" #include "mozStorageHelper.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "prlog.h" #include "prprf.h" diff --git a/storage/src/mozStorageStatement.cpp b/storage/src/mozStorageStatement.cpp index 789e420e86..b66aaca004 100644 --- a/storage/src/mozStorageStatement.cpp +++ b/storage/src/mozStorageStatement.cpp @@ -23,7 +23,7 @@ #include "mozStorageStatementParams.h" #include "mozStorageStatementRow.h" #include "mozStorageStatement.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsDOMClassInfo.h" #include "prlog.h" diff --git a/testing/mochitest/mochitest_options.py b/testing/mochitest/mochitest_options.py index 19aa4129e1..e76a360756 100644 --- a/testing/mochitest/mochitest_options.py +++ b/testing/mochitest/mochitest_options.py @@ -700,12 +700,12 @@ class MochitestOptions(optparse.OptionParser): "default": options.defaultLeakThreshold, "tab": 25000, # See dependencies of bug 1051230. # GMP rarely gets a log, but when it does, it leaks a little. - "goannamediaplugin": 20000, + "geckomediaplugin": 20000, } - # Bug 1065098 - The goannamediaplugin process fails to produce a leak + # Bug 1065098 - The geckomediaplugin process fails to produce a leak # log for some reason. - options.ignoreMissingLeaks = ["goannamediaplugin", "tab"] + options.ignoreMissingLeaks = ["geckomediaplugin", "tab"] # Bug 1121539 - OSX-only intermittent tab process leak in test_ipc.html if mozinfo.isMac: diff --git a/toolkit/components/alerts/nsAlertsService.cpp b/toolkit/components/alerts/nsAlertsService.cpp index 99f1efb2e9..75b3a4ec16 100644 --- a/toolkit/components/alerts/nsAlertsService.cpp +++ b/toolkit/components/alerts/nsAlertsService.cpp @@ -72,7 +72,7 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl nsIPrincipal * aPrincipal, bool aInPrivateBrowsing) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cpc = ContentChild::GetSingleton(); if (aAlertListener) @@ -128,7 +128,7 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl NS_IMETHODIMP nsAlertsService::CloseAlert(const nsAString& aAlertName, nsIPrincipal* aPrincipal) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cpc = ContentChild::GetSingleton(); cpc->SendCloseAlert(nsAutoString(aAlertName), IPC::Principal(aPrincipal)); return NS_OK; diff --git a/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp b/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp index ec3a318727..6f0a8a7066 100644 --- a/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp +++ b/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp @@ -37,7 +37,7 @@ DiskSpaceWatcher::~DiskSpaceWatcher() already_AddRefed DiskSpaceWatcher::FactoryCreate() { - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return nullptr; } diff --git a/toolkit/components/places/History.cpp b/toolkit/components/places/History.cpp index 9b5d6e4113..f042f25911 100644 --- a/toolkit/components/places/History.cpp +++ b/toolkit/components/places/History.cpp @@ -479,7 +479,7 @@ public: // If we are a content process, always remote the request to the // parent process. - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { URIParams uri; SerializeURI(aURI, uri); @@ -1999,7 +1999,7 @@ History::NotifyVisited(nsIURI* aURI) nsAutoScriptBlocker scriptBlocker; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { nsTArray cplist; ContentParent::GetAll(cplist); @@ -2434,7 +2434,7 @@ History::VisitURI(nsIURI* aURI, return NS_OK; } - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { URIParams uri; SerializeURI(aURI, uri); @@ -2551,7 +2551,7 @@ History::RegisterVisitedCallback(nsIURI* aURI, Link* aLink) { NS_ASSERTION(aURI, "Must pass a non-null URI!"); - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { NS_PRECONDITION(aLink, "Must pass a non-null Link!"); } @@ -2586,7 +2586,7 @@ History::RegisterVisitedCallback(nsIURI* aURI, // ContentParent::RecvStartVisitedQuery. All of our code after this point // assumes aLink is non-nullptr, so we have to return now. else if (!aLink) { - NS_ASSERTION(XRE_GetProcessType() == GoannaProcessType_Default, + NS_ASSERTION(XRE_GetProcessType() == GeckoProcessType_Default, "We should only ever get a null Link in the default process!"); return NS_OK; } @@ -2641,7 +2641,7 @@ History::SetURITitle(nsIURI* aURI, const nsAString& aTitle) return NS_OK; } - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { URIParams uri; SerializeURI(aURI, uri); @@ -2700,7 +2700,7 @@ History::AddDownload(nsIURI* aSource, nsIURI* aReferrer, return NS_OK; } - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { NS_ERROR("Cannot add downloads to history from content process!"); return NS_ERROR_NOT_AVAILABLE; } @@ -2756,7 +2756,7 @@ History::RemoveAllDownloads() return NS_OK; } - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { NS_ERROR("Cannot remove downloads to history from content process!"); return NS_ERROR_NOT_AVAILABLE; } diff --git a/toolkit/components/places/nsAnnotationService.cpp b/toolkit/components/places/nsAnnotationService.cpp index 8f350e7456..0563c4924b 100644 --- a/toolkit/components/places/nsAnnotationService.cpp +++ b/toolkit/components/places/nsAnnotationService.cpp @@ -18,7 +18,7 @@ #include "nsVariant.h" #include "mozilla/storage.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsNetCID.h" diff --git a/toolkit/components/places/nsNavBookmarks.cpp b/toolkit/components/places/nsNavBookmarks.cpp index cafad7c618..e74b84fc08 100644 --- a/toolkit/components/places/nsNavBookmarks.cpp +++ b/toolkit/components/places/nsNavBookmarks.cpp @@ -17,7 +17,7 @@ #include "prprf.h" #include "mozilla/storage.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #define BOOKMARKS_TO_KEYWORDS_INITIAL_CACHE_LENGTH 32 diff --git a/toolkit/components/startup/StartupTimeline.h b/toolkit/components/startup/StartupTimeline.h index 85ebdc4e9d..4694cbc3ed 100644 --- a/toolkit/components/startup/StartupTimeline.h +++ b/toolkit/components/startup/StartupTimeline.h @@ -30,7 +30,7 @@ mozilla_StartupTimeline_Event(PROFILE_BEFORE_CHANGE, "profileBeforeChange") #include "mozilla/TimeStamp.h" #include "nscore.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #ifdef MOZ_LINKER extern "C" { diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp index 629240add5..84b6e36df1 100644 --- a/toolkit/components/startup/nsAppStartup.cpp +++ b/toolkit/components/startup/nsAppStartup.cpp @@ -25,7 +25,7 @@ #include "nsAutoPtr.h" #include "nsString.h" #include "mozilla/Preferences.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "prprf.h" #include "nsIInterfaceRequestorUtils.h" diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp index 2e0aa70476..f7d3fc7c1a 100644 --- a/toolkit/components/telemetry/Telemetry.cpp +++ b/toolkit/components/telemetry/Telemetry.cpp @@ -1767,10 +1767,10 @@ TelemetryImpl::AsyncFetchTelemetryData(nsIFetchTelemetryDataCallback *aCallback) TelemetryImpl::TelemetryImpl(): mHistogramMap(Telemetry::HistogramCount), -mCanRecordBase(XRE_GetProcessType() == GoannaProcessType_Default || - XRE_GetProcessType() == GoannaProcessType_Content), -mCanRecordExtended(XRE_GetProcessType() == GoannaProcessType_Default || - XRE_GetProcessType() == GoannaProcessType_Content), +mCanRecordBase(XRE_GetProcessType() == GeckoProcessType_Default || + XRE_GetProcessType() == GeckoProcessType_Content), +mCanRecordExtended(XRE_GetProcessType() == GeckoProcessType_Default || + XRE_GetProcessType() == GeckoProcessType_Content), mHashMutex("Telemetry::mHashMutex"), mHangReportsMutex("Telemetry::mHangReportsMutex"), mCachedTelemetryData(false), diff --git a/toolkit/mozapps/extensions/AddonPathService.cpp b/toolkit/mozapps/extensions/AddonPathService.cpp index e384926fdb..3681de016b 100644 --- a/toolkit/mozapps/extensions/AddonPathService.cpp +++ b/toolkit/mozapps/extensions/AddonPathService.cpp @@ -193,7 +193,7 @@ ResolveURI(nsIURI* aURI, nsAString& out) JSAddonId* MapURIToAddonID(nsIURI* aURI) { - if (!NS_IsMainThread() || XRE_GetProcessType() != GoannaProcessType_Default) { + if (!NS_IsMainThread() || XRE_GetProcessType() != GeckoProcessType_Default) { return nullptr; } diff --git a/toolkit/xre/EventTracer.cpp b/toolkit/xre/EventTracer.cpp index 82e030d94f..9e4927d4d0 100644 --- a/toolkit/xre/EventTracer.cpp +++ b/toolkit/xre/EventTracer.cpp @@ -49,7 +49,7 @@ * component. */ -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "EventTracer.h" diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 078452f6f5..691bff0838 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -631,7 +631,7 @@ NS_INTERFACE_MAP_BEGIN(nsXULAppInfo) NS_INTERFACE_MAP_ENTRY(nsIWinAppHelper) #endif NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIXULAppInfo, gAppData || - XRE_GetProcessType() == GoannaProcessType_Content) + XRE_GetProcessType() == GeckoProcessType_Content) NS_INTERFACE_MAP_END NS_IMETHODIMP_(MozExternalRefCountType) @@ -649,7 +649,7 @@ nsXULAppInfo::Release() NS_IMETHODIMP nsXULAppInfo::GetVendor(nsACString& aResult) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cc = ContentChild::GetSingleton(); aResult = cc->GetAppInfo().vendor; return NS_OK; @@ -662,7 +662,7 @@ nsXULAppInfo::GetVendor(nsACString& aResult) NS_IMETHODIMP nsXULAppInfo::GetName(nsACString& aResult) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cc = ContentChild::GetSingleton(); aResult = cc->GetAppInfo().name; return NS_OK; @@ -675,7 +675,7 @@ nsXULAppInfo::GetName(nsACString& aResult) NS_IMETHODIMP nsXULAppInfo::GetID(nsACString& aResult) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cc = ContentChild::GetSingleton(); aResult = cc->GetAppInfo().ID; return NS_OK; @@ -688,7 +688,7 @@ nsXULAppInfo::GetID(nsACString& aResult) NS_IMETHODIMP nsXULAppInfo::GetVersion(nsACString& aResult) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cc = ContentChild::GetSingleton(); aResult = cc->GetAppInfo().version; return NS_OK; @@ -709,7 +709,7 @@ nsXULAppInfo::GetPlatformVersion(nsACString& aResult) NS_IMETHODIMP nsXULAppInfo::GetAppBuildID(nsACString& aResult) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cc = ContentChild::GetSingleton(); aResult = cc->GetAppInfo().buildID; return NS_OK; @@ -730,7 +730,7 @@ nsXULAppInfo::GetPlatformBuildID(nsACString& aResult) NS_IMETHODIMP nsXULAppInfo::GetUAName(nsACString& aResult) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cc = ContentChild::GetSingleton(); aResult = cc->GetAppInfo().UAName; return NS_OK; @@ -786,13 +786,13 @@ nsXULAppInfo::GetWidgetToolkit(nsACString& aResult) return NS_OK; } -// Ensure that the GoannaProcessType enum, defined in xpcom/build/nsXULAppAPI.h, +// Ensure that the GeckoProcessType enum, defined in xpcom/build/nsXULAppAPI.h, // is synchronized with the const unsigned longs defined in // xpcom/system/nsIXULRuntime.idl. #define SYNC_ENUMS(a,b) \ static_assert(nsIXULRuntime::PROCESS_TYPE_ ## a == \ - static_cast(GoannaProcessType_ ## b), \ - "GoannaProcessType in nsXULAppAPI.h not synchronized with nsIXULRuntime.idl"); + static_cast(GeckoProcessType_ ## b), \ + "GeckoProcessType in nsXULAppAPI.h not synchronized with nsIXULRuntime.idl"); SYNC_ENUMS(DEFAULT, Default) SYNC_ENUMS(PLUGIN, Plugin) @@ -800,8 +800,8 @@ SYNC_ENUMS(CONTENT, Content) SYNC_ENUMS(IPDLUNITTEST, IPDLUnitTest) // .. and ensure that that is all of them: -static_assert(GoannaProcessType_GMPlugin + 1 == GoannaProcessType_End, - "Did not find the final GoannaProcessType"); +static_assert(GeckoProcessType_GMPlugin + 1 == GeckoProcessType_End, + "Did not find the final GeckoProcessType"); NS_IMETHODIMP nsXULAppInfo::GetProcessType(uint32_t* aResult) @@ -885,7 +885,7 @@ nsXULAppInfo::GetAccessibilityIsUIA(bool* aResult) NS_IMETHODIMP nsXULAppInfo::EnsureContentProcess() { - if (XRE_GetProcessType() != GoannaProcessType_Default) + if (XRE_GetProcessType() != GeckoProcessType_Default) return NS_ERROR_NOT_AVAILABLE; nsRefPtr unused = ContentParent::GetNewOrUsedBrowserProcess(); @@ -2692,7 +2692,7 @@ static DWORD WINAPI InitDwriteBG(LPVOID lpdwThreadParam) bool fire_glxtest_process(); #endif -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" // Encapsulates startup and shutdown state for XRE_main class XREMain @@ -3791,7 +3791,7 @@ int XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) { char aLocal; - GoannaProfilerInitRAII profilerGuard(&aLocal); + GeckoProfilerInitRAII profilerGuard(&aLocal); PROFILER_LABEL("Startup", "XRE_Main", js::ProfileEntry::Category::OTHER); @@ -4009,7 +4009,7 @@ XRE_DeinitCommandLine() return rv; } -GoannaProcessType +GeckoProcessType XRE_GetProcessType() { return mozilla::startup::sChildProcessType; @@ -4018,7 +4018,7 @@ XRE_GetProcessType() bool XRE_IsParentProcess() { - return XRE_GetProcessType() == GoannaProcessType_Default; + return XRE_GetProcessType() == GeckoProcessType_Default; } #ifdef NIGHTLY_BUILD diff --git a/toolkit/xre/nsAppRunner.h b/toolkit/xre/nsAppRunner.h index f34e280590..7f56986d68 100644 --- a/toolkit/xre/nsAppRunner.h +++ b/toolkit/xre/nsAppRunner.h @@ -111,7 +111,7 @@ WinLaunchChild(const wchar_t *exePath, int argc, namespace mozilla { namespace startup { -extern GoannaProcessType sChildProcessType; +extern GeckoProcessType sChildProcessType; } } diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp index 310f989e7f..bf2f74758d 100644 --- a/toolkit/xre/nsEmbedFunctions.cpp +++ b/toolkit/xre/nsEmbedFunctions.cpp @@ -56,7 +56,7 @@ #include "chrome/common/notification_service.h" #include "mozilla/ipc/BrowserProcessSubThread.h" -#include "mozilla/ipc/GoannaChildProcessHost.h" +#include "mozilla/ipc/GeckoChildProcessHost.h" #include "mozilla/ipc/IOThreadChild.h" #include "mozilla/ipc/ProcessChild.h" #include "ScopedXREEmbed.h" @@ -73,7 +73,7 @@ #include "GMPProcessChild.h" #include "GMPLoader.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #if defined(MOZ_SANDBOX) && defined(XP_WIN) #define TARGET_SANDBOX_EXPORTS @@ -95,7 +95,7 @@ using mozilla::_ipdltest::IPDLUnitTestProcessChild; using namespace mozilla; using mozilla::ipc::BrowserProcessSubThread; -using mozilla::ipc::GoannaChildProcessHost; +using mozilla::ipc::GeckoChildProcessHost; using mozilla::ipc::IOThreadChild; using mozilla::ipc::ProcessChild; using mozilla::ipc::ScopedXREEmbed; @@ -208,15 +208,15 @@ XRE_TermEmbedding() } const char* -XRE_ChildProcessTypeToString(GoannaProcessType aProcessType) +XRE_ChildProcessTypeToString(GeckoProcessType aProcessType) { - return (aProcessType < GoannaProcessType_End) ? - kGoannaProcessTypeString[aProcessType] : nullptr; + return (aProcessType < GeckoProcessType_End) ? + kGeckoProcessTypeString[aProcessType] : nullptr; } namespace mozilla { namespace startup { -GoannaProcessType sChildProcessType = GoannaProcessType_Default; +GeckoProcessType sChildProcessType = GeckoProcessType_Default; } } @@ -229,12 +229,12 @@ XRE_SetProcessType(const char* aProcessTypeString) } called = true; - sChildProcessType = GoannaProcessType_Invalid; + sChildProcessType = GeckoProcessType_Invalid; for (int i = 0; - i < (int) ArrayLength(kGoannaProcessTypeString); + i < (int) ArrayLength(kGeckoProcessTypeString); ++i) { - if (!strcmp(kGoannaProcessTypeString[i], aProcessTypeString)) { - sChildProcessType = static_cast(i); + if (!strcmp(kGeckoProcessTypeString[i], aProcessTypeString)) { + sChildProcessType = static_cast(i); return; } } @@ -396,7 +396,7 @@ XRE_InitChildProcess(int aArgc, #endif } - // child processes launched by GoannaChildProcessHost get this magic + // child processes launched by GeckoChildProcessHost get this magic // argument appended to their command lines const char* const parentPIDString = aArgv[aArgc-1]; MOZ_ASSERT(parentPIDString, "NULL parent PID"); @@ -438,11 +438,11 @@ XRE_InitChildProcess(int aArgc, MessageLoop::Type uiLoopType; switch (XRE_GetProcessType()) { - case GoannaProcessType_Content: + case GeckoProcessType_Content: // Content processes need the XPCOM/chromium frankenventloop uiLoopType = MessageLoop::TYPE_MOZILLA_CHILD; break; - case GoannaProcessType_GMPlugin: + case GeckoProcessType_GMPlugin: uiLoopType = MessageLoop::TYPE_DEFAULT; break; default: @@ -466,15 +466,15 @@ XRE_InitChildProcess(int aArgc, #endif switch (XRE_GetProcessType()) { - case GoannaProcessType_Default: + case GeckoProcessType_Default: NS_RUNTIMEABORT("This makes no sense"); break; - case GoannaProcessType_Plugin: + case GeckoProcessType_Plugin: process = new PluginProcessChild(parentPID); break; - case GoannaProcessType_Content: { + case GeckoProcessType_Content: { process = new ContentProcess(parentPID); // If passed in grab the application path for xpcom init nsCString appDir; @@ -488,7 +488,7 @@ XRE_InitChildProcess(int aArgc, } break; - case GoannaProcessType_IPDLUnitTest: + case GeckoProcessType_IPDLUnitTest: #ifdef MOZ_IPDL_TESTS process = new IPDLUnitTestProcessChild(parentPID); #else @@ -496,7 +496,7 @@ XRE_InitChildProcess(int aArgc, #endif break; - case GoannaProcessType_GMPlugin: + case GeckoProcessType_GMPlugin: process = new gmp::GMPProcessChild(parentPID); break; @@ -534,7 +534,7 @@ XRE_InitChildProcess(int aArgc, MessageLoop* XRE_GetIOMessageLoop() { - if (sChildProcessType == GoannaProcessType_Default) { + if (sChildProcessType == GeckoProcessType_Default) { return BrowserProcessSubThread::GetMessageLoop(BrowserProcessSubThread::IO); } return IOThreadChild::message_loop(); diff --git a/toolkit/xre/nsNativeAppSupportQt.cpp b/toolkit/xre/nsNativeAppSupportQt.cpp index 607a24744d..98ea4805e7 100644 --- a/toolkit/xre/nsNativeAppSupportQt.cpp +++ b/toolkit/xre/nsNativeAppSupportQt.cpp @@ -6,7 +6,7 @@ #include #include -#include "mozilla/ipc/GoannaChildProcessHost.h" +#include "mozilla/ipc/GeckoChildProcessHost.h" #include "nsNativeAppSupportQt.h" #include "nsCOMPtr.h" #include "nsIObserverService.h" diff --git a/toolkit/xre/nsSigHandlers.cpp b/toolkit/xre/nsSigHandlers.cpp index a44be51576..d5485d767f 100644 --- a/toolkit/xre/nsSigHandlers.cpp +++ b/toolkit/xre/nsSigHandlers.cpp @@ -241,7 +241,7 @@ void InstallSignalHandlers(const char *ProgramName) #if defined(CRAWL_STACK_ON_SIGSEGV) if (!getenv("XRE_NO_WINDOWS_CRASH_DIALOG")) { void (*crap_handler)(int) = - GoannaProcessType_Default != XRE_GetProcessType() ? + GeckoProcessType_Default != XRE_GetProcessType() ? child_ah_crap_handler : ah_crap_handler; signal(SIGSEGV, crap_handler); @@ -259,7 +259,7 @@ void InstallSignalHandlers(const char *ProgramName) sigaction(SIGFPE, &sa, &osa); #endif - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { /* * If the user is debugging a Goanna parent process in gdb and hits ^C to * suspend, a SIGINT signal will be sent to the child. We ignore this signal diff --git a/tools/profiler/GoannaProfiler.h b/tools/profiler/GeckoProfiler.h similarity index 97% rename from tools/profiler/GoannaProfiler.h rename to tools/profiler/GeckoProfiler.h index 86159fa064..d6c53f0f9a 100644 --- a/tools/profiler/GoannaProfiler.h +++ b/tools/profiler/GeckoProfiler.h @@ -208,26 +208,26 @@ static inline void profiler_log(const char *fmt, va_list args) {} #else -#include "GoannaProfilerImpl.h" +#include "GeckoProfilerImpl.h" #endif -class GoannaProfilerInitRAII { +class GeckoProfilerInitRAII { public: - explicit GoannaProfilerInitRAII(void* stackTop) { + explicit GeckoProfilerInitRAII(void* stackTop) { profiler_init(stackTop); } - ~GoannaProfilerInitRAII() { + ~GeckoProfilerInitRAII() { profiler_shutdown(); } }; -class GoannaProfilerSleepRAII { +class GeckoProfilerSleepRAII { public: - GoannaProfilerSleepRAII() { + GeckoProfilerSleepRAII() { profiler_sleep_start(); } - ~GoannaProfilerSleepRAII() { + ~GeckoProfilerSleepRAII() { profiler_sleep_end(); } }; diff --git a/tools/profiler/GoannaProfilerFunc.h b/tools/profiler/GeckoProfilerFunc.h similarity index 100% rename from tools/profiler/GoannaProfilerFunc.h rename to tools/profiler/GeckoProfilerFunc.h diff --git a/tools/profiler/GoannaProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h similarity index 98% rename from tools/profiler/GoannaProfilerImpl.h rename to tools/profiler/GeckoProfilerImpl.h index 1266605e5a..15a758a9d3 100644 --- a/tools/profiler/GoannaProfilerImpl.h +++ b/tools/profiler/GeckoProfilerImpl.h @@ -2,7 +2,7 @@ /* 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/. */ -// IWYU pragma: private, include "GoannaProfiler.h" +// IWYU pragma: private, include "GeckoProfiler.h" #include #include @@ -12,13 +12,13 @@ #include "mozilla/GuardObjects.h" #include "mozilla/UniquePtr.h" #include "nscore.h" -#include "GoannaProfilerFunc.h" +#include "GeckoProfilerFunc.h" #include "PseudoStack.h" #include "nsISupports.h" #include "ProfilerBacktrace.h" #ifdef MOZ_TASK_TRACER -#include "GoannaTaskTracer.h" +#include "GeckoTaskTracer.h" #endif /* QT has a #define for the word "slots" and jsfriendapi.h has a struct with @@ -363,9 +363,9 @@ namespace mozilla { class ProfilerBacktrace; -class MOZ_STACK_CLASS GoannaProfilerTracingRAII { +class MOZ_STACK_CLASS GeckoProfilerTracingRAII { public: - GoannaProfilerTracingRAII(const char* aCategory, const char* aInfo, + GeckoProfilerTracingRAII(const char* aCategory, const char* aInfo, mozilla::UniquePtr aBacktrace MOZ_GUARD_OBJECT_NOTIFIER_PARAM) : mCategory(aCategory) @@ -375,7 +375,7 @@ public: profiler_tracing(mCategory, mInfo, aBacktrace.release(), TRACING_INTERVAL_START); } - ~GoannaProfilerTracingRAII() { + ~GeckoProfilerTracingRAII() { profiler_tracing(mCategory, mInfo, TRACING_INTERVAL_END); } diff --git a/tools/profiler/GoannaTaskTracer.cpp b/tools/profiler/GeckoTaskTracer.cpp similarity index 98% rename from tools/profiler/GoannaTaskTracer.cpp rename to tools/profiler/GeckoTaskTracer.cpp index 19469e9095..31cbd3d80b 100644 --- a/tools/profiler/GoannaTaskTracer.cpp +++ b/tools/profiler/GeckoTaskTracer.cpp @@ -4,8 +4,8 @@ * 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/. */ -#include "GoannaTaskTracer.h" -#include "GoannaTaskTracerImpl.h" +#include "GeckoTaskTracer.h" +#include "GeckoTaskTracerImpl.h" #include "mozilla/StaticMutex.h" #include "mozilla/ThreadLocal.h" @@ -388,7 +388,7 @@ void AddLabel(const char* aFormat, ...) } } -// Functions used by GoannaProfiler. +// Functions used by GeckoProfiler. void StartLogging() diff --git a/tools/profiler/GoannaTaskTracer.h b/tools/profiler/GeckoTaskTracer.h similarity index 100% rename from tools/profiler/GoannaTaskTracer.h rename to tools/profiler/GeckoTaskTracer.h diff --git a/tools/profiler/GoannaTaskTracerImpl.h b/tools/profiler/GeckoTaskTracerImpl.h similarity index 98% rename from tools/profiler/GoannaTaskTracerImpl.h rename to tools/profiler/GeckoTaskTracerImpl.h index 750dde01bb..c00305cb12 100644 --- a/tools/profiler/GoannaTaskTracerImpl.h +++ b/tools/profiler/GeckoTaskTracerImpl.h @@ -7,7 +7,7 @@ #ifndef GECKO_TASK_TRACER_IMPL_H #define GECKO_TASK_TRACER_IMPL_H -#include "GoannaTaskTracer.h" +#include "GeckoTaskTracer.h" #include "mozilla/Mutex.h" #include "nsTArray.h" diff --git a/tools/profiler/ProfilerIOInterposeObserver.cpp b/tools/profiler/ProfilerIOInterposeObserver.cpp index c0234b853e..07801535d6 100644 --- a/tools/profiler/ProfilerIOInterposeObserver.cpp +++ b/tools/profiler/ProfilerIOInterposeObserver.cpp @@ -2,7 +2,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/. */ -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "ProfilerIOInterposeObserver.h" #include "ProfilerMarkers.h" diff --git a/tools/profiler/ProfilerMarkers.cpp b/tools/profiler/ProfilerMarkers.cpp index ac7d1941ad..21d9093200 100644 --- a/tools/profiler/ProfilerMarkers.cpp +++ b/tools/profiler/ProfilerMarkers.cpp @@ -3,7 +3,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/. */ -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "ProfilerBacktrace.h" #include "ProfilerMarkers.h" #include "gfxASurface.h" diff --git a/tools/profiler/SaveProfileTask.cpp b/tools/profiler/SaveProfileTask.cpp index 75b999a9e4..4973853555 100644 --- a/tools/profiler/SaveProfileTask.cpp +++ b/tools/profiler/SaveProfileTask.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "SaveProfileTask.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" nsresult SaveProfileTask::Run() { diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp index 795686a6c3..ec0842e399 100644 --- a/tools/profiler/TableTicker.cpp +++ b/tools/profiler/TableTicker.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "SaveProfileTask.h" #include "SyncProfile.h" #include "platform.h" @@ -122,7 +122,7 @@ void TableTicker::StreamTaskTracer(JSStreamWriter& b) // Thread meta data ThreadInfo* info = sRegisteredThreads->at(i); b.BeginObject(); - if (XRE_GetProcessType() == GoannaProcessType_Plugin) { + if (XRE_GetProcessType() == GeckoProcessType_Plugin) { // TODO Add the proper plugin name b.NameValue("name", "Plugin"); } else { diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build index 367d8658cc..19fedab810 100644 --- a/tools/profiler/moz.build +++ b/tools/profiler/moz.build @@ -108,17 +108,17 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']: FINAL_LIBRARY = 'xul' EXPORTS += [ - 'GoannaProfiler.h', + 'GeckoProfiler.h', ] if CONFIG['MOZ_TASK_TRACER']: EXPORTS += [ - 'GoannaTaskTracer.h', - 'GoannaTaskTracerImpl.h', + 'GeckoTaskTracer.h', + 'GeckoTaskTracerImpl.h', 'TracedTaskCommon.h', ] UNIFIED_SOURCES += [ - 'GoannaTaskTracer.cpp', + 'GeckoTaskTracer.cpp', 'TracedTaskCommon.cpp', 'ProfileEntry.cpp', ] diff --git a/tools/profiler/nsProfiler.cpp b/tools/profiler/nsProfiler.cpp index c8d5525a73..b9ed68c3d0 100644 --- a/tools/profiler/nsProfiler.cpp +++ b/tools/profiler/nsProfiler.cpp @@ -5,7 +5,7 @@ #include #include -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsProfiler.h" #include "nsMemory.h" #include "nsString.h" diff --git a/tools/profiler/platform-linux.cc b/tools/profiler/platform-linux.cc index e98d9f8b81..e9ac752bca 100644 --- a/tools/profiler/platform-linux.cc +++ b/tools/profiler/platform-linux.cc @@ -64,7 +64,7 @@ #include #include #include "platform.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/Mutex.h" #include "mozilla/Atomics.h" #include "mozilla/LinuxSignal.h" diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 14068dc08f..6730869cba 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -699,7 +699,7 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const nsACString& aMimeConte nsIInterfaceRequestor *aWindowContext, nsIStreamListener ** aStreamListener) { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return DoContentContentProcessHelper(aMimeContentType, aRequest, aContentContext, aForceSave, aWindowContext, aStreamListener); } @@ -955,7 +955,7 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, { NS_ENSURE_ARG_POINTER(aURI); - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { URIParams uri; SerializeURI(aURI, uri); @@ -1259,7 +1259,7 @@ nsExternalAppHandler::~nsExternalAppHandler() void nsExternalAppHandler::DidDivertRequest(nsIRequest *request) { - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Content, "in child process"); + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content, "in child process"); // Remove our request from the child loadGroup RetargetLoadNotifications(request); MaybeCloseWindow(); @@ -1613,7 +1613,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo // At this point, the child process has done everything it can usefully do // for OnStartRequest. - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return NS_OK; } @@ -1854,7 +1854,7 @@ void nsExternalAppHandler::SendStatusChange(ErrorType type, nsresult rv, nsIRequ mDialogProgressListener->OnStatusChange(nullptr, (type == kReadError) ? aRequest : nullptr, rv, msgText); } else if (mTransfer) { mTransfer->OnStatusChange(nullptr, (type == kReadError) ? aRequest : nullptr, rv, msgText); - } else if (XRE_GetProcessType() == GoannaProcessType_Default) { + } else if (XRE_GetProcessType() == GeckoProcessType_Default) { // We don't have a listener. Simply show the alert ourselves. nsresult qiRv; nsCOMPtr prompter(do_GetInterface(GetDialogParent(), &qiRv)); diff --git a/uriloader/prefetch/nsOfflineCacheUpdate.cpp b/uriloader/prefetch/nsOfflineCacheUpdate.cpp index 8a928883a9..0eb02d0d50 100644 --- a/uriloader/prefetch/nsOfflineCacheUpdate.cpp +++ b/uriloader/prefetch/nsOfflineCacheUpdate.cpp @@ -2314,7 +2314,7 @@ nsOfflineCacheUpdate::AddURI(nsIURI *aURI, uint32_t aType) NS_IMETHODIMP nsOfflineCacheUpdate::AddDynamicURI(nsIURI *aURI) { - if (GoannaProcessType_Default != XRE_GetProcessType()) + if (GeckoProcessType_Default != XRE_GetProcessType()) return NS_ERROR_NOT_IMPLEMENTED; // If this is a partial update and the resource is already in the diff --git a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp index f96bfc3e8b..9f4b6f9d2b 100644 --- a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp +++ b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp @@ -534,7 +534,7 @@ nsOfflineCacheUpdateService::Schedule(nsIURI *aManifestURI, nsIOfflineCacheUpdate **aUpdate) { nsCOMPtr update; - if (GoannaProcessType_Default != XRE_GetProcessType()) { + if (GeckoProcessType_Default != XRE_GetProcessType()) { update = new OfflineCacheUpdateChild(aWindow); } else { @@ -595,7 +595,7 @@ NS_IMETHODIMP nsOfflineCacheUpdateService::CheckForUpdate(nsIURI *aManifestURI, bool aInBrowser, nsIObserver *aObserver) { - if (GoannaProcessType_Default != XRE_GetProcessType()) { + if (GeckoProcessType_Default != XRE_GetProcessType()) { // Not intended to support this on child processes return NS_ERROR_NOT_IMPLEMENTED; } @@ -746,7 +746,7 @@ nsOfflineCacheUpdateService::AllowOfflineApp(nsIDOMWindow *aWindow, { nsresult rv; - if (GoannaProcessType_Default != XRE_GetProcessType()) { + if (GeckoProcessType_Default != XRE_GetProcessType()) { ContentChild* child = ContentChild::GetSingleton(); if (!child->SendSetOfflinePermission(IPC::Principal(aPrincipal))) { diff --git a/view/nsViewManager.cpp b/view/nsViewManager.cpp index 02f663c57f..52e8692eeb 100644 --- a/view/nsViewManager.cpp +++ b/view/nsViewManager.cpp @@ -19,7 +19,7 @@ #include "nsIPresShell.h" #include "nsPresContext.h" #include "mozilla/StartupTimeline.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsRefreshDriver.h" #include "mozilla/Preferences.h" #include "nsContentUtils.h" // for nsAutoScriptBlocker diff --git a/widget/GfxInfoBase.cpp b/widget/GfxInfoBase.cpp index 531cdd9120..e732fbe5b3 100644 --- a/widget/GfxInfoBase.cpp +++ b/widget/GfxInfoBase.cpp @@ -586,7 +586,7 @@ GfxInfoBase::GetFeatureStatus(int32_t aFeature, int32_t* aStatus) if (GetPrefValueForFeature(aFeature, *aStatus)) return NS_OK; - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { // Delegate to the parent process. mozilla::dom::ContentChild* cc = mozilla::dom::ContentChild::GetSingleton(); bool success; diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp index 5da72ce685..984b2edcd8 100644 --- a/widget/PuppetWidget.cpp +++ b/widget/PuppetWidget.cpp @@ -905,7 +905,7 @@ bool PuppetWidget::NeedsPaint() { // e10s popups are handled by the parent process, so never should be painted here - if (XRE_GetProcessType() == GoannaProcessType_Content && + if (XRE_GetProcessType() == GeckoProcessType_Content && Preferences::GetBool("browser.tabs.remote.desktopbehavior", false) && mWindowType == eWindowType_popup) { NS_WARNING("Trying to paint an e10s popup in the child process!"); diff --git a/widget/android/APZCCallbackHandler.h b/widget/android/APZCCallbackHandler.h index 94d3541932..0189ecb743 100644 --- a/widget/android/APZCCallbackHandler.h +++ b/widget/android/APZCCallbackHandler.h @@ -6,7 +6,7 @@ #ifndef APZCCallbackHandler_h__ #define APZCCallbackHandler_h__ -#include "mozilla/layers/GoannaContentController.h" +#include "mozilla/layers/GeckoContentController.h" #include "mozilla/StaticPtr.h" #include "mozilla/TimeStamp.h" #include "GeneratedJNIWrappers.h" @@ -17,7 +17,7 @@ namespace mozilla { namespace widget { namespace android { -class APZCCallbackHandler final : public mozilla::layers::GoannaContentController +class APZCCallbackHandler final : public mozilla::layers::GeckoContentController { private: static StaticRefPtr sInstance; @@ -41,7 +41,7 @@ public: NativePanZoomController::LocalRef SetNativePanZoomController(NativePanZoomController::Param obj); void NotifyDefaultPrevented(uint64_t aInputBlockId, bool aDefaultPrevented); -public: // GoannaContentController methods +public: // GeckoContentController methods void RequestContentRepaint(const mozilla::layers::FrameMetrics& aFrameMetrics) override; void RequestFlingSnap(const mozilla::layers::FrameMetrics::ViewID& aScrollId, const mozilla::CSSPoint& aDestination) override; diff --git a/widget/android/AndroidJNI.cpp b/widget/android/AndroidJNI.cpp index 2d00ff313e..3bb5e75827 100644 --- a/widget/android/AndroidJNI.cpp +++ b/widget/android/AndroidJNI.cpp @@ -36,7 +36,7 @@ #include "nsIMobileMessageDatabaseService.h" #include "nsPluginInstanceOwner.h" #include "AndroidSurfaceTexture.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsMemoryPressure.h" using namespace mozilla; diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp index f58b6d0a49..395dd0f5f9 100644 --- a/widget/android/nsAppShell.cpp +++ b/widget/android/nsAppShell.cpp @@ -44,7 +44,7 @@ #include "mozilla/dom/GamepadService.h" #endif -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #ifdef MOZ_ANDROID_HISTORY #include "nsNetUtil.h" #include "IHistory.h" @@ -134,7 +134,7 @@ nsAppShell::nsAppShell() { gAppShell = this; - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return; } diff --git a/widget/android/nsLookAndFeel.cpp b/widget/android/nsLookAndFeel.cpp index c94a56545d..fa29a4d7cc 100644 --- a/widget/android/nsLookAndFeel.cpp +++ b/widget/android/nsLookAndFeel.cpp @@ -87,7 +87,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor &aColor) nsresult rv = NS_OK; if (!mInitializedSystemColors) { - if (XRE_GetProcessType() == GoannaProcessType_Default) + if (XRE_GetProcessType() == GeckoProcessType_Default) rv = GetSystemColors(); else rv = CallRemoteGetSystemColors(); @@ -469,7 +469,7 @@ bool nsLookAndFeel::GetEchoPasswordImpl() { if (!mInitializedShowPassword) { - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { mShowPassword = widget::GoannaAppShell::GetShowPasswordSetting(); } else { ContentChild::GetSingleton()->SendGetShowPasswordSetting(&mShowPassword); diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp index d7ea876d67..672e4c35b0 100644 --- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -58,7 +58,7 @@ using mozilla::unused; #include "imgIEncoder.h" #include "nsString.h" -#include "GoannaProfiler.h" // For PROFILER_LABEL +#include "GeckoProfiler.h" // For PROFILER_LABEL #include "nsIXULRuntime.h" using namespace mozilla; @@ -808,7 +808,7 @@ nsWindow::OnGlobalAndroidEvent(AndroidGoannaEvent *ae) gAndroidScreenBounds.width = newScreenWidth; gAndroidScreenBounds.height = newScreenHeight; - if (XRE_GetProcessType() != GoannaProcessType_Default && + if (XRE_GetProcessType() != GeckoProcessType_Default && !Preferences::GetBool("browser.tabs.remote.desktopbehavior", false)) { break; } @@ -991,7 +991,7 @@ nsWindow::InitEvent(WidgetGUIEvent& event, nsIntPoint* aPoint) gfxIntSize nsWindow::GetAndroidScreenBounds() { - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { return ContentChild::GetSingleton()->GetScreenSize(); } return gAndroidScreenBounds; @@ -2483,7 +2483,7 @@ nsWindow::ConfigureAPZCTreeManager() } } -already_AddRefed +already_AddRefed nsWindow::CreateRootContentController() { nsRefPtr controller = diff --git a/widget/android/nsWindow.h b/widget/android/nsWindow.h index c17bcb74a9..0cbb0929fd 100644 --- a/widget/android/nsWindow.h +++ b/widget/android/nsWindow.h @@ -173,7 +173,7 @@ protected: void FlushIMEChanges(); void ConfigureAPZCTreeManager() override; - already_AddRefed CreateRootContentController() override; + already_AddRefed CreateRootContentController() override; // Call this function when the users activity is the direct cause of an // event (like a keypress or mouse click). diff --git a/widget/cocoa/nsAppShell.mm b/widget/cocoa/nsAppShell.mm index 6f2b572ccf..3648cd25dc 100644 --- a/widget/cocoa/nsAppShell.mm +++ b/widget/cocoa/nsAppShell.mm @@ -32,7 +32,7 @@ #include "nsToolkit.h" #include "TextInputHandler.h" #include "mozilla/HangMonitor.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "pratom.h" #include diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 8f8233f766..86e4d1869e 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -79,7 +79,7 @@ #include -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsIDOMWheelEvent.h" #include "mozilla/layers/ChromeProcessController.h" diff --git a/widget/gonk/GoannaTouchDispatcher.cpp b/widget/gonk/GeckoTouchDispatcher.cpp similarity index 99% rename from widget/gonk/GoannaTouchDispatcher.cpp rename to widget/gonk/GeckoTouchDispatcher.cpp index e3506c02ec..146cfc4aaf 100644 --- a/widget/gonk/GoannaTouchDispatcher.cpp +++ b/widget/gonk/GeckoTouchDispatcher.cpp @@ -16,7 +16,7 @@ */ #include "FrameMetrics.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "GoannaTouchDispatcher.h" #include "InputData.h" #include "ProfilerMarkers.h" diff --git a/widget/gonk/GoannaTouchDispatcher.h b/widget/gonk/GeckoTouchDispatcher.h similarity index 92% rename from widget/gonk/GoannaTouchDispatcher.h rename to widget/gonk/GeckoTouchDispatcher.h index d46406e917..4d31818b5e 100644 --- a/widget/gonk/GoannaTouchDispatcher.h +++ b/widget/gonk/GeckoTouchDispatcher.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef GOANNA_TOUCH_INPUT_DISPATCHER_h -#define GOANNA_TOUCH_INPUT_DISPATCHER_h +#ifndef GECKO_TOUCH_INPUT_DISPATCHER_h +#define GECKO_TOUCH_INPUT_DISPATCHER_h #include "InputData.h" #include "Units.h" @@ -41,12 +41,12 @@ class CompositorVsyncObserver; // this sample time, we extrapolate the last two touch events to the sample // time. The magic numbers defined as constants are taken from android // InputTransport.cpp. -class GoannaTouchDispatcher +class GeckoTouchDispatcher { - NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GoannaTouchDispatcher) + NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GeckoTouchDispatcher) public: - GoannaTouchDispatcher(); + GeckoTouchDispatcher(); void NotifyTouch(MultiTouchInput& aTouch, TimeStamp aEventTime); void DispatchTouchEvent(MultiTouchInput aMultiTouch); void DispatchTouchMoveEvents(TimeStamp aVsyncTime); @@ -86,4 +86,4 @@ private: }; } // namespace mozilla -#endif // GOANNA_TOUCH_INPUT_DISPATCHER_h +#endif // GECKO_TOUCH_INPUT_DISPATCHER_h diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build index 9d2e7aab04..60589ad681 100644 --- a/widget/gonk/moz.build +++ b/widget/gonk/moz.build @@ -15,7 +15,7 @@ # limitations under the License. EXPORTS += [ - 'GoannaTouchDispatcher.h', + 'GeckoTouchDispatcher.h', 'GonkPermission.h', 'OrientationObserver.h', ] @@ -46,7 +46,7 @@ SOURCES += ['libui/' + src for src in [ ]] SOURCES += [ - 'GoannaTouchDispatcher.cpp', + 'GeckoTouchDispatcher.cpp', 'GfxInfo.cpp', 'GonkMemoryPressureMonitoring.cpp', 'GonkPermission.cpp', diff --git a/widget/gonk/nsAppShell.cpp b/widget/gonk/nsAppShell.cpp index ab122bd737..4485b9a2f6 100644 --- a/widget/gonk/nsAppShell.cpp +++ b/widget/gonk/nsAppShell.cpp @@ -69,7 +69,7 @@ #endif #include "mozilla/Preferences.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" // Defines kKeyMapping and GetKeyNameIndex() #include "GonkKeyMapping.h" @@ -875,7 +875,7 @@ nsAppShell::Init() InitGonkMemoryPressureMonitoring(); - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { printf("*****************************************************************\n"); printf("***\n"); printf("*** This is stdout. Most of the useful output will be in logcat.\n"); diff --git a/widget/gonk/nsClipboard.cpp b/widget/gonk/nsClipboard.cpp index 92bc86f6d5..aed3782daa 100644 --- a/widget/gonk/nsClipboard.cpp +++ b/widget/gonk/nsClipboard.cpp @@ -46,7 +46,7 @@ nsClipboard::SetData(nsITransferable *aTransferable, nsAutoString buffer; supportsString->GetData(buffer); - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { mClipboard = buffer; } else { bool isPrivateData = false; @@ -66,7 +66,7 @@ nsClipboard::GetData(nsITransferable *aTransferable, int32_t aWhichClipboard) } nsAutoString buffer; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { buffer = mClipboard; } else { ContentChild::GetSingleton()->SendGetClipboardText(aWhichClipboard, &buffer); @@ -104,7 +104,7 @@ nsClipboard::EmptyClipboard(int32_t aWhichClipboard) if (aWhichClipboard != kGlobalClipboard) { return NS_ERROR_NOT_IMPLEMENTED; } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { mClipboard.Truncate(0); } else { ContentChild::GetSingleton()->SendEmptyClipboard(aWhichClipboard); @@ -122,7 +122,7 @@ nsClipboard::HasDataMatchingFlavors(const char **aFlavorList, if (aWhichClipboard != kGlobalClipboard) { return NS_ERROR_NOT_IMPLEMENTED; } - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { *aHasText = !mClipboard.IsEmpty(); } else { ContentChild::GetSingleton()->SendClipboardHasText(aWhichClipboard, aHasText); diff --git a/widget/gonk/nsWidgetFactory.cpp b/widget/gonk/nsWidgetFactory.cpp index 04eeff6be2..e11c918226 100644 --- a/widget/gonk/nsWidgetFactory.cpp +++ b/widget/gonk/nsWidgetFactory.cpp @@ -72,7 +72,7 @@ NS_DEFINE_NAMED_CID(NS_CLIPBOARDHELPER_CID); static nsresult ScreenManagerConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) { - return (XRE_GetProcessType() == GoannaProcessType_Default) ? + return (XRE_GetProcessType() == GeckoProcessType_Default) ? nsScreenManagerGonkConstructor(aOuter, aIID, aResult) : PuppetScreenManagerConstructor(aOuter, aIID, aResult); } diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp index 6a7a01c5e0..66cf62e5f6 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp @@ -16,7 +16,7 @@ #include "prenv.h" #include "mozilla/HangMonitor.h" #include "mozilla/unused.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsIPowerManagerService.h" #ifdef MOZ_ENABLE_DBUS #include "WakeLockListener.h" diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp index 62039e34bc..65efb3c06d 100644 --- a/widget/nsBaseWidget.cpp +++ b/widget/nsBaseWidget.cpp @@ -892,10 +892,10 @@ void nsBaseWidget::CreateCompositor() CreateCompositor(rect.width, rect.height); } -already_AddRefed +already_AddRefed nsBaseWidget::CreateRootContentController() { - nsRefPtr controller = new ChromeProcessController(this, mAPZEventState); + nsRefPtr controller = new ChromeProcessController(this, mAPZEventState); return controller.forget(); } @@ -947,7 +947,7 @@ void nsBaseWidget::ConfigureAPZCTreeManager() new ChromeProcessContentReceivedInputBlockCallback(mAPZC)); mSetTargetAPZCCallback = new ChromeProcessSetTargetAPZCCallback(mAPZC); - nsRefPtr controller = CreateRootContentController(); + nsRefPtr controller = CreateRootContentController(); if (controller) { CompositorParent::SetControllerForLayerTree(rootLayerTreeId, controller); } diff --git a/widget/nsBaseWidget.h b/widget/nsBaseWidget.h index 6e9e8f9570..61ac8de188 100644 --- a/widget/nsBaseWidget.h +++ b/widget/nsBaseWidget.h @@ -36,7 +36,7 @@ class BasicLayerManager; class CompositorChild; class CompositorParent; class APZCTreeManager; -class GoannaContentController; +class GeckoContentController; class APZEventState; struct ScrollableLayerGuid; struct SetTargetAPZCCallback; @@ -91,7 +91,7 @@ protected: typedef mozilla::layers::CompositorChild CompositorChild; typedef mozilla::layers::CompositorParent CompositorParent; typedef mozilla::layers::APZCTreeManager APZCTreeManager; - typedef mozilla::layers::GoannaContentController GoannaContentController; + typedef mozilla::layers::GeckoContentController GeckoContentController; typedef mozilla::layers::ScrollableLayerGuid ScrollableLayerGuid; typedef mozilla::layers::APZEventState APZEventState; typedef mozilla::layers::SetTargetAPZCCallback SetTargetAPZCCallback; @@ -327,7 +327,7 @@ protected: nsWidgetInitData *aInitData); virtual void ConfigureAPZCTreeManager(); - virtual already_AddRefed CreateRootContentController(); + virtual already_AddRefed CreateRootContentController(); // Dispatch an event that has already been routed through APZ. nsEventStatus ProcessUntransformedAPZEvent(mozilla::WidgetInputEvent* aEvent, diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h index cdf3d7aec5..d3c5ad1074 100644 --- a/widget/nsIWidget.h +++ b/widget/nsIWidget.h @@ -2140,7 +2140,7 @@ public: static bool UsePuppetWidgets() { - return XRE_GetProcessType() == GoannaProcessType_Content; + return XRE_GetProcessType() == GeckoProcessType_Content; } /** diff --git a/widget/nsIdleService.cpp b/widget/nsIdleService.cpp index d6b71a52f9..85fe94ff71 100644 --- a/widget/nsIdleService.cpp +++ b/widget/nsIdleService.cpp @@ -402,7 +402,7 @@ nsIdleService::nsIdleService() : mCurrentlySetToTimeoutAt(TimeStamp()), #endif MOZ_ASSERT(!gIdleService); gIdleService = this; - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { mDailyIdle = new nsIdleServiceDaily(this); mDailyIdle->Init(); } @@ -429,7 +429,7 @@ nsIdleService::AddIdleObserver(nsIObserver* aObserver, uint32_t aIdleTimeInS) // high either - no more than ~136 years. NS_ENSURE_ARG_RANGE(aIdleTimeInS, 1, (UINT32_MAX / 10) - 1); - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { dom::ContentChild* cpc = dom::ContentChild::GetSingleton(); cpc->AddIdleObserver(aObserver, aIdleTimeInS); return NS_OK; @@ -488,7 +488,7 @@ nsIdleService::RemoveIdleObserver(nsIObserver* aObserver, uint32_t aTimeInS) NS_ENSURE_ARG_POINTER(aObserver); NS_ENSURE_ARG(aTimeInS); - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { dom::ContentChild* cpc = dom::ContentChild::GetSingleton(); cpc->RemoveIdleObserver(aObserver, aTimeInS); return NS_OK; diff --git a/widget/windows/AudioSession.cpp b/widget/windows/AudioSession.cpp index 094290b542..82ff41b550 100644 --- a/widget/windows/AudioSession.cpp +++ b/widget/windows/AudioSession.cpp @@ -193,10 +193,10 @@ AudioSession::Start() mState = FAILED; // XXXkhuey implement this for content processes - if (XRE_GetProcessType() == GoannaProcessType_Content) + if (XRE_GetProcessType() == GeckoProcessType_Content) return NS_ERROR_FAILURE; - MOZ_ASSERT(XRE_GetProcessType() == GoannaProcessType_Default, + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default, "Should only get here in a chrome process!"); nsCOMPtr bundleService = @@ -315,7 +315,7 @@ AudioSession::Stop() nsRefPtr kungFuDeathGrip; kungFuDeathGrip.swap(sService); - if (XRE_GetProcessType() != GoannaProcessType_Content) + if (XRE_GetProcessType() != GeckoProcessType_Content) StopInternal(); // At this point kungFuDeathGrip should be the only reference to AudioSession @@ -362,7 +362,7 @@ AudioSession::SetSessionData(const nsID& aID, { MOZ_ASSERT(mState == UNINITIALIZED, "State invariants violated"); - MOZ_ASSERT(XRE_GetProcessType() != GoannaProcessType_Default, + MOZ_ASSERT(XRE_GetProcessType() != GeckoProcessType_Default, "Should never get here in a chrome process!"); mState = CLONED; diff --git a/widget/windows/nsAppShell.cpp b/widget/windows/nsAppShell.cpp index b671f35595..b49d3fd09d 100644 --- a/widget/windows/nsAppShell.cpp +++ b/widget/windows/nsAppShell.cpp @@ -21,7 +21,7 @@ #include "mozilla/StaticPtr.h" #include "nsTHashtable.h" #include "nsHashKeys.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" using namespace mozilla; using namespace mozilla::widget; @@ -285,7 +285,7 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait) // Block and wait for any posted application message mozilla::HangMonitor::Suspend(); { - GoannaProfilerSleepRAII profiler_sleep; + GeckoProfilerSleepRAII profiler_sleep; WinUtils::WaitForMessage(); } } diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp index 8b8bfd8ec2..cc86fc6e65 100644 --- a/xpcom/base/nsCycleCollector.cpp +++ b/xpcom/base/nsCycleCollector.cpp @@ -179,7 +179,7 @@ #include "nsIFile.h" #include "nsDumpUtils.h" #include "xpcpublic.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include #include @@ -260,13 +260,13 @@ struct nsCycleCollectorParams bool processLogging = true; if (logProcessEnv && !!strcmp(logProcessEnv, "all")) { switch (XRE_GetProcessType()) { - case GoannaProcessType_Default: + case GeckoProcessType_Default: processLogging = !strcmp(logProcessEnv, "main"); break; - case GoannaProcessType_Plugin: + case GeckoProcessType_Plugin: processLogging = !strcmp(logProcessEnv, "plugins"); break; - case GoannaProcessType_Content: + case GeckoProcessType_Content: processLogging = !strcmp(logProcessEnv, "content"); break; default: diff --git a/xpcom/base/nsDumpUtils.cpp b/xpcom/base/nsDumpUtils.cpp index 68f00837a6..d463d705ee 100644 --- a/xpcom/base/nsDumpUtils.cpp +++ b/xpcom/base/nsDumpUtils.cpp @@ -262,7 +262,7 @@ FifoWatcher::MaybeCreate() { MOZ_ASSERT(NS_IsMainThread()); - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { // We want this to be main-process only, since two processes can't listen // to the same fifo. return false; diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp index 9ba4e0fc68..ec0be76d0d 100644 --- a/xpcom/base/nsMemoryInfoDumper.cpp +++ b/xpcom/base/nsMemoryInfoDumper.cpp @@ -484,7 +484,7 @@ public: // of the form "$PROCESS_NAME (pid $PID)", or just "(pid $PID)" if we // don't have a process name. If we're the main process, we let // $PROCESS_NAME be "Main Process". - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // We're the main process. process.AssignLiteral("Main Process"); } else if (ContentChild* cc = ContentChild::GetSingleton()) { diff --git a/xpcom/base/nsTraceRefcnt.cpp b/xpcom/base/nsTraceRefcnt.cpp index e1f64fd5eb..959d317ec8 100644 --- a/xpcom/base/nsTraceRefcnt.cpp +++ b/xpcom/base/nsTraceRefcnt.cpp @@ -633,7 +633,7 @@ InitLog(const char* aEnvVar, const char* aMsg, FILE** aResult) } else { FILE* stream; nsAutoCString fname(value); - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { bool hasLogExtension = fname.RFind(".log", true, -1, 4) == kNotFound ? false : true; if (hasLogExtension) { diff --git a/xpcom/build/MainThreadIOLogger.cpp b/xpcom/build/MainThreadIOLogger.cpp index c698443c98..174861947a 100644 --- a/xpcom/build/MainThreadIOLogger.cpp +++ b/xpcom/build/MainThreadIOLogger.cpp @@ -6,7 +6,7 @@ #include "MainThreadIOLogger.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "IOInterposerPrivate.h" #include "mozilla/IOInterposer.h" #include "mozilla/StaticPtr.h" diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp index 3de07bc2bd..8547d9e55f 100644 --- a/xpcom/build/XPCOMInit.cpp +++ b/xpcom/build/XPCOMInit.cpp @@ -134,7 +134,7 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); #include "mozilla/SystemMemoryReporter.h" #include "mozilla/UniquePtr.h" -#include "mozilla/ipc/GoannaChildProcessHost.h" +#include "mozilla/ipc/GeckoChildProcessHost.h" #ifdef MOZ_VISUAL_EVENT_TRACER #include "mozilla/VisualEventTracer.h" @@ -142,7 +142,7 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); #include "ogg/ogg.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "jsapi.h" @@ -499,7 +499,7 @@ NS_InitXPCOM2(nsIServiceManager** aResult, sMessageLoop->set_hang_timeouts(512, 8192); } - if (XRE_GetProcessType() == GoannaProcessType_Default && + if (XRE_GetProcessType() == GeckoProcessType_Default && !BrowserProcessSubThread::GetMessageLoop(BrowserProcessSubThread::IO)) { UniquePtr ioThread = MakeUnique(BrowserProcessSubThread::IO); @@ -690,7 +690,7 @@ NS_InitXPCOM2(nsIServiceManager** aResult, // We only want the SystemMemoryReporter running in one process, because it // profiles the entire system. The main process is the obvious place for // it. - if (XRE_GetProcessType() == GoannaProcessType_Default) { + if (XRE_GetProcessType() == GeckoProcessType_Default) { mozilla::SystemMemoryReporter::Init(); } @@ -920,7 +920,7 @@ ShutdownXPCOM(nsIServiceManager* aServMgr) // On Windows XP debug, there are intermittent failures in // dom/media/tests/mochitest/test_peerConnection_basicH264Video.html // if we don't exit early in a child process. See bug 1073310. - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { NS_WARNING("Exiting child process early!"); exit(0); } @@ -994,7 +994,7 @@ ShutdownXPCOM(nsIServiceManager* aServMgr) // checking working on Linux. // On debug B2G, the child process crashes very late. Instead, just // give up so at least we exit cleanly. See bug 1071866. - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { NS_WARNING("Exiting child process early!"); exit(0); } diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h index 5c62c74da4..b10911519a 100644 --- a/xpcom/build/nsXULAppAPI.h +++ b/xpcom/build/nsXULAppAPI.h @@ -341,35 +341,35 @@ XRE_API(nsresult, XRE_API(void, XRE_FreeAppData, (nsXREAppData* aAppData)) -enum GoannaProcessType +enum GeckoProcessType { - GoannaProcessType_Default = 0, + GeckoProcessType_Default = 0, - GoannaProcessType_Plugin, - GoannaProcessType_Content, + GeckoProcessType_Plugin, + GeckoProcessType_Content, - GoannaProcessType_IPDLUnitTest, + GeckoProcessType_IPDLUnitTest, - GoannaProcessType_GMPlugin, // Goanna Media Plugin + GeckoProcessType_GMPlugin, // Gecko Media Plugin - GoannaProcessType_End, - GoannaProcessType_Invalid = GoannaProcessType_End + GeckoProcessType_End, + GeckoProcessType_Invalid = GeckoProcessType_End }; -static const char* const kGoannaProcessTypeString[] = { +static const char* const kGeckoProcessTypeString[] = { "default", "plugin", "tab", "ipdlunittest", - "goannamediaplugin" + "geckomediaplugin" }; -static_assert(MOZ_ARRAY_LENGTH(kGoannaProcessTypeString) == - GoannaProcessType_End, +static_assert(MOZ_ARRAY_LENGTH(kGeckoProcessTypeString) == + GeckoProcessType_End, "Array length mismatch"); XRE_API(const char*, - XRE_ChildProcessTypeToString, (GoannaProcessType aProcessType)) + XRE_ChildProcessTypeToString, (GeckoProcessType aProcessType)) XRE_API(void, XRE_SetProcessType, (const char* aProcessTypeString)) @@ -385,7 +385,7 @@ XRE_API(nsresult, char* aArgv[], mozilla::gmp::GMPLoader* aGMPLoader)) -XRE_API(GoannaProcessType, +XRE_API(GeckoProcessType, XRE_GetProcessType, ()) XRE_API(bool, diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp index ec4471e391..b1780204a9 100644 --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp @@ -585,7 +585,7 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, } #endif - if (XRE_GetProcessType() == GoannaProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content) { process = kContent; } else { process = kMain; @@ -769,7 +769,7 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, } else #endif /* MOZ_B2G_LOADER */ if (directive->regfunc) { - if (GoannaProcessType_Default != XRE_GetProcessType()) { + if (GeckoProcessType_Default != XRE_GetProcessType()) { continue; } diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp index 190745631e..075465c187 100644 --- a/xpcom/components/nsComponentManager.cpp +++ b/xpcom/components/nsComponentManager.cpp @@ -522,12 +522,12 @@ ProcessSelectorMatches(Module::ProcessSelector aSelector) return true; } - GoannaProcessType type = XRE_GetProcessType(); + GeckoProcessType type = XRE_GetProcessType(); switch (aSelector) { case Module::MAIN_PROCESS_ONLY: - return type == GoannaProcessType_Default; + return type == GeckoProcessType_Default; case Module::CONTENT_PROCESS_ONLY: - return type == GoannaProcessType_Content; + return type == GeckoProcessType_Content; default: MOZ_CRASH("invalid process aSelector"); } diff --git a/xpcom/glue/BlockingResourceBase.cpp b/xpcom/glue/BlockingResourceBase.cpp index f9bd0bc427..887c90a881 100644 --- a/xpcom/glue/BlockingResourceBase.cpp +++ b/xpcom/glue/BlockingResourceBase.cpp @@ -24,7 +24,7 @@ #include "mozilla/Mutex.h" #if defined(MOZILLA_INTERNAL_API) && !defined(MOZILLA_XPCOMRT_API) -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #endif //MOZILLA_INTERNAL_API #endif // ifdef DEBUG @@ -463,7 +463,7 @@ ReentrantMonitor::Wait(PRIntervalTime aInterval) nsresult rv; #if defined(MOZILLA_INTERNAL_API) && !defined(MOZILLA_XPCOMRT_API) { - GoannaProfilerSleepRAII profiler_sleep; + GeckoProfilerSleepRAII profiler_sleep; #endif //MOZILLA_INTERNAL_API // give up the monitor until we're back from Wait() diff --git a/xpcom/glue/CondVar.h b/xpcom/glue/CondVar.h index 1885d6622d..5d05464eca 100644 --- a/xpcom/glue/CondVar.h +++ b/xpcom/glue/CondVar.h @@ -13,7 +13,7 @@ #include "mozilla/Mutex.h" #ifdef MOZILLA_INTERNAL_API -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #endif //MOZILLA_INTERNAL_API namespace mozilla { @@ -73,7 +73,7 @@ public: { #ifdef MOZILLA_INTERNAL_API - GoannaProfilerSleepRAII profiler_sleep; + GeckoProfilerSleepRAII profiler_sleep; #endif //MOZILLA_INTERNAL_API // NSPR checks for lock ownership return PR_WaitCondVar(mCvar, aInterval) == PR_SUCCESS ? NS_OK : diff --git a/xpcom/glue/ReentrantMonitor.h b/xpcom/glue/ReentrantMonitor.h index f245453471..0798fe2af3 100644 --- a/xpcom/glue/ReentrantMonitor.h +++ b/xpcom/glue/ReentrantMonitor.h @@ -10,7 +10,7 @@ #include "prmon.h" #ifdef MOZILLA_INTERNAL_API -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #endif //MOZILLA_INTERNAL_API #include "mozilla/BlockingResourceBase.h" @@ -86,7 +86,7 @@ public: nsresult Wait(PRIntervalTime aInterval = PR_INTERVAL_NO_TIMEOUT) { #ifdef MOZILLA_INTERNAL_API - GoannaProfilerSleepRAII profiler_sleep; + GeckoProfilerSleepRAII profiler_sleep; #endif //MOZILLA_INTERNAL_API return PR_Wait(mReentrantMonitor, aInterval) == PR_SUCCESS ? NS_OK : NS_ERROR_FAILURE; diff --git a/xpcom/io/nsAnonymousTemporaryFile.cpp b/xpcom/io/nsAnonymousTemporaryFile.cpp index 510a759ab6..991615d888 100644 --- a/xpcom/io/nsAnonymousTemporaryFile.cpp +++ b/xpcom/io/nsAnonymousTemporaryFile.cpp @@ -274,7 +274,7 @@ CreateAnonTempFileRemover() // is a shutdown observer. We only create the temp file remover if we're running // in the main process; there's no point in doing the temp file removal multiple // times per startup. - if (XRE_GetProcessType() != GoannaProcessType_Default) { + if (XRE_GetProcessType() != GeckoProcessType_Default) { return NS_OK; } nsRefPtr tempRemover = new nsAnonTempFileRemover(); diff --git a/xpcom/libxpcomrt/XPCOMRTStubs.cpp b/xpcom/libxpcomrt/XPCOMRTStubs.cpp index c25b5ba12c..09edcd7ad7 100644 --- a/xpcom/libxpcomrt/XPCOMRTStubs.cpp +++ b/xpcom/libxpcomrt/XPCOMRTStubs.cpp @@ -8,10 +8,10 @@ #include "mozilla/TimeStamp.h" -GoannaProcessType +GeckoProcessType XRE_GetProcessType() { - return GoannaProcessType_Default; + return GeckoProcessType_Default; } #define PRINT_CALLED fprintf(stderr, "!!! ERROR: function %s defined in file %s should not be called, needs to be correctly implemented.\n", __FUNCTION__, __FILE__) diff --git a/xpcom/threads/HangAnnotations.cpp b/xpcom/threads/HangAnnotations.cpp index 775e0dcc58..9ff566c561 100644 --- a/xpcom/threads/HangAnnotations.cpp +++ b/xpcom/threads/HangAnnotations.cpp @@ -229,7 +229,7 @@ RegisterAnnotator(Annotator& aAnnotator) BackgroundHangMonitor::RegisterAnnotator(aAnnotator); // We still register annotators for ChromeHangs if (NS_IsMainThread() && - GoannaProcessType_Default == XRE_GetProcessType()) { + GeckoProcessType_Default == XRE_GetProcessType()) { if (!gChromehangAnnotators) { gChromehangAnnotators = new Observer::Annotators(); } @@ -245,7 +245,7 @@ UnregisterAnnotator(Annotator& aAnnotator) BackgroundHangMonitor::UnregisterAnnotator(aAnnotator); // We still register annotators for ChromeHangs if (NS_IsMainThread() && - GoannaProcessType_Default == XRE_GetProcessType()) { + GeckoProcessType_Default == XRE_GetProcessType()) { if (gChromehangAnnotators->Unregister(aAnnotator)) { gChromehangAnnotators = nullptr; } diff --git a/xpcom/threads/HangMonitor.cpp b/xpcom/threads/HangMonitor.cpp index d9efd33dcc..2f1b2c4c51 100644 --- a/xpcom/threads/HangMonitor.cpp +++ b/xpcom/threads/HangMonitor.cpp @@ -142,7 +142,7 @@ Startup() // The hang detector only runs in chrome processes. If you change this, // you must also deal with the threadsafety of AnnotateCrashReport in // non-chrome processes! - if (GoannaProcessType_Default != XRE_GetProcessType()) { + if (GeckoProcessType_Default != XRE_GetProcessType()) { return; } @@ -167,7 +167,7 @@ Startup() void Shutdown() { - if (GoannaProcessType_Default != XRE_GetProcessType()) { + if (GeckoProcessType_Default != XRE_GetProcessType()) { return; } diff --git a/xpcom/threads/LazyIdleThread.cpp b/xpcom/threads/LazyIdleThread.cpp index 8342960398..c599b5fcbe 100644 --- a/xpcom/threads/LazyIdleThread.cpp +++ b/xpcom/threads/LazyIdleThread.cpp @@ -8,7 +8,7 @@ #include "nsIObserverService.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "nsComponentManagerUtils.h" #include "nsServiceManagerUtils.h" #include "nsThreadUtils.h" diff --git a/xpcom/threads/nsThread.cpp b/xpcom/threads/nsThread.cpp index a50aaee894..001cd06f49 100644 --- a/xpcom/threads/nsThread.cpp +++ b/xpcom/threads/nsThread.cpp @@ -703,7 +703,7 @@ public: static bool EventLatencyIsImportant() { - return NS_IsMainThread() && XRE_GetProcessType() == GoannaProcessType_Default; + return NS_IsMainThread() && XRE_GetProcessType() == GeckoProcessType_Default; } }; diff --git a/xpcom/threads/nsTimerImpl.cpp b/xpcom/threads/nsTimerImpl.cpp index 0d73757d87..af658c813c 100644 --- a/xpcom/threads/nsTimerImpl.cpp +++ b/xpcom/threads/nsTimerImpl.cpp @@ -11,7 +11,7 @@ #include "nsThreadUtils.h" #include "plarena.h" #include "pratom.h" -#include "GoannaProfiler.h" +#include "GeckoProfiler.h" #include "mozilla/Atomics.h" #ifdef MOZ_NUWA_PROCESS #include "ipc/Nuwa.h"