From 30dd322d5a9142aacce660ae709fdcc9a9c770fc Mon Sep 17 00:00:00 2001 From: Roy Tam Date: Sat, 11 Jul 2020 08:42:58 +0800 Subject: [PATCH] import change from `dev' branch of rmottola/Arctic-Fox: - goanna -> gecko (cac9263ee) --- accessible/atk/AccessibleWrap.cpp | 6 +- accessible/atk/ApplicationAccessibleWrap.cpp | 12 +- accessible/atk/UtilInterface.cpp | 2 +- accessible/base/Asserts.cpp | 6 +- accessible/base/RelationTypeMap.h | 2 +- accessible/base/nsAccessibilityService.cpp | 6 +- accessible/generic/ApplicationAccessible.cpp | 2 +- accessible/generic/ApplicationAccessible.h | 2 +- accessible/generic/HyperTextAccessible.cpp | 2 +- accessible/interfaces/ia2/moz.build | 2 +- accessible/interfaces/msaa/ISimpleDOMNode.idl | 2 +- accessible/interfaces/msaa/moz.build | 2 +- .../interfaces/nsIAccessibleDocument.idl | 2 +- accessible/interfaces/nsIAccessibleRole.idl | 2 +- accessible/ipc/DocAccessibleChild.cpp | 2 +- accessible/jsat/AccessFu.jsm | 6 +- accessible/mac/Platform.mm | 4 +- accessible/mac/mozAccessible.h | 10 +- accessible/mac/mozAccessible.mm | 90 +- accessible/mac/mozActionElements.mm | 24 +- accessible/mac/mozDocAccessible.mm | 4 +- accessible/mac/mozHTMLAccessible.mm | 18 +- accessible/mac/mozTextAccessible.h | 4 +- accessible/mac/mozTextAccessible.mm | 82 +- .../mochitest/elm/test_nsApplicationAcc.html | 4 +- .../mochitest/events/test_valuechange.html | 2 +- .../tests/mochitest/role/test_general.html | 4 +- accessible/windows/ia2/ia2Accessible.cpp | 2 +- .../windows/ia2/ia2AccessibleRelation.cpp | 4 +- .../windows/ia2/ia2AccessibleRelation.h | 6 +- accessible/windows/ia2/ia2AccessibleText.cpp | 8 +- accessible/windows/ia2/ia2AccessibleText.h | 2 +- accessible/windows/msaa/AccessibleWrap.cpp | 10 +- accessible/windows/msaa/AccessibleWrap.h | 2 +- .../windows/msaa/HTMLWin32ObjectAccessible.h | 2 +- b2g/app/B2GLoader.cpp | 2 +- b2g/app/b2g.js | 2 +- b2g/app/macbuild/Contents/Info.plist.in | 2 +- b2g/app/moz.build | 4 +- b2g/app/nsBrowserApp.cpp | 2 +- b2g/app/ua-update.json.in | 4 +- b2g/chrome/content/devtools/debugger.js | 2 +- b2g/chrome/content/identity.js | 6 +- b2g/chrome/content/settings.js | 22 +- b2g/components/LogShake.jsm | 2 +- b2g/components/SystemAppProxy.jsm | 2 +- b2g/components/UpdatePrompt.js | 6 +- b2g/config/dolphin-512/config.json | 6 +- b2g/config/dolphin/config.json | 6 +- b2g/config/emulator-ics/config.json | 2 +- b2g/config/emulator-jb/config.json | 2 +- b2g/config/emulator-kk/config.json | 2 +- b2g/config/emulator/config.json | 2 +- b2g/config/flame-kk/config.json | 6 +- b2g/config/flame/config.json | 6 +- b2g/config/hamachi/config.json | 6 +- b2g/config/hamachi/limited-memory-config.json | 2 +- b2g/config/helix/config.json | 6 +- b2g/config/nexus-4/config.json | 6 +- b2g/config/nexus-5-l/config.json | 6 +- b2g/config/wasabi/config.json | 6 +- b2g/confvars.sh | 2 +- b2g/locales/Makefile.in | 2 +- browser/app/macbuild/Contents/Info.plist.in | 2 +- browser/app/moz.build | 4 +- browser/base/content/browser-fullScreen.js | 2 +- browser/base/content/browser.js | 2 +- .../components/feeds/WebContentConverter.js | 2 +- browser/components/nsBrowserContentHandler.js | 4 +- browser/components/nsBrowserGlue.js | 2 +- browser/installer/windows/nsis/shared.nsh | 2 +- .../chrome/browser-region/region.properties | 22 +- browser/locales/filter.py | 4 +- .../annotationProcessors/AnnotationInfo.java | 2 +- .../AnnotationProcessor.java | 10 +- build/annotationProcessors/CodeGenerator.java | 8 +- build/annotationProcessors/SDKProcessor.java | 12 +- .../classloader/AnnotatableEntity.java | 4 +- .../classloader/ClassWithOptions.java | 2 +- .../IterableJarLoadingURLClassLoader.java | 2 +- .../classloader/JarClassIterator.java | 2 +- ...AlphabeticAnnotatableEntityComparator.java | 2 +- .../utils/GeneratableElementIterator.java | 10 +- build/annotationProcessors/utils/Utils.java | 4 +- build/appini_header.py | 6 +- build/application.ini | 2 +- build/autoconf/config.status.m4 | 2 +- build/docs/defining-binaries.rst | 26 +- build/docs/preprocessor.rst | 4 +- ...ates.mozbuild => gecko_templates.mozbuild} | 48 +- build/mobile/b2gautomation.py | 2 +- build/mobile/robocop/Actions.java | 12 +- build/mobile/robocop/AndroidManifest.xml.in | 6 +- build/mobile/robocop/Assert.java | 2 +- build/mobile/robocop/Driver.java | 10 +- build/mobile/robocop/Element.java | 2 +- .../FennecInstrumentationTestRunner.java | 2 +- .../mobile/robocop/FennecMochitestAssert.java | 2 +- build/mobile/robocop/FennecNativeActions.java | 16 +- build/mobile/robocop/FennecNativeDriver.java | 72 +- build/mobile/robocop/FennecNativeElement.java | 2 +- build/mobile/robocop/FennecTalosAssert.java | 2 +- build/mobile/robocop/PaintedSurface.java | 2 +- build/mobile/robocop/RoboCopException.java | 2 +- build/mobile/robocop/RobocopShare1.java | 2 +- build/mobile/robocop/RobocopShare2.java | 2 +- build/mobile/robocop/RobocopUtils.java | 2 +- build/mobile/robocop/StructuredLogger.java | 2 +- build/mobile/robocop/moz.build | 4 +- .../sunspider/string-unpack-code.html | 2 +- build/sanitizers/lsan_suppressions.txt | 2 +- build/templates.mozbuild | 2 +- config/external/nss/moz.build | 2 +- config/rules.mk | 2 +- config/stl-headers | 2 +- configure.in | 6 +- docshell/base/nsIContentViewer.idl | 2 +- docshell/base/nsIGlobalHistory2.idl | 2 +- docshell/base/nsIWebNavigationInfo.idl | 2 +- dom/alarm/AlarmService.jsm | 4 +- dom/apps/AppsUtils.jsm | 8 +- dom/apps/InterAppComm.cpp | 2 +- dom/audiochannel/nsIAudioChannelAgent.idl | 10 +- dom/audiochannel/tests/moz.build | 2 +- dom/base/FragmentOrElement.cpp | 2 +- dom/base/NodeInfo.h | 4 +- dom/base/ScreenOrientation.h | 2 +- dom/base/ScriptSettings.cpp | 2 +- dom/base/ScriptSettings.h | 2 +- dom/base/WindowNamedPropertiesHandler.cpp | 2 +- dom/base/nsContentCreatorFunctions.h | 2 +- dom/base/nsContentUtils.h | 2 +- dom/base/nsDOMClassInfo.cpp | 6 +- dom/base/nsDOMMutationObserver.h | 2 +- dom/base/nsFrameMessageManager.cpp | 2 +- dom/base/nsHistory.cpp | 2 +- dom/base/nsIContentPolicy.idl | 6 +- dom/base/nsIDocument.h | 8 +- dom/base/nsJSUtils.cpp | 2 +- dom/base/nsLocation.cpp | 2 +- dom/base/nsScriptLoader.cpp | 4 +- dom/base/nsTreeSanitizer.cpp | 2 +- dom/base/test/moz.build | 2 +- dom/base/test/test_bug345339.html | 4 +- dom/bindings/Codegen.py | 42 +- dom/bindings/docs/index.rst | 2 +- dom/bindings/parser/WebIDL.py | 6 +- dom/bluetooth/BluetoothCommon.h | 4 +- .../bluedroid/BluetoothA2dpManager.cpp | 2 +- .../bluedroid/BluetoothDaemonHelpers.h | 4 +- .../bluedroid/BluetoothDaemonInterface.cpp | 8 +- .../bluedroid/BluetoothHALInterface.cpp | 6 +- .../bluedroid/hfp/BluetoothHfpManager.cpp | 2 +- .../test_dom_BluetoothManager_enabled.js | 2 +- dom/bluetooth/bluez/BluetoothA2dpManager.cpp | 2 +- dom/bluetooth/bluez/BluetoothHfpManager.cpp | 2 +- .../bluedroid/BluetoothA2dpManager.cpp | 2 +- .../bluedroid/BluetoothDaemonHelpers.h | 4 +- .../bluedroid/BluetoothDaemonInterface.cpp | 8 +- .../bluedroid/hfp/BluetoothHfpManager.cpp | 2 +- dom/bluetooth2/bluez/BluetoothA2dpManager.cpp | 2 +- dom/bluetooth2/bluez/BluetoothHfpManager.cpp | 2 +- dom/browser-element/BrowserElementPanning.js | 2 +- dom/browser-element/BrowserElementParent.js | 2 +- .../BrowserElementPromptService.jsm | 2 +- dom/camera/GonkCameraHwMgr.cpp | 2 +- dom/camera/GonkCameraParameters.h | 2 +- dom/canvas/compiledtest/moz.build | 2 +- dom/datastore/DataStore.cpp | 2 +- dom/encoding/EncodingUtils.h | 18 +- dom/encoding/TextDecoder.h | 4 +- dom/encoding/localesfallbacks.properties | 2 +- dom/events/Event.cpp | 2 +- dom/events/EventDispatcher.cpp | 2 +- dom/events/EventDispatcher.h | 2 +- dom/events/EventNameList.h | 2 +- dom/events/EventStateManager.cpp | 2 +- dom/events/EventStateManager.h | 2 +- dom/events/EventStates.h | 2 +- dom/fetch/Headers.h | 2 +- dom/fetch/InternalRequest.cpp | 2 +- dom/html/nsHTMLDocument.cpp | 2 +- dom/html/test/file_iframe_sandbox_d_if13.html | 2 +- dom/html/test/test_bug607145.html | 2 +- .../editing/conformancetest/test_event.html | 2 +- dom/imptests/editing/css/reset.css | 2 +- dom/imptests/editing/selecttest/common.js | 2 +- .../editing/selecttest/test_addRange.html | 2 +- dom/imptests/editing/tests.js | 12 +- dom/imptests/testharness.js | 2 +- dom/inputmethod/forms.js | 4 +- dom/inputmethod/mochitest/test_bug944397.html | 2 +- dom/interfaces/apps/mozIApplication.idl | 2 +- dom/interfaces/base/nsIDOMWindowUtils.idl | 2 +- dom/interfaces/base/nsITextInputProcessor.idl | 2 +- .../base/nsITextInputProcessorCallback.idl | 10 +- dom/interfaces/core/nsIDOMDocument.idl | 8 +- dom/interfaces/core/nsIDOMElement.idl | 2 +- dom/interfaces/events/nsIDOMEventTarget.idl | 2 +- dom/ipc/ContentParent.cpp | 2 +- dom/ipc/PBrowser.ipdl | 2 +- dom/ipc/PContent.ipdl | 2 +- dom/ipc/TabChild.cpp | 2 +- dom/ipc/nsIHangReport.idl | 2 +- dom/media/GraphDriver.cpp | 2 +- dom/media/MediaDecoder.h | 2 +- dom/media/MediaRecorder.cpp | 2 +- dom/media/MediaResource.h | 2 +- dom/media/MediaShutdownManager.h | 2 +- dom/media/MediaStreamGraph.cpp | 2 +- .../android/AndroidMediaResourceServer.h | 2 +- dom/media/android/MPAPI.h | 2 +- dom/media/compiledtest/moz.build | 2 +- dom/media/directshow/SourceFilter.cpp | 2 +- dom/media/gmp-plugin-openh264/moz.build | 2 +- dom/media/gmp-plugin/gmp-test-decryptor.cpp | 2 +- dom/media/gmp-plugin/moz.build | 2 +- dom/media/gmp/GMPLoader.h | 4 +- dom/media/gmp/GMPVideoDecoderProxy.h | 2 +- dom/media/gmp/GMPVideoEncoderProxy.h | 2 +- dom/media/gmp/README.txt | 2 +- dom/media/gmp/gmp-api/gmp-audio-decode.h | 2 +- dom/media/gmp/gmp-api/gmp-decryption.h | 22 +- dom/media/gmp/gmp-api/gmp-entrypoints.h | 2 +- dom/media/gmp/gmp-api/gmp-video-decode.h | 2 +- dom/media/gmp/gmp-api/gmp-video-encode.h | 2 +- dom/media/imagecapture/ImageCapture.cpp | 2 +- dom/media/test/test_texttrackcue.html | 2 +- dom/media/webaudio/compiledtest/moz.build | 2 +- ...ediaElementAudioSourceNodeCrossOrigin.html | 2 +- .../webspeech/synth/pico/nsPicoService.cpp | 2 +- .../marionette/test_mobile_call_forwarding.js | 4 +- .../marionette/test_mobile_data_connection.js | 2 +- dom/mobilemessage/Types.h | 2 +- .../interfaces/nsIMobileMessageCallback.idl | 2 +- dom/nfc/gonk/nfc_consts.js | 2 +- dom/plugins/base/PluginPRLibrary.cpp | 2 +- dom/plugins/base/android/ANPAudio.cpp | 2 +- dom/plugins/base/android/ANPBase.h | 4 +- dom/plugins/base/android/ANPBitmap.cpp | 2 +- dom/plugins/base/android/ANPEvent.cpp | 2 +- dom/plugins/base/android/ANPLog.cpp | 4 +- dom/plugins/base/android/ANPMatrix.cpp | 2 +- dom/plugins/base/android/ANPNativeWindow.cpp | 2 +- dom/plugins/base/android/ANPOpenGL.cpp | 2 +- dom/plugins/base/android/ANPSurface.cpp | 2 +- dom/plugins/base/android/ANPSystem.cpp | 2 +- dom/plugins/base/android/ANPVideo.cpp | 2 +- dom/plugins/base/android/ANPWindow.cpp | 2 +- dom/plugins/base/nsNPAPIPlugin.cpp | 2 +- dom/plugins/base/nsNPAPIPluginInstance.cpp | 4 +- dom/plugins/base/nsNPAPIPluginInstance.h | 6 +- dom/plugins/base/nsPluginInstanceOwner.cpp | 46 +- dom/plugins/ipc/PPluginInstance.ipdl | 2 +- dom/plugins/ipc/PPluginModule.ipdl | 2 +- dom/plugins/ipc/PluginInstanceChild.cpp | 4 +- dom/plugins/ipc/PluginModuleParent.cpp | 2 +- dom/plugins/ipc/PluginModuleParent.h | 6 +- dom/plugins/test/testplugin/README | 2 +- dom/plugins/test/testplugin/nptest_macosx.mm | 2 +- .../test/testplugin/testplugin.mozbuild | 4 +- dom/power/PowerManagerService.cpp | 2 +- dom/power/nsIPowerManagerService.idl | 2 +- dom/secureelement/gonk/UiccConnector.js | 2 +- dom/smil/nsSMILCSSProperty.cpp | 4 +- dom/storage/DOMStorageDBThread.cpp | 6 +- .../test/object-delayed-intrinsic-size.sjs | 2 +- dom/system/OSFileConstants.cpp | 2 +- dom/system/gonk/AudioManager.cpp | 2 +- dom/system/gonk/ril_worker.js | 30 +- .../tests/marionette/ril_jshint/README.md | 4 +- .../test_ril_worker_icc_ICCUtilsHelper.js | 10 +- .../test_ril_worker_icc_SimRecordHelper.js | 4 +- dom/system/gonk/tests/test_ril_worker_ruim.js | 4 +- .../mochitest/ajax/jquery/test/unit/core.js | 18 +- .../ajax/mochikit/MochiKit/DragAndDrop.js | 2 +- .../ajax/mochikit/MochiKit/Sortable.js | 6 +- .../mochitest/ajax/mochikit/MochiKit/Style.js | 2 +- .../ajax/prototype/dist/prototype.js | 6 +- .../ajax/prototype/test/unit/base_test.js | 6 +- .../ajax/scriptaculous/lib/prototype.js | 6 +- .../ajax/scriptaculous/src/dragdrop.js | 8 +- .../mochitest/ajax/scriptaculous/src/sound.js | 2 +- dom/tests/mochitest/bugs/test_bug411103.html | 2 +- dom/tests/mochitest/fetch/test_request.js | 4 +- dom/tests/mochitest/fetch/test_response.js | 4 +- dom/tests/mochitest/whatwg/browserFu.js | 2 +- .../whatwg/postMessage_userpass_helper.html | 2 +- .../whatwg/test_postMessage_special.xhtml | 2 +- dom/tv/nsITVService.idl | 6 +- dom/webidl/AnonymousContent.webidl | 2 +- dom/webidl/CaretPosition.webidl | 2 +- dom/webidl/CustomEvent.webidl | 2 +- dom/webidl/DOMException.webidl | 2 +- dom/webidl/DeviceOrientationEvent.webidl | 2 +- dom/webidl/Document.webidl | 6 +- dom/webidl/Element.webidl | 4 +- dom/webidl/MutationObserver.webidl | 2 +- dom/webidl/Navigator.webidl | 2 +- dom/webidl/SettingChangeNotification.webidl | 2 +- dom/webidl/XMLDocument.webidl | 2 +- dom/wifi/WifiProxyService.cpp | 2 +- dom/wifi/WifiWorker.js | 4 +- dom/workers/DataStore.cpp | 2 +- dom/workers/DataStoreCursor.cpp | 2 +- dom/workers/WorkerPrivate.cpp | 2 +- dom/workers/WorkerScope.cpp | 2 +- dom/xbl/nsBindingManager.cpp | 2 +- dom/xslt/tests/mochitest/test_bug603159.html | 2 +- dom/xul/nsIXULOverlayProvider.idl | 2 +- dom/xul/nsXULContentSink.cpp | 2 +- editor/composer/nsEditingSession.cpp | 2 +- editor/libeditor/nsEditorEventListener.cpp | 2 +- editor/libeditor/nsHTMLEditor.cpp | 2 +- .../lib/richtext/richtext/js/range.js | 22 +- .../richtext2/richtext2/static/js/range.js | 30 +- editor/txmgr/tests/moz.build | 2 +- embedding/browser/nsIEmbeddingSiteWindow.idl | 2 +- embedding/browser/nsIWebBrowserChrome.idl | 2 +- embedding/browser/nsIWebBrowserPrint.idl | 2 +- .../windowwatcher/nsIWindowWatcher.idl | 2 +- .../components/windowwatcher/nsPromptUtils.h | 2 +- embedding/nsEmbedCID.h | 4 +- embedding/nsIWindowCreator.idl | 4 +- embedding/nsIWindowCreator2.idl | 2 +- embedding/nsIWindowProvider.idl | 4 +- embedding/tests/winEmbed/moz.build | 2 +- embedding/tests/winEmbed/winEmbed.rc | 2 +- .../test/unit/test_schema_2_migration.js | 4 +- .../test/unit/test_schema_3_migration.js | 4 +- .../hunspell-en_US-20081205.dic | 2 +- .../dictionary-sources/mozilla-specific.txt | 2 +- .../locales/en-US/hunspell/en-US.dic | 4 +- gfx/angle/src/libEGL/moz.build | 2 +- gfx/angle/src/libGLESv2/moz.build | 2 +- gfx/doc/AsyncPanZoom.md | 22 +- gfx/doc/GraphicsOverview.md | 2 +- gfx/doc/SharedMozSurface.md | 6 +- gfx/gl/GLContext.cpp | 2 +- gfx/gl/GLContextProviderImpl.h | 4 +- gfx/gl/GLContextSymbols.h | 2 +- gfx/layers/Compositor.h | 2 +- gfx/layers/FrameMetrics.h | 8 +- gfx/layers/Layers.h | 6 +- .../apz/public/GeckoContentController.h | 4 +- gfx/layers/apz/src/APZCTreeManager.cpp | 62 +- gfx/layers/apz/src/APZCTreeManager.h | 6 +- gfx/layers/apz/src/AsyncPanZoomController.cpp | 34 +- gfx/layers/apz/src/AsyncPanZoomController.h | 30 +- gfx/layers/apz/src/InputBlockState.h | 4 +- gfx/layers/apz/testutil/APZTestData.h | 2 +- gfx/layers/apz/util/APZCCallbackHelper.cpp | 18 +- gfx/layers/client/ClientTiledPaintedLayer.cpp | 2 +- gfx/layers/client/ImageClient.h | 2 +- .../composite/AsyncCompositionManager.cpp | 24 +- gfx/layers/ipc/AsyncTransactionTracker.h | 4 +- gfx/layers/ipc/CompositableForwarder.h | 2 +- .../ipc/CompositableTransactionParent.cpp | 2 +- gfx/layers/ipc/ISurfaceAllocator.h | 2 +- gfx/layers/ipc/LayerTransactionParent.cpp | 2 +- gfx/layers/moz.build | 2 +- gfx/layers/opengl/TextureHostOGL.cpp | 2 +- gfx/layers/opengl/TextureHostOGL.h | 2 +- gfx/qcms/transform.c | 2 +- gfx/tests/crashtests/407842.html | 2 +- .../gtest/TestAsyncPanZoomController.cpp | 56 +- gfx/thebes/VsyncSource.h | 2 +- gfx/thebes/gfxAndroidPlatform.cpp | 8 +- gfx/thebes/gfxFT2FontList.cpp | 2 +- gfx/thebes/gfxPlatform.h | 4 +- gfx/thebes/gfxPlatformMac.cpp | 2 +- gfx/thebes/gfxScriptItemizer.cpp | 2 +- gfx/thebes/gfxScriptItemizer.h | 2 +- gfx/thebes/moz.build | 2 +- hal/gonk/GonkHal.cpp | 6 +- hal/linux/LinuxPower.cpp | 4 +- hal/windows/WindowsBattery.cpp | 2 +- image/imgLoader.cpp | 2 +- intl/hyphenation/hnjalloc.h | 2 +- intl/hyphenation/nsHyphenator.cpp | 2 +- intl/lwbrk/tests/moz.build | 2 +- intl/lwbrk/tools/spec_table.html | 6 +- intl/uconv/nsScriptableUConv.cpp | 2 +- intl/unicharutil/tests/moz.build | 2 +- ipc/app/moz.build | 2 +- ipc/chromium/src/base/message_loop.cc | 2 +- ipc/chromium/src/base/message_loop.h | 4 +- ipc/chromium/src/base/thread.cc | 2 +- .../src/chrome/common/ipc_channel_posix.cc | 2 +- ipc/chromium/src/chrome/common/ipc_message.cc | 2 +- ipc/chromium/src/chrome/common/ipc_message.h | 2 +- ipc/contentproc/plugin-container.cpp | 2 +- ipc/glue/BrowserProcessSubThread.cpp | 4 +- ipc/glue/MessagePump.cpp | 2 +- ipc/glue/ProcessUtils.h | 2 +- ipc/glue/ProcessUtils_linux.cpp | 22 +- ipc/glue/SharedMemoryBasic_android.cpp | 2 +- ipc/glue/WindowsMessageLoop.cpp | 10 +- ipc/ipdl/ipdl/lower.py | 2 +- ipc/ipdl/test/cxx/app/moz.build | 2 +- ipc/unixsocket/SocketBase.h | 2 +- js/ipc/JavaScriptShared.cpp | 8 +- js/ipc/JavaScriptShared.h | 4 +- js/public/Debug.h | 8 +- js/public/Proxy.h | 2 +- js/public/TypeDecls.h | 2 +- js/public/Utility.h | 2 +- js/src/Makefile.in | 2 +- js/src/builtin/TestingFunctions.cpp | 2 +- js/src/devtools/rootAnalysis/README.txt | 2 +- js/src/doc/Debugger/Debugger-API.md | 10 +- .../doc/Debugger/Tutorial-Alloc-Log-Tree.md | 2 +- js/src/gc/GCRuntime.h | 2 +- js/src/gdb/moz.build | 2 +- .../sunspider/check-string-unpack-code.js | 2 +- js/src/jsapi-tests/moz.build | 2 +- js/src/jsapi.cpp | 4 +- js/src/jsapi.h | 2 +- js/src/jscntxt.cpp | 8 +- js/src/jsfriendapi.h | 4 +- js/src/jstypes.h | 2 +- js/src/moz.build | 2 +- js/src/octane/mandreel.js | 2 +- js/src/octane/pdfjs.js | 2 +- js/src/shell/moz.build | 2 +- js/src/tests/browser.js | 4 +- js/src/tests/ecma_3/RegExp/regress-375711.js | 2 +- js/src/tests/js1_2/function/regexparg-1.js | 6 +- js/src/tests/js1_5/Regress/regress-449627.js | 2 +- .../tests/js1_5/extensions/regress-355820.js | 2 +- .../tests/js1_5/extensions/regress-367923.js | 2 +- .../tests/js1_5/extensions/regress-375344.js | 2 +- .../tests/js1_5/extensions/regress-406572.js | 2 +- js/src/vm/NativeObject.cpp | 2 +- js/src/vm/TypedArrayObject.cpp | 2 +- js/xpconnect/idl/xpccomponents.idl | 6 +- js/xpconnect/shell/moz.build | 2 +- js/xpconnect/src/XPCJSRuntime.cpp | 2 +- js/xpconnect/src/XPCWrappedJSClass.cpp | 4 +- js/xpconnect/src/xpcprivate.h | 2 +- layout/base/TouchCaret.cpp | 2 +- layout/base/nsDisplayList.cpp | 2 +- layout/base/nsLayoutUtils.cpp | 2 +- layout/base/nsLayoutUtils.h | 4 +- layout/base/nsPresContext.h | 2 +- layout/base/nsPresShell.cpp | 4 +- layout/doc/DD-SpaceManager.html | 4 +- layout/doc/HLD-SpaceManager.html | 2 +- layout/doc/dd-template.html | 2 +- layout/doc/hld-template.html | 2 +- layout/doc/index.html | 2 +- layout/doc/obsolete/layout-internals.html | 2 +- layout/doc/obsolete/layout.xml | 6 +- layout/doc/overview.html | 2 +- layout/generic/crashtests/410198.html | 2 +- layout/generic/nsIFrame.h | 2 +- layout/generic/nsPluginFrame.cpp | 8 +- layout/generic/nsPluginFrame.h | 2 +- layout/media/moz.build | 2 +- .../box-shadow/boxshadow-inner-basic-ref.svg | 2 +- .../flexbox/flexbox-widget-flex-items-1.html | 2 +- layout/style/AnimationCommon.cpp | 6 +- layout/style/Loader.h | 2 +- layout/style/nsCSSPseudoClassList.h | 2 +- layout/style/nsMediaFeatures.cpp | 4 +- layout/style/test/flexbox_layout_testcases.js | 2 +- layout/style/test/property_database.js | 2 +- layout/style/test/test_bug405818.html | 2 +- layout/style/test/test_font_loading_api.html | 4 +- layout/svg/crashtests/767056-1.svg | 2 +- layout/svg/nsSVGIntegrationUtils.h | 2 +- layout/tools/layout-debug/application.ini | 2 +- layout/tools/reftest/reftest-analyzer.xhtml | 2 +- layout/tools/reftest/runreftestb2g.py | 16 +- layout/xul/tree/nsTreeBodyFrame.cpp | 2 +- media/gmp-clearkey/0.1/AudioDecoder.cpp | 2 +- media/gmp-clearkey/0.1/VideoDecoder.cpp | 4 +- media/gmp-clearkey/0.1/clearkey.info.in | 2 +- media/libcubeb/src/cubeb_audiotrack.c | 2 +- media/libcubeb/tests/moz.build | 4 +- media/libmkv/update.sh | 2 +- media/mtransport/nr_socket_prsock.h | 2 +- media/mtransport/test/moz.build | 4 +- media/omx-plugin/gb/moz.build | 2 +- media/omx-plugin/gb235/moz.build | 2 +- media/omx-plugin/hc/moz.build | 2 +- media/omx-plugin/kk/moz.build | 2 +- .../lib/gb/libstagefright/moz.build | 2 +- .../libstagefright_color_conversion/moz.build | 2 +- media/omx-plugin/lib/gb/libutils/moz.build | 2 +- .../lib/gb235/libstagefright/moz.build | 2 +- .../lib/hc/libstagefright/moz.build | 2 +- .../lib/ics/libstagefright/moz.build | 2 +- media/omx-plugin/lib/ics/libutils/moz.build | 2 +- .../lib/ics/libvideoeditorplayer/moz.build | 2 +- media/omx-plugin/moz.build | 2 +- .../videoengine/CaptureCapabilityAndroid.java | 2 +- .../videoengine/VideoCaptureAndroid.java | 12 +- .../VideoCaptureDeviceInfoAndroid.java | 2 +- memory/build/jemalloc_config.c | 2 +- memory/build/mozmemory_wrap.h | 4 +- memory/mozalloc/moz.build | 2 +- memory/mozalloc/mozalloc_abort.cpp | 2 +- memory/mozalloc/throw_gcc.h | 2 +- memory/replace/dmd/DMD.h | 2 +- memory/replace/dmd/test/moz.build | 2 +- memory/replace/logalloc/replay/Replay.cpp | 2 +- mfbt/Assertions.h | 2 +- mfbt/Atomics.h | 2 +- mfbt/Compiler.h | 2 +- mfbt/RefCounted.h | 2 +- mfbt/Types.h | 2 +- modules/libpref/init/all.js | 6 +- modules/libpref/nsIPrefBranch.idl | 2 +- mozglue/build/Nuwa.cpp | 2 +- mozglue/linker/CustomElf.cpp | 2 +- mozglue/linker/Logging.h | 6 +- mozglue/linker/Mappable.cpp | 2 +- mozglue/tests/moz.build | 2 +- netwerk/base/nsASocketHandler.h | 2 +- netwerk/base/nsIClassOfService.idl | 2 +- netwerk/base/nsIProtocolHandler.idl | 2 +- netwerk/base/nsIServerSocket.idl | 4 +- netwerk/base/nsISiteSecurityService.idl | 2 +- netwerk/base/nsIURI.idl | 2 +- netwerk/base/nsSocketTransport2.cpp | 2 +- netwerk/dns/DNS.h | 4 +- netwerk/dns/nsEffectiveTLDService.cpp | 2 +- netwerk/dns/prepare_tlds.py | 2 +- netwerk/protocol/device/CameraStreamImpl.cpp | 4 +- netwerk/protocol/http/Http2Stream.h | 2 +- netwerk/protocol/http/nsHttpConnectionMgr.cpp | 2 +- netwerk/protocol/http/nsHttpHandler.cpp | 6 +- netwerk/streamconv/test/moz.build | 2 +- netwerk/test/TestOverlappedIO.cpp | 2 +- netwerk/test/TestSocketIO.cpp | 2 +- netwerk/test/moz.build | 2 +- netwerk/test/unit/xpcshell.ini | 2 +- other-licenses/android/res_send.c | 2 +- parser/html/javasrc/TreeBuilder.java | 4 +- parser/html/nsHtml5StreamParser.cpp | 4 +- parser/html/nsHtml5TreeOperation.cpp | 4 +- parser/html/nsHtml5TreeOperation.h | 8 +- parser/html/nsIParserUtils.idl | 6 +- parser/htmlparser/nsIParser.h | 4 +- .../html5lib_upstream.txt | 2 +- python/lldbutils/README.txt | 4 +- .../mozbuild/action/package_goannalibs_aar.py | 2 +- .../mozbuild/mozbuild/backend/cpp_eclipse.py | 6 +- python/mozbuild/mozpack/mozjar.py | 10 +- rdf/tests/rdfcat/moz.build | 2 +- rdf/tests/rdfpoll/moz.build | 2 +- rdf/tests/triplescat/moz.build | 2 +- .../certverifier/NSSCertDBTrustDomain.cpp | 4 +- security/certverifier/OCSPCache.cpp | 2 +- security/certverifier/moz.build | 2 +- security/manager/ssl/src/nsNSSIOLayer.cpp | 2 +- security/manager/ssl/tests/compiled/moz.build | 2 +- .../gentestfiles/sign_b2g_app.py | 2 +- .../ssl/tests/unit/tlsserver/cmd/moz.build | 2 +- .../ssl/tests/unit/tlsserver/lib/TLSServer.h | 2 +- security/pkix/lib/pkixcert.cpp | 2 +- security/pkix/lib/pkixnames.cpp | 2 +- security/pkix/test/gtest/README.txt | 2 +- security/pkix/test/lib/pkixtestnss.cpp | 2 +- security/sandbox/linux/SandboxFilter.cpp | 2 +- security/sandbox/mac/Sandbox.h | 6 +- services/common/storageservice.js | 2 +- services/docs/datareporting.rst | 4 +- services/docs/metrics.rst | 2 +- services/healthreport/docs/dataformat.rst | 14 +- services/healthreport/docs/index.rst | 2 +- services/healthreport/healthreporter.jsm | 2 +- services/healthreport/providers.jsm | 2 +- startupcache/test/moz.build | 2 +- storage/src/moz.build | 2 +- storage/test/moz.build | 4 +- testing/docker/builder/bin/gaia_props.py | 2 +- .../marionette/client/docs/advanced/debug.rst | 4 +- testing/marionette/client/docs/basics.rst | 8 +- .../client/marionette/marionette_test.py | 4 +- .../client/marionette/runner/base.py | 2 +- .../client/marionette/runner/mixins/b2g.py | 2 +- .../marionette/runner/mixins/reporting.py | 8 +- .../driver/marionette_driver/errors.py | 2 +- .../marionette_driver/goannainstance.py | 8 +- .../driver/marionette_driver/marionette.py | 2 +- testing/marionette/mach_commands.py | 2 +- .../marionette_transport/transport.py | 2 +- testing/marionette/transport/setup.py | 4 +- testing/mochitest/MochiKit/Style.js | 2 +- testing/mochitest/MochiKit/packed.js | 2 +- testing/mochitest/roboextender/bootstrap.js | 2 +- testing/mochitest/ssltunnel/moz.build | 2 +- .../tests/MochiKit-1.4.2/MochiKit/Signal.js | 2 +- .../tests/MochiKit-1.4.2/MochiKit/Style.js | 2 +- .../mochitest/tests/SimpleTest/TestRunner.js | 2 +- testing/mozbase/docs/mozinstall.rst | 2 +- testing/mozbase/docs/mozrunner.rst | 6 +- testing/mozbase/mozcrash/mozcrash/mozcrash.py | 6 +- testing/mozbase/mozcrash/tests/test.py | 8 +- testing/mozbase/mozdevice/mozdevice/dmcli.py | 2 +- testing/mozbase/mozdevice/tests/sut_logcat.py | 10 +- .../mozlog/structured/formatters/html/html.py | 8 +- .../mozrunner/mozrunner/base/__init__.py | 2 +- .../mozrunner/mozrunner/base/browser.py | 2 +- .../mozbase/mozrunner/mozrunner/runners.py | 18 +- .../mozharness/configs/android/androidx86.py | 2 +- .../scripts/b2g_desktop_unittest.py | 4 +- .../scripts/b2g_emulator_unittest.py | 4 +- .../mozharness/scripts/firefox_ui_updates.py | 2 +- testing/mozharness/scripts/marionette.py | 4 +- .../scripts/merge_day/goanna_migration.py | 12 +- .../components/SpecialPowersObserver.js | 2 +- testing/talos/mach_commands.py | 2 +- testing/taskcluster/README.md | 2 +- testing/taskcluster/mach_commands.py | 4 +- testing/web-platform/README.md | 8 +- .../IndexedDB/idbcursor_update_index.htm | 2 +- .../idbcursor_update_objectstore.htm | 2 +- .../_functional/tree/js/prototype.js | 6 +- .../tests/dom/events/Event-propagation.html | 2 +- .../tests/html/dom/interfaces.html | 2 +- .../the-navigator-object/NavigatorID.js | 2 +- .../tests/resources/testharness.js | 2 +- .../src/test/test_handshake_hybi.py | 2 +- .../src/test/test_handshake_hybi00.py | 2 +- .../web-platform/tests/workers/interfaces.idl | 2 +- testing/web-platform/update/tree.py | 10 +- testing/web-platform/update/update.py | 8 +- testing/xpcshell/runtestsb2g.py | 2 +- toolkit/commonjs/sdk/platform/xpcom.js | 4 +- toolkit/commonjs/sdk/selection.js | 2 +- toolkit/commonjs/sdk/tabs/observer.js | 2 +- toolkit/commonjs/sdk/test/harness.js | 2 +- .../addoncompat/RemoteAddonsParent.jsm | 2 +- toolkit/components/crashes/CrashManager.jsm | 2 +- .../components/crashes/docs/crash-events.rst | 16 +- toolkit/components/crashes/docs/index.rst | 2 +- .../test/xml/rss1/full_feed_not_bozo.xml | 2 +- .../components/places/nsAnnotationService.cpp | 2 +- toolkit/components/places/tests/cpp/moz.build | 2 +- toolkit/components/telemetry/Histograms.json | 6 +- .../tests/unit/test_ThreadHangStats.js | 2 +- toolkit/content/aboutSupport.js | 4 +- toolkit/content/jar.mn | 2 +- .../tests/fennec-tile-testapp/application.ini | 2 +- toolkit/devtools/gcli/source/lib/gcli/cli.js | 4 +- toolkit/devtools/security/socket.js | 2 +- toolkit/devtools/server/actors/animation.js | 2 +- toolkit/devtools/server/actors/memory.js | 4 +- toolkit/devtools/server/actors/profiler.js | 6 +- toolkit/devtools/server/actors/root.js | 2 +- toolkit/devtools/server/actors/storage.js | 2 +- toolkit/devtools/server/actors/timeline.js | 4 +- toolkit/devtools/styleinspector/css-logic.js | 2 +- toolkit/library/moz.build | 4 +- .../en-US/chrome/global/devtools/profiler.dtd | 6 +- .../global/devtools/profiler.properties | 2 +- .../en-US/chrome/global/devtools/toolbox.dtd | 4 +- toolkit/mozapps/installer/upload-files.mk | 10 +- .../mozapps/installer/windows/nsis/common.nsh | 2 +- toolkit/mozapps/update/tests/data/shared.js | 8 +- .../update/updater/progressui_gonk.cpp | 2 +- toolkit/xre/CreateAppData.cpp | 4 +- toolkit/xre/MacApplicationDelegate.mm | 6 +- toolkit/xre/nsAndroidStartup.cpp | 6 +- toolkit/xre/nsAppRunner.cpp | 4 +- toolkit/xre/nsEmbedFunctions.cpp | 4 +- toolkit/xre/nsNativeAppSupportUnix.cpp | 2 +- toolkit/xre/nsSigHandlers.cpp | 2 +- tools/profiler/TableTicker.cpp | 6 +- tools/profiler/TableTicker.h | 2 +- tools/profiler/TracedTaskCommon.cpp | 2 +- tools/profiler/TracedTaskCommon.h | 2 +- tools/profiler/platform.cpp | 6 +- uriloader/base/nsIWebProgressListener.idl | 2 +- .../exthandler/nsIContentDispatchChooser.idl | 2 +- .../exthandler/nsIHelperAppLauncherDialog.idl | 4 +- uriloader/exthandler/tests/moz.build | 2 +- widget/InputData.h | 2 +- widget/TextEventDispatcher.h | 2 +- widget/cocoa/NativeKeyBindings.mm | 30 +- widget/cocoa/TextInputHandler.h | 50 +- widget/cocoa/TextInputHandler.mm | 60 +- widget/cocoa/mozView.h | 8 +- widget/cocoa/nsAppShell.h | 6 +- widget/cocoa/nsAppShell.mm | 36 +- widget/cocoa/nsChildView.h | 16 +- widget/cocoa/nsChildView.mm | 450 ++--- widget/cocoa/nsClipboard.mm | 2 +- widget/cocoa/nsCocoaUtils.h | 36 +- widget/cocoa/nsCocoaUtils.mm | 56 +- widget/cocoa/nsCocoaWindow.h | 12 +- widget/cocoa/nsCocoaWindow.mm | 164 +- widget/cocoa/nsDragService.h | 2 +- widget/cocoa/nsDragService.mm | 2 +- widget/cocoa/nsMacCursor.h | 6 +- widget/cocoa/nsMenuBarX.h | 14 +- widget/cocoa/nsMenuBarX.mm | 52 +- widget/cocoa/nsMenuItemX.mm | 6 +- widget/cocoa/nsMenuUtilsX.h | 4 +- widget/cocoa/nsMenuUtilsX.mm | 14 +- widget/cocoa/nsMenuX.h | 8 +- widget/cocoa/nsMenuX.mm | 26 +- widget/cocoa/nsNativeThemeCocoa.mm | 8 +- widget/cocoa/nsPrintDialogX.mm | 10 +- widget/cocoa/nsScreenCocoa.mm | 8 +- widget/cocoa/nsScreenManagerCocoa.mm | 2 +- widget/cocoa/nsWindowMap.mm | 4 +- widget/gonk/GeckoTouchDispatcher.cpp | 26 +- widget/gonk/HwcComposer2D.h | 4 +- widget/gonk/nsAppShell.cpp | 80 +- widget/gonk/nsAppShell.h | 8 +- widget/gonk/nsWindow.cpp | 2 +- widget/gonk/nsWindow.h | 2 +- widget/gtk/nsDeviceContextSpecG.cpp | 12 +- widget/gtk/nsDragService.cpp | 6 +- widget/gtk/nsGtkIMModule.cpp | 4 +- widget/gtk/nsGtkIMModule.h | 8 +- widget/gtk/nsPrintDialogGTK.cpp | 14 +- widget/gtk/nsPrintSettingsGTK.cpp | 8 +- widget/gtk/nsPrintSettingsGTK.h | 4 +- widget/gtk/nsWindow.cpp | 46 +- widget/gtk/nsWindow.h | 4 +- widget/nsBaseAppShell.cpp | 10 +- widget/nsBaseAppShell.h | 10 +- widget/nsIAppShell.idl | 10 +- widget/nsIClipboardDragDropHookList.idl | 4 +- widget/nsIClipboardDragDropHooks.idl | 2 +- widget/nsIPrintOptions.idl | 2 +- widget/nsITaskbarWindowPreview.idl | 4 +- widget/nsIWidget.h | 12 +- widget/nsIdleService.cpp | 2 +- widget/qt/nsPrintSettingsQt.cpp | 4 +- widget/qt/nsWindow.cpp | 2 +- widget/tests/moz.build | 2 +- widget/tests/test_keycodes.xul | 22 +- widget/windows/AudioSession.cpp | 2 +- widget/windows/KeyboardLayout.cpp | 2 +- widget/windows/WinMouseScrollHandler.cpp | 2 +- widget/windows/WinMouseScrollHandler.cpp.bak | 1595 ----------------- widget/windows/nsAppShell.cpp | 20 +- widget/windows/nsNativeDragTarget.cpp | 26 +- widget/windows/nsNativeDragTarget.h | 6 +- widget/windows/nsNativeThemeWin.cpp | 2 +- widget/windows/nsTextStore.cpp | 6 +- widget/windows/nsWindow.cpp | 10 +- widget/windows/nsWindowBase.h | 10 +- xpcom/base/nsConsoleService.cpp | 4 +- xpcom/base/nsDebugImpl.cpp | 2 +- xpcom/base/nsDumpUtils.h | 2 +- xpcom/base/nsIMemoryReporter.idl | 2 +- xpcom/build/FileLocation.h | 2 +- xpcom/build/XPCOMInit.cpp | 2 +- xpcom/build/nsXPCOM.h | 4 +- xpcom/components/ManifestParser.cpp | 8 +- xpcom/glue/nsCRTGlue.cpp | 2 +- xpcom/reflect/xptcall/tests/moz.build | 2 +- xpcom/reflect/xptinfo/tests/moz.build | 2 +- xpcom/tests/external/moz.build | 2 +- xpcom/tests/moz.build | 10 +- xpcom/tests/unit/test_streams.js | 8 +- xpcom/tests/windows/moz.build | 2 +- xpcom/threads/nsMemoryPressure.h | 4 +- xpcom/threads/nsThread.cpp | 2 +- xpfe/components/build/nsModule.cpp | 2 +- xulrunner/app/install_app.py | 8 +- xulrunner/app/moz.build | 2 +- xulrunner/examples/simple/application.ini | 6 +- xulrunner/installer/debian/control | 2 +- xulrunner/stub/moz.build | 2 +- xulrunner/tools/redit/moz.build | 2 +- 773 files changed, 2295 insertions(+), 3890 deletions(-) rename build/{goanna_templates.mozbuild => gecko_templates.mozbuild} (75%) delete mode 100644 widget/windows/WinMouseScrollHandler.cpp.bak diff --git a/accessible/atk/AccessibleWrap.cpp b/accessible/atk/AccessibleWrap.cpp index 37dc0daf83..3bf53eabc4 100644 --- a/accessible/atk/AccessibleWrap.cpp +++ b/accessible/atk/AccessibleWrap.cpp @@ -966,7 +966,7 @@ refRelationSetCB(AtkObject *aAtkObj) ATK_OBJECT_CLASS(parent_class)->ref_relation_set(aAtkObj); const AtkRelationType typeMap[] = { -#define RELATIONTYPE(goanna, s, atk, m, i) atk, +#define RELATIONTYPE(gecko, s, atk, m, i) atk, #include "RelationTypeMap.h" #undef RELATIONTYPE }; @@ -1003,8 +1003,8 @@ refRelationSetCB(AtkObject *aAtkObj) if (!accWrap) return relation_set; -#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \ - UpdateAtkRelation(RelationType::goannaType, accWrap, atkType, relation_set); +#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \ + UpdateAtkRelation(RelationType::geckoType, accWrap, atkType, relation_set); #include "RelationTypeMap.h" diff --git a/accessible/atk/ApplicationAccessibleWrap.cpp b/accessible/atk/ApplicationAccessibleWrap.cpp index f5f6547d5f..672c4dd163 100644 --- a/accessible/atk/ApplicationAccessibleWrap.cpp +++ b/accessible/atk/ApplicationAccessibleWrap.cpp @@ -36,10 +36,10 @@ toplevel_event_watcher(GSignalInvocationHint* ihint, const GValue* param_values, gpointer data) { - static GQuark sQuark_goanna_acc_obj = 0; + static GQuark sQuark_gecko_acc_obj = 0; - if (!sQuark_goanna_acc_obj) - sQuark_goanna_acc_obj = g_quark_from_static_string("GoannaAccObj"); + if (!sQuark_gecko_acc_obj) + sQuark_gecko_acc_obj = g_quark_from_static_string("GeckoAccObj"); if (nsAccessibilityService::IsShutdown()) return TRUE; @@ -58,7 +58,7 @@ toplevel_event_watcher(GSignalInvocationHint* ihint, // Attach the dialog accessible to app accessible tree Accessible* windowAcc = GetAccService()->AddNativeRootAccessible(child); - g_object_set_qdata(G_OBJECT(child), sQuark_goanna_acc_obj, + g_object_set_qdata(G_OBJECT(child), sQuark_gecko_acc_obj, reinterpret_cast(windowAcc)); } else { @@ -66,10 +66,10 @@ toplevel_event_watcher(GSignalInvocationHint* ihint, // Deattach the dialog accessible Accessible* windowAcc = reinterpret_cast - (g_object_get_qdata(G_OBJECT(child), sQuark_goanna_acc_obj)); + (g_object_get_qdata(G_OBJECT(child), sQuark_gecko_acc_obj)); if (windowAcc) { GetAccService()->RemoveNativeRootAccessible(windowAcc); - g_object_set_qdata(G_OBJECT(child), sQuark_goanna_acc_obj, nullptr); + g_object_set_qdata(G_OBJECT(child), sQuark_gecko_acc_obj, nullptr); } } diff --git a/accessible/atk/UtilInterface.cpp b/accessible/atk/UtilInterface.cpp index 36cf10635d..7dade78dfb 100644 --- a/accessible/atk/UtilInterface.cpp +++ b/accessible/atk/UtilInterface.cpp @@ -20,7 +20,7 @@ typedef AtkUtil MaiUtil; typedef AtkUtilClass MaiUtilClass; #define MAI_VERSION MOZILLA_VERSION -#define MAI_NAME "Goanna" +#define MAI_NAME "Gecko" extern "C" { static guint (*gail_add_global_event_listener)(GSignalEmissionHook listener, diff --git a/accessible/base/Asserts.cpp b/accessible/base/Asserts.cpp index 1014337c77..b97a48ec48 100644 --- a/accessible/base/Asserts.cpp +++ b/accessible/base/Asserts.cpp @@ -18,9 +18,9 @@ using namespace mozilla::a11y; #include "RoleMap.h" #undef ROLE -#define RELATIONTYPE(goannaType, stringType, atkType, msaaType, ia2Type) \ - static_assert(static_cast(RelationType::goannaType) \ - == static_cast(nsIAccessibleRelation::RELATION_ ## goannaType), \ +#define RELATIONTYPE(geckoType, stringType, atkType, msaaType, ia2Type) \ + static_assert(static_cast(RelationType::geckoType) \ + == static_cast(nsIAccessibleRelation::RELATION_ ## geckoType), \ "internal and xpcom relations differ!"); #include "RelationTypeMap.h" #undef RELATIONTYPE diff --git a/accessible/base/RelationTypeMap.h b/accessible/base/RelationTypeMap.h index 09a4d5839c..7dc4c13310 100644 --- a/accessible/base/RelationTypeMap.h +++ b/accessible/base/RelationTypeMap.h @@ -6,7 +6,7 @@ /** * Usage: declare the macro RELATIONTYPE()with the following arguments: - * RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) + * RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) */ RELATIONTYPE(LABELLED_BY, diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp index da584599ff..38e425a8b1 100644 --- a/accessible/base/nsAccessibilityService.cpp +++ b/accessible/base/nsAccessibilityService.cpp @@ -844,9 +844,9 @@ nsAccessibilityService::GetStringRelationType(uint32_t aRelationType, { NS_ENSURE_ARG(aRelationType <= static_cast(RelationType::LAST)); -#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \ - case RelationType::goannaType: \ - aString.AssignLiteral(goannaTypeName); \ +#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \ + case RelationType::geckoType: \ + aString.AssignLiteral(geckoTypeName); \ return NS_OK; RelationType relationType = static_cast(aRelationType); diff --git a/accessible/generic/ApplicationAccessible.cpp b/accessible/generic/ApplicationAccessible.cpp index 4cc11ad039..4a2f1a3875 100644 --- a/accessible/generic/ApplicationAccessible.cpp +++ b/accessible/generic/ApplicationAccessible.cpp @@ -58,7 +58,7 @@ ApplicationAccessible::Name(nsString& aName) getter_Copies(appName)); if (NS_FAILED(rv) || appName.IsEmpty()) { NS_WARNING("brandShortName not found, using default app name"); - appName.AssignLiteral("Goanna based application"); + appName.AssignLiteral("Gecko based application"); } aName.Assign(appName); diff --git a/accessible/generic/ApplicationAccessible.h b/accessible/generic/ApplicationAccessible.h index b46034c6ab..cee505134e 100644 --- a/accessible/generic/ApplicationAccessible.h +++ b/accessible/generic/ApplicationAccessible.h @@ -74,7 +74,7 @@ public: void PlatformName(nsAString& aName) const { - aName.AssignLiteral("Goanna"); + aName.AssignLiteral("Gecko"); } void PlatformVersion(nsAString& aVersion) const diff --git a/accessible/generic/HyperTextAccessible.cpp b/accessible/generic/HyperTextAccessible.cpp index cf683c641a..b3e1b1f837 100644 --- a/accessible/generic/HyperTextAccessible.cpp +++ b/accessible/generic/HyperTextAccessible.cpp @@ -1317,7 +1317,7 @@ HyperTextAccessible::GetCaretRect(nsIWidget** aWidget) // Correct for character size, so that caret always matches the size of // the character. This is important for font size transitions, and is - // necessary because the Goanna caret uses the previous character's size as + // necessary because the Gecko caret uses the previous character's size as // the user moves forward in the text by character. nsIntRect charRect = CharBounds(CaretOffset(), nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE); diff --git a/accessible/interfaces/ia2/moz.build b/accessible/interfaces/ia2/moz.build index 566bdb44e2..471c74656f 100644 --- a/accessible/interfaces/ia2/moz.build +++ b/accessible/interfaces/ia2/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -GoannaSharedLibrary('IA2Marshal', linkage=None) +GeckoSharedLibrary('IA2Marshal', linkage=None) DEFINES['REGISTER_PROXY_DLL'] = True diff --git a/accessible/interfaces/msaa/ISimpleDOMNode.idl b/accessible/interfaces/msaa/ISimpleDOMNode.idl index c70d3eb0d2..105cfbbc1a 100644 --- a/accessible/interfaces/msaa/ISimpleDOMNode.idl +++ b/accessible/interfaces/msaa/ISimpleDOMNode.idl @@ -84,7 +84,7 @@ cpp_quote("//") cpp_quote("//") cpp_quote("// get_localInterface(/* [out] */ void **localInterface);") cpp_quote("// ---------------------------------------------------------------------------------------------------=") -cpp_quote("// Only available in Goanna's process") +cpp_quote("// Only available in Gecko's process") cpp_quote("//") cpp_quote("//") cpp_quote("// get_language(/* [out] */ BSTR *htmlText);") diff --git a/accessible/interfaces/msaa/moz.build b/accessible/interfaces/msaa/moz.build index 4bfe6bda9e..e555fabd3c 100644 --- a/accessible/interfaces/msaa/moz.build +++ b/accessible/interfaces/msaa/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -GoannaSharedLibrary('AccessibleMarshal', linkage=None) +GeckoSharedLibrary('AccessibleMarshal', linkage=None) GENERATED_SOURCES += [ 'dlldata.c', diff --git a/accessible/interfaces/nsIAccessibleDocument.idl b/accessible/interfaces/nsIAccessibleDocument.idl index d886c6c5ad..bd4334d4d5 100644 --- a/accessible/interfaces/nsIAccessibleDocument.idl +++ b/accessible/interfaces/nsIAccessibleDocument.idl @@ -12,7 +12,7 @@ interface nsIDOMWindow; /** * An interface for in-process accessibility clients * that wish to retrieve information about a document. - * When accessibility is turned on in Goanna, + * When accessibility is turned on in Gecko, * there is an nsIAccessibleDocument for each document * whether it is XUL, HTML or whatever. * You can QueryInterface to nsIAccessibleDocument from the nsIAccessible for diff --git a/accessible/interfaces/nsIAccessibleRole.idl b/accessible/interfaces/nsIAccessibleRole.idl index edab1afc8d..6862b1407e 100644 --- a/accessible/interfaces/nsIAccessibleRole.idl +++ b/accessible/interfaces/nsIAccessibleRole.idl @@ -6,7 +6,7 @@ #include "nsISupports.idl" /** - * Defines cross platform (Goanna) roles. + * Defines cross platform (Gecko) roles. */ [scriptable, uuid(55581ec3-ba6e-4805-8108-260ed34cdcbb)] interface nsIAccessibleRole : nsISupports diff --git a/accessible/ipc/DocAccessibleChild.cpp b/accessible/ipc/DocAccessibleChild.cpp index ae1d376d0d..c1285fa53b 100644 --- a/accessible/ipc/DocAccessibleChild.cpp +++ b/accessible/ipc/DocAccessibleChild.cpp @@ -244,7 +244,7 @@ DocAccessibleChild::RecvRelations(const uint64_t& aID, if (!aID) return false; -#define RELATIONTYPE(goanna, s, a, m, i) AddRelation(acc, RelationType::goanna, aRelations); +#define RELATIONTYPE(gecko, s, a, m, i) AddRelation(acc, RelationType::gecko, aRelations); #include "RelationTypeMap.h" #undef RELATIONTYPE diff --git a/accessible/jsat/AccessFu.jsm b/accessible/jsat/AccessFu.jsm index 30630d114b..fa04330d59 100644 --- a/accessible/jsat/AccessFu.jsm +++ b/accessible/jsat/AccessFu.jsm @@ -33,7 +33,7 @@ this.AccessFu = { // jshint ignore:line Utils.init(aWindow); try { - Services.androidBridge.handleGoannaMessage( + Services.androidBridge.handleGeckoMessage( { type: 'Accessibility:Ready' }); Services.obs.addObserver(this, 'Accessibility:Settings', false); } catch (x) { @@ -611,7 +611,7 @@ var Output = { androidEvent.brailleOutput); break; } - this.androidBridge.handleGoannaMessage(androidEvent); + this.androidBridge.handleGeckoMessage(androidEvent); } }, @@ -801,7 +801,7 @@ var Input = { if (Utils.MozBuildApp == 'mobile/android') { // Return focus to native Android browser chrome. - Services.androidBridge.handleGoannaMessage( + Services.androidBridge.handleGeckoMessage( { type: 'ToggleChrome:Focus' }); } break; diff --git a/accessible/mac/Platform.mm b/accessible/mac/Platform.mm index c0ed6226eb..a80b001c9e 100644 --- a/accessible/mac/Platform.mm +++ b/accessible/mac/Platform.mm @@ -50,11 +50,11 @@ ProxyEvent(ProxyAccessible*, uint32_t) } } -@interface GoannaNSApplication(a11y) +@interface GeckoNSApplication(a11y) -(void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute; @end -@implementation GoannaNSApplication(a11y) +@implementation GeckoNSApplication(a11y) -(void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute { diff --git a/accessible/mac/mozAccessible.h b/accessible/mac/mozAccessible.h index 66faaef506..abb66ca7f8 100644 --- a/accessible/mac/mozAccessible.h +++ b/accessible/mac/mozAccessible.h @@ -24,7 +24,7 @@ GetObjectOrRepresentedView(id aObject) } inline mozAccessible* -GetNativeFromGoannaAccessible(mozilla::a11y::Accessible* aAccessible) +GetNativeFromGeckoAccessible(mozilla::a11y::Accessible* aAccessible) { mozAccessible* native = nil; aAccessible->GetNativeInterface((void**)&native); @@ -36,7 +36,7 @@ GetNativeFromGoannaAccessible(mozilla::a11y::Accessible* aAccessible) /** * Weak reference; it owns us. */ - mozilla::a11y::AccessibleWrap* mGoannaAccessible; + mozilla::a11y::AccessibleWrap* mGeckoAccessible; /** * Strong ref to array of children @@ -49,13 +49,13 @@ GetNativeFromGoannaAccessible(mozilla::a11y::Accessible* aAccessible) mozAccessible* mParent; /** - * The role of our goanna accessible. + * The role of our gecko accessible. */ mozilla::a11y::role mRole; } -// inits with the goanna owner. -- (id)initWithAccessible:(mozilla::a11y::AccessibleWrap*)goannaParent; +// inits with the gecko owner. +- (id)initWithAccessible:(mozilla::a11y::AccessibleWrap*)geckoParent; // our accessible parent (AXParent) - (id )parent; diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm index d39b69e6fd..12e888577f 100644 --- a/accessible/mac/mozAccessible.mm +++ b/accessible/mac/mozAccessible.mm @@ -60,13 +60,13 @@ GetClosestInterestingAccessible(id anObject) @implementation mozAccessible -- (id)initWithAccessible:(AccessibleWrap*)goannaAccessible +- (id)initWithAccessible:(AccessibleWrap*)geckoAccessible { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; if ((self = [super init])) { - mGoannaAccessible = goannaAccessible; - mRole = goannaAccessible->Role(); + mGeckoAccessible = geckoAccessible; + mRole = geckoAccessible->Role(); } return self; @@ -92,8 +92,8 @@ GetClosestInterestingAccessible(id anObject) // unknown (either unimplemented, or irrelevant) elements are marked as ignored // as well as expired elements. - return !mGoannaAccessible || ([[self role] isEqualToString:NSAccessibilityUnknownRole] && - !(mGoannaAccessible->InteractiveState() & states::FOCUSABLE)); + return !mGeckoAccessible || ([[self role] isEqualToString:NSAccessibilityUnknownRole] && + !(mGeckoAccessible->InteractiveState() & states::FOCUSABLE)); NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO); } @@ -103,7 +103,7 @@ GetClosestInterestingAccessible(id anObject) NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; // if we're expired, we don't support any attributes. - if (!mGoannaAccessible) + if (!mGeckoAccessible) return [NSArray array]; static NSArray *generalAttributes = nil; @@ -141,7 +141,7 @@ GetClosestInterestingAccessible(id anObject) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - if (!mGoannaAccessible) + if (!mGeckoAccessible) return nil; #if DEBUG @@ -183,9 +183,9 @@ GetClosestInterestingAccessible(id anObject) if ([attribute isEqualToString:NSAccessibilityTitleAttribute]) return [self title]; if ([attribute isEqualToString:NSAccessibilityTitleUIElementAttribute]) { - Relation rel = mGoannaAccessible->RelationByType(RelationType::LABELLED_BY); + Relation rel = mGeckoAccessible->RelationByType(RelationType::LABELLED_BY); Accessible* tempAcc = rel.Next(); - return tempAcc ? GetNativeFromGoannaAccessible(tempAcc) : nil; + return tempAcc ? GetNativeFromGeckoAccessible(tempAcc) : nil; } if ([attribute isEqualToString:NSAccessibilityHelpAttribute]) return [self help]; @@ -227,23 +227,23 @@ GetClosestInterestingAccessible(id anObject) - (id)accessibilityHitTest:(NSPoint)point { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return nil; // Convert the given screen-global point in the cocoa coordinate system (with - // origin in the bottom-left corner of the screen) into point in the Goanna + // origin in the bottom-left corner of the screen) into point in the Gecko // coordinate system (with origin in a top-left screen point). NSScreen* mainView = [[NSScreen screens] objectAtIndex:0]; NSPoint tmpPoint = NSMakePoint(point.x, [mainView frame].size.height - point.y); - nsIntPoint goannaPoint = nsCocoaUtils:: + nsIntPoint geckoPoint = nsCocoaUtils:: CocoaPointsToDevPixels(tmpPoint, nsCocoaUtils::GetBackingScaleFactor(mainView)); - Accessible* child = mGoannaAccessible->ChildAtPoint(goannaPoint.x, goannaPoint.y, + Accessible* child = mGeckoAccessible->ChildAtPoint(geckoPoint.x, geckoPoint.y, Accessible::eDeepestChild); if (child) { - mozAccessible* nativeChild = GetNativeFromGoannaAccessible(child); + mozAccessible* nativeChild = GetNativeFromGeckoAccessible(child); if (nativeChild) return GetClosestInterestingAccessible(nativeChild); } @@ -270,12 +270,12 @@ GetClosestInterestingAccessible(id anObject) - (id)accessibilityFocusedUIElement { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return nil; - Accessible* focusedGeckoChild = mGoannaAccessible->FocusedChild(); + Accessible* focusedGeckoChild = mGeckoAccessible->FocusedChild(); if (focusedGeckoChild) { - mozAccessible *focusedChild = GetNativeFromGoannaAccessible(focusedGeckoChild); + mozAccessible *focusedChild = GetNativeFromGeckoAccessible(focusedGeckoChild); if (focusedChild) return GetClosestInterestingAccessible(focusedChild); } @@ -290,9 +290,9 @@ GetClosestInterestingAccessible(id anObject) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - Accessible* accessibleParent = mGoannaAccessible->GetUnignoredParent(); + Accessible* accessibleParent = mGeckoAccessible->GetUnignoredParent(); if (accessibleParent) { - id nativeParent = GetNativeFromGoannaAccessible(accessibleParent); + id nativeParent = GetNativeFromGeckoAccessible(accessibleParent); if (nativeParent) return GetClosestInterestingAccessible(nativeParent); } @@ -303,7 +303,7 @@ GetClosestInterestingAccessible(id anObject) // // get the native root accessible, and tell it to return its first parent unignored accessible. id nativeParent = - GetNativeFromGoannaAccessible(mGoannaAccessible->RootAccessible()); + GetNativeFromGeckoAccessible(mGeckoAccessible->RootAccessible()); NSAssert1 (nativeParent, @"!!! we can't find a parent for %@", self); return GetClosestInterestingAccessible(nativeParent); @@ -332,21 +332,21 @@ GetClosestInterestingAccessible(id anObject) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - if (mChildren || !mGoannaAccessible->AreChildrenCached()) + if (mChildren || !mGeckoAccessible->AreChildrenCached()) return mChildren; mChildren = [[NSMutableArray alloc] init]; // get the array of children. nsAutoTArray childrenArray; - mGoannaAccessible->GetUnignoredChildren(&childrenArray); + mGeckoAccessible->GetUnignoredChildren(&childrenArray); // now iterate through the children array, and get each native accessible. uint32_t totalCount = childrenArray.Length(); for (uint32_t idx = 0; idx < totalCount; idx++) { Accessible* curAccessible = childrenArray.ElementAt(idx); if (curAccessible) { - mozAccessible *curNative = GetNativeFromGoannaAccessible(curAccessible); + mozAccessible *curNative = GetNativeFromGeckoAccessible(curAccessible); if (curNative) [mChildren addObject:GetObjectOrRepresentedView(curNative)]; } @@ -370,10 +370,10 @@ GetClosestInterestingAccessible(id anObject) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - if (!mGoannaAccessible) + if (!mGeckoAccessible) return nil; - nsIntRect rect = mGoannaAccessible->Bounds(); + nsIntRect rect = mGeckoAccessible->Bounds(); NSScreen* mainView = [[NSScreen screens] objectAtIndex:0]; CGFloat scaleFactor = nsCocoaUtils::GetBackingScaleFactor(mainView); @@ -389,10 +389,10 @@ GetClosestInterestingAccessible(id anObject) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - if (!mGoannaAccessible) + if (!mGeckoAccessible) return nil; - nsIntRect rect = mGoannaAccessible->Bounds(); + nsIntRect rect = mGeckoAccessible->Bounds(); CGFloat scaleFactor = nsCocoaUtils::GetBackingScaleFactor([[NSScreen screens] objectAtIndex:0]); return [NSValue valueWithSize:NSMakeSize(static_cast(rect.width) / scaleFactor, @@ -403,11 +403,11 @@ GetClosestInterestingAccessible(id anObject) - (NSString*)role { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return nil; #ifdef DEBUG_A11Y - NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(mGoannaAccessible), + NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(mGeckoAccessible), "Does not support Text when it should"); #endif @@ -427,7 +427,7 @@ GetClosestInterestingAccessible(id anObject) - (NSString*)subrole { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return nil; nsIAtom* landmark = mGeckoAccessible->LandmarkRole(); @@ -457,7 +457,7 @@ GetClosestInterestingAccessible(id anObject) return @"AXContentList"; // 10.6+ NSAccessibilityContentListSubrole; case roles::ENTRY: - if (mGoannaAccessible->IsSearchbox()) + if (mGeckoAccessible->IsSearchbox()) return @"AXSearchField"; break; @@ -528,7 +528,7 @@ struct RoleDescrComparator NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; nsAutoString title; - mGoannaAccessible->Name(title); + mGeckoAccessible->Name(title); return nsCocoaUtils::ToNSString(title); NS_OBJC_END_TRY_ABORT_BLOCK_NIL; @@ -539,7 +539,7 @@ struct RoleDescrComparator NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; nsAutoString value; - mGoannaAccessible->Value(value); + mGeckoAccessible->Value(value); return value.IsEmpty() ? nil : [NSString stringWithCharacters:reinterpret_cast(value.BeginReading()) length:value.Length()]; @@ -568,11 +568,11 @@ struct RoleDescrComparator { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - if (mGoannaAccessible->IsDefunct()) + if (mGeckoAccessible->IsDefunct()) return nil; nsAutoString desc; - mGoannaAccessible->Description(desc); + mGeckoAccessible->Description(desc); return nsCocoaUtils::ToNSString(desc); @@ -584,7 +584,7 @@ struct RoleDescrComparator NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; nsAutoString helpText; - mGoannaAccessible->Help(helpText); + mGeckoAccessible->Help(helpText); return helpText.IsEmpty() ? nil : [NSString stringWithCharacters:reinterpret_cast(helpText.BeginReading()) length:helpText.Length()]; @@ -603,26 +603,26 @@ struct RoleDescrComparator - (BOOL)isFocused { - return FocusMgr()->IsFocused(mGoannaAccessible); + return FocusMgr()->IsFocused(mGeckoAccessible); } - (BOOL)canBeFocused { - return mGoannaAccessible && (mGoannaAccessible->InteractiveState() & states::FOCUSABLE); + return mGeckoAccessible && (mGeckoAccessible->InteractiveState() & states::FOCUSABLE); } - (BOOL)focus { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return NO; - mGoannaAccessible->TakeFocus(); + mGeckoAccessible->TakeFocus(); return YES; } - (BOOL)isEnabled { - return mGoannaAccessible && ((mGoannaAccessible->InteractiveState() & states::UNAVAILABLE) == 0); + return mGeckoAccessible && ((mGeckoAccessible->InteractiveState() & states::UNAVAILABLE) == 0); } // The root accessible calls this when the focused node was @@ -645,7 +645,7 @@ struct RoleDescrComparator { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - AccessibleWrap* accWrap = static_cast(mGoannaAccessible); + AccessibleWrap* accWrap = static_cast(mGeckoAccessible); // Get a pointer to the native window (NSWindow) we reside in. NSWindow *nativeWindow = nil; @@ -676,7 +676,7 @@ struct RoleDescrComparator if (!mChildren) return; - mozAccessible *curNative = GetNativeFromGoannaAccessible(aAccessible); + mozAccessible *curNative = GetNativeFromGeckoAccessible(aAccessible); if (curNative) [mChildren addObject:GetObjectOrRepresentedView(curNative)]; } @@ -687,14 +687,14 @@ struct RoleDescrComparator [self invalidateChildren]; - mGoannaAccessible = nullptr; + mGeckoAccessible = nullptr; NS_OBJC_END_TRY_ABORT_BLOCK; } - (BOOL)isExpired { - return !mGoannaAccessible; + return !mGeckoAccessible; } #pragma mark - diff --git a/accessible/mac/mozActionElements.mm b/accessible/mac/mozActionElements.mm index d8092822ba..c361f2d765 100644 --- a/accessible/mac/mozActionElements.mm +++ b/accessible/mac/mozActionElements.mm @@ -73,7 +73,7 @@ enum CheckboxValue { - (BOOL)accessibilityIsIgnored { - return !mGoannaAccessible; + return !mGeckoAccessible; } - (NSArray*)accessibilityActionNames @@ -118,12 +118,12 @@ enum CheckboxValue { { // both buttons and checkboxes have only one action. we should really stop using arbitrary // arrays with actions, and define constants for these actions. - mGoannaAccessible->DoAction(0); + mGeckoAccessible->DoAction(0); } - (BOOL)isTab { - return (mGoannaAccessible && (mGoannaAccessible->Role() == roles::PAGETAB)); + return (mGeckoAccessible && (mGeckoAccessible->Role() == roles::PAGETAB)); } @end @@ -148,7 +148,7 @@ enum CheckboxValue { - (int)isChecked { - uint64_t state = mGoannaAccessible->NativeState(); + uint64_t state = mGeckoAccessible->NativeState(); // check if we're checked or in a mixed state if (state & states::CHECKED) { @@ -292,10 +292,10 @@ enum CheckboxValue { */ - (id)value { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return nil; - Accessible* accessible = mGoannaAccessible->GetSelectedItem(0); + Accessible* accessible = mGeckoAccessible->GetSelectedItem(0); if (!accessible) return nil; @@ -339,33 +339,33 @@ enum CheckboxValue { - (NSUInteger)accessibilityArrayAttributeCount:(NSString*)attribute { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return 0; // By default this calls -[[mozAccessible children] count]. // Since we don't cache mChildren. This is faster. if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) - return mGoannaAccessible->ChildCount() ? 1 : 0; + return mGeckoAccessible->ChildCount() ? 1 : 0; return [super accessibilityArrayAttributeCount:attribute]; } - (NSArray*)children { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return nil; - nsDeckFrame* deckFrame = do_QueryFrame(mGoannaAccessible->GetFrame()); + nsDeckFrame* deckFrame = do_QueryFrame(mGeckoAccessible->GetFrame()); nsIFrame* selectedFrame = deckFrame ? deckFrame->GetSelectedBox() : nullptr; Accessible* selectedAcc = nullptr; if (selectedFrame) { nsINode* node = selectedFrame->GetContent(); - selectedAcc = mGoannaAccessible->Document()->GetAccessible(node); + selectedAcc = mGeckoAccessible->Document()->GetAccessible(node); } if (selectedAcc) { - mozAccessible *curNative = GetNativeFromGoannaAccessible(selectedAcc); + mozAccessible *curNative = GetNativeFromGeckoAccessible(selectedAcc); if (curNative) return [NSArray arrayWithObjects:GetObjectOrRepresentedView(curNative), nil]; } diff --git a/accessible/mac/mozDocAccessible.mm b/accessible/mac/mozDocAccessible.mm index 57c7deab05..a12d70c8ca 100644 --- a/accessible/mac/mozDocAccessible.mm +++ b/accessible/mac/mozDocAccessible.mm @@ -33,7 +33,7 @@ getNativeViewFromRootAccessible(Accessible* aAccessible) NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; // if we're expired, we don't support any attributes. - if (!mGoannaAccessible) + if (!mGeckoAccessible) return [NSArray array]; // standard attributes that are shared and supported by root accessible (AXMain) elements. @@ -95,7 +95,7 @@ getNativeViewFromRootAccessible(Accessible* aAccessible) if (mParallelView) return (id)mParallelView; - mParallelView = getNativeViewFromRootAccessible (mGoannaAccessible); + mParallelView = getNativeViewFromRootAccessible (mGeckoAccessible); NSAssert(mParallelView, @"can't return root accessible's native parallel view."); return mParallelView; diff --git a/accessible/mac/mozHTMLAccessible.mm b/accessible/mac/mozHTMLAccessible.mm index 1970491b44..4eddc00eaa 100644 --- a/accessible/mac/mozHTMLAccessible.mm +++ b/accessible/mac/mozHTMLAccessible.mm @@ -20,17 +20,17 @@ mozilla::ErrorResult rv; // XXX use the flattening API when there are available // see bug 768298 - mGoannaAccessible->GetContent()->GetTextContent(title, rv); + mGeckoAccessible->GetContent()->GetTextContent(title, rv); return nsCocoaUtils::ToNSString(title); } - (id)value { - if (!mGoannaAccessible || !mGoannaAccessible->IsHyperText()) + if (!mGeckoAccessible || !mGeckoAccessible->IsHyperText()) return nil; - uint32_t level = mGoannaAccessible->AsHyperText()->GetLevelInternal(); + uint32_t level = mGeckoAccessible->AsHyperText()->GetLevelInternal(); return [NSNumber numberWithInt:level]; } @@ -45,7 +45,7 @@ - (NSArray*)accessibilityAttributeNames { // if we're expired, we don't support any attributes. - if (!mGoannaAccessible) + if (!mGeckoAccessible) return [NSArray array]; static NSMutableArray* attributes = nil; @@ -69,7 +69,7 @@ - (NSArray*)accessibilityActionNames { // if we're expired, we don't support any attributes. - if (!mGoannaAccessible) + if (!mGeckoAccessible) return [NSArray array]; static NSArray* actionNames = nil; @@ -84,11 +84,11 @@ - (void)accessibilityPerformAction:(NSString*)action { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return; if ([action isEqualToString:NSAccessibilityPressAction]) - mGoannaAccessible->DoAction(0); + mGeckoAccessible->DoAction(0); else [super accessibilityPerformAction:action]; } @@ -105,11 +105,11 @@ - (NSURL*)url { - if (!mGoannaAccessible || mGoannaAccessible->IsDefunct()) + if (!mGeckoAccessible || mGeckoAccessible->IsDefunct()) return nil; nsAutoString value; - mGoannaAccessible->Value(value); + mGeckoAccessible->Value(value); NSString* urlString = value.IsEmpty() ? nil : nsCocoaUtils::ToNSString(value); if (!urlString) diff --git a/accessible/mac/mozTextAccessible.h b/accessible/mac/mozTextAccessible.h index 2249ee7925..4b4e0d93e2 100644 --- a/accessible/mac/mozTextAccessible.h +++ b/accessible/mac/mozTextAccessible.h @@ -8,9 +8,9 @@ @interface mozTextAccessible : mozAccessible { - // both of these are the same old mGoannaAccessible, but already + // both of these are the same old mGeckoAccessible, but already // QI'd for us, to the right type, for convenience. - mozilla::a11y::HyperTextAccessible* mGoannaTextAccessible; // strong + mozilla::a11y::HyperTextAccessible* mGeckoTextAccessible; // strong } @end diff --git a/accessible/mac/mozTextAccessible.mm b/accessible/mac/mozTextAccessible.mm index 0ba33c37b0..dcd0ec7f10 100644 --- a/accessible/mac/mozTextAccessible.mm +++ b/accessible/mac/mozTextAccessible.mm @@ -58,7 +58,7 @@ ToNSString(id aValue) NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; if ((self = [super initWithAccessible:accessible])) { - mGoannaTextAccessible = accessible->AsHyperText(); + mGeckoTextAccessible = accessible->AsHyperText(); } return self; @@ -67,7 +67,7 @@ ToNSString(id aValue) - (BOOL)accessibilityIsIgnored { - return !mGoannaAccessible; + return !mGeckoAccessible; } - (NSArray*)accessibilityAttributeNames @@ -127,10 +127,10 @@ ToNSString(id aValue) } if ([attribute isEqualToString:@"AXRequired"]) - return [NSNumber numberWithBool:!!(mGoannaAccessible->State() & states::REQUIRED)]; + return [NSNumber numberWithBool:!!(mGeckoAccessible->State() & states::REQUIRED)]; if ([attribute isEqualToString:@"AXInvalid"]) - return [NSNumber numberWithBool:!!(mGoannaAccessible->State() & states::INVALID)]; + return [NSNumber numberWithBool:!!(mGeckoAccessible->State() & states::INVALID)]; if ([attribute isEqualToString:NSAccessibilityVisibleCharacterRangeAttribute]) return [self visibleCharacterRange]; @@ -166,7 +166,7 @@ ToNSString(id aValue) - (id)accessibilityAttributeValue:(NSString*)attribute forParameter:(id)parameter { - if (!mGoannaTextAccessible) + if (!mGeckoTextAccessible) return nil; if ([attribute isEqualToString:NSAccessibilityStringForRangeParameterizedAttribute]) { @@ -214,9 +214,9 @@ ToNSString(id aValue) int32_t start = range.location; int32_t end = start + range.length; - nsIntRect bounds = mGoannaTextAccessible->TextBounds(start, end); + nsIntRect bounds = mGeckoTextAccessible->TextBounds(start, end); - return [NSValue valueWithRect:nsCocoaUtils::GoannaRectToCocoaRect(bounds)]; + return [NSValue valueWithRect:nsCocoaUtils::GeckoRectToCocoaRect(bounds)]; } #if DEBUG @@ -247,7 +247,7 @@ ToNSString(id aValue) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK; - if (!mGoannaTextAccessible) + if (!mGeckoTextAccessible) return; if ([attribute isEqualToString:NSAccessibilityValueAttribute]) { @@ -262,12 +262,12 @@ ToNSString(id aValue) return; int32_t start = 0, end = 0; - mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end); - mGoannaTextAccessible->DeleteText(start, end - start); + mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end); + mGeckoTextAccessible->DeleteText(start, end - start); nsString text; nsCocoaUtils::GetStringForNSString(stringValue, text); - mGoannaTextAccessible->InsertText(text, start); + mGeckoTextAccessible->InsertText(text, start); } if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) { @@ -275,7 +275,7 @@ ToNSString(id aValue) if (!ToNSRange(value, &range)) return; - mGoannaTextAccessible->SetSelectionBoundsAt(0, range.location, + mGeckoTextAccessible->SetSelectionBoundsAt(0, range.location, range.location + range.length); return; } @@ -285,7 +285,7 @@ ToNSString(id aValue) if (!ToNSRange(value, &range)) return; - mGoannaTextAccessible->ScrollSubstringTo(range.location, range.location + range.length, + mGeckoTextAccessible->ScrollSubstringTo(range.location, range.location + range.length, nsIAccessibleScrollType::SCROLL_TYPE_TOP_EDGE); return; } @@ -307,7 +307,7 @@ ToNSString(id aValue) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK; - mGoannaTextAccessible = nullptr; + mGeckoTextAccessible = nullptr; [super expire]; NS_OBJC_END_TRY_ABORT_BLOCK; @@ -322,8 +322,8 @@ ToNSString(id aValue) if ([[self role] isEqualToString:NSAccessibilityStaticTextRole]) return YES; - if (mGoannaTextAccessible) - return (mGoannaAccessible->State() & states::READONLY) == 0; + if (mGeckoTextAccessible) + return (mGeckoAccessible->State() & states::READONLY) == 0; return NO; @@ -332,8 +332,8 @@ ToNSString(id aValue) - (NSNumber*)caretLineNumber { - int32_t lineNumber = mGoannaTextAccessible ? - mGoannaTextAccessible->CaretLineNumber() - 1 : -1; + int32_t lineNumber = mGeckoTextAccessible ? + mGeckoTextAccessible->CaretLineNumber() - 1 : -1; return (lineNumber >= 0) ? [NSNumber numberWithInt:lineNumber] : nil; } @@ -342,10 +342,10 @@ ToNSString(id aValue) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK; - if (mGoannaTextAccessible) { + if (mGeckoTextAccessible) { nsString text; nsCocoaUtils::GetStringForNSString(aNewString, text); - mGoannaTextAccessible->ReplaceText(text); + mGeckoTextAccessible->ReplaceText(text); } NS_OBJC_END_TRY_ABORT_BLOCK; @@ -353,7 +353,7 @@ ToNSString(id aValue) - (NSString*)text { - if (!mGoannaAccessible || !mGoannaTextAccessible) + if (!mGeckoAccessible || !mGeckoTextAccessible) return nil; // A password text field returns an empty value @@ -361,7 +361,7 @@ ToNSString(id aValue) return @""; nsAutoString text; - mGoannaTextAccessible->TextSubstring(0, + mGeckoTextAccessible->TextSubstring(0, nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT, text); return nsCocoaUtils::ToNSString(text); @@ -371,10 +371,10 @@ ToNSString(id aValue) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN; - if (!mGoannaAccessible || !mGoannaTextAccessible) + if (!mGeckoAccessible || !mGeckoTextAccessible) return 0; - return mGoannaTextAccessible ? mGoannaTextAccessible->CharacterCount() : 0; + return mGeckoTextAccessible ? mGeckoTextAccessible->CharacterCount() : 0; NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0); } @@ -383,9 +383,9 @@ ToNSString(id aValue) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN; - if (mGoannaTextAccessible) { + if (mGeckoTextAccessible) { int32_t start = 0, end = 0; - mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end); + mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end); return (end - start); } return 0; @@ -397,12 +397,12 @@ ToNSString(id aValue) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - if (mGoannaTextAccessible) { + if (mGeckoTextAccessible) { int32_t start = 0, end = 0; - mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end); + mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end); if (start != end) { nsAutoString selText; - mGoannaTextAccessible->TextSubstring(start, end, selText); + mGeckoTextAccessible->TextSubstring(start, end, selText); return nsCocoaUtils::ToNSString(selText); } } @@ -415,17 +415,17 @@ ToNSString(id aValue) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL; - if (mGoannaTextAccessible) { + if (mGeckoTextAccessible) { int32_t start = 0; int32_t end = 0; - int32_t count = mGoannaTextAccessible->SelectionCount(); + int32_t count = mGeckoTextAccessible->SelectionCount(); if (count) { - mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end); + mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end); return [NSValue valueWithRange:NSMakeRange(start, end - start)]; } - start = mGoannaTextAccessible->CaretOffset(); + start = mGeckoTextAccessible->CaretOffset(); return [NSValue valueWithRange:NSMakeRange(start != -1 ? start : 0, 0)]; } return [NSValue valueWithRange:NSMakeRange(0, 0)]; @@ -438,8 +438,8 @@ ToNSString(id aValue) // XXX this won't work with Textarea and such as we actually don't give // the visible character range. return [NSValue valueWithRange: - NSMakeRange(0, mGoannaTextAccessible ? - mGoannaTextAccessible->CharacterCount() : 0)]; + NSMakeRange(0, mGeckoTextAccessible ? + mGeckoTextAccessible->CharacterCount() : 0)]; } - (void)valueDidChange @@ -460,10 +460,10 @@ ToNSString(id aValue) - (NSString*)stringFromRange:(NSRange*)range { - NS_PRECONDITION(mGoannaTextAccessible && range, "no Goanna text accessible or range"); + NS_PRECONDITION(mGeckoTextAccessible && range, "no Gecko text accessible or range"); nsAutoString text; - mGoannaTextAccessible->TextSubstring(range->location, + mGeckoTextAccessible->TextSubstring(range->location, range->location + range->length, text); return nsCocoaUtils::ToNSString(text); } @@ -496,18 +496,18 @@ ToNSString(id aValue) - (NSString*)text { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return nil; - return nsCocoaUtils::ToNSString(mGoannaAccessible->AsTextLeaf()->Text()); + return nsCocoaUtils::ToNSString(mGeckoAccessible->AsTextLeaf()->Text()); } - (long)textLength { - if (!mGoannaAccessible) + if (!mGeckoAccessible) return 0; - return mGoannaAccessible->AsTextLeaf()->Text().Length(); + return mGeckoAccessible->AsTextLeaf()->Text().Length(); } @end diff --git a/accessible/tests/mochitest/elm/test_nsApplicationAcc.html b/accessible/tests/mochitest/elm/test_nsApplicationAcc.html index e3d0ab345f..58763e4372 100644 --- a/accessible/tests/mochitest/elm/test_nsApplicationAcc.html +++ b/accessible/tests/mochitest/elm/test_nsApplicationAcc.html @@ -41,14 +41,14 @@ } if (applicationName == "") - applicationName = "Goanna based application"; + applicationName = "Gecko based application"; } is (accessible.name, applicationName, "wrong application accessible name"); // nsIAccessibleApplication is(accessible.appName, appInfo.name, "Wrong application name"); is(accessible.appVersion, appInfo.version, "Wrong application version"); - is(accessible.platformName, "Goanna", "Wrong platform name"); + is(accessible.platformName, "Gecko", "Wrong platform name"); is(accessible.platformVersion, appInfo.platformVersion, "Wrong platform version"); diff --git a/accessible/tests/mochitest/events/test_valuechange.html b/accessible/tests/mochitest/events/test_valuechange.html index 163a32501f..839d65ca04 100644 --- a/accessible/tests/mochitest/events/test_valuechange.html +++ b/accessible/tests/mochitest/events/test_valuechange.html @@ -50,7 +50,7 @@ return; // Note: always test against valuetext first because the existence of - // aria-valuetext takes precedence over aria-valuenow in goanna. + // aria-valuetext takes precedence over aria-valuenow in gecko. is(acc.value, (aValuetext != undefined)? aValuetext : aValuenow, "Wrong value of " + prettyName(aNodeOrID)); } diff --git a/accessible/tests/mochitest/role/test_general.html b/accessible/tests/mochitest/role/test_general.html index 91d0352c83..72c8244766 100644 --- a/accessible/tests/mochitest/role/test_general.html +++ b/accessible/tests/mochitest/role/test_general.html @@ -169,8 +169,8 @@
A heading level 6
-
goanna
-
goannas have sticky toes
+
gecko
+
geckos have sticky toes
clickable span diff --git a/accessible/windows/ia2/ia2Accessible.cpp b/accessible/windows/ia2/ia2Accessible.cpp index fb372cd4c1..cd15a963c4 100644 --- a/accessible/windows/ia2/ia2Accessible.cpp +++ b/accessible/windows/ia2/ia2Accessible.cpp @@ -368,7 +368,7 @@ ia2Accessible::get_states(AccessibleStates* aStates) if (state & states::REQUIRED) *aStates |= IA2_STATE_REQUIRED; - // The following IA2 states are not supported by Goanna + // The following IA2 states are not supported by Gecko // IA2_STATE_ARMED // IA2_STATE_MANAGES_DESCENDANTS // IA2_STATE_ICONIFIED diff --git a/accessible/windows/ia2/ia2AccessibleRelation.cpp b/accessible/windows/ia2/ia2AccessibleRelation.cpp index 716ca69273..cc6fd83c8a 100644 --- a/accessible/windows/ia2/ia2AccessibleRelation.cpp +++ b/accessible/windows/ia2/ia2AccessibleRelation.cpp @@ -41,8 +41,8 @@ ia2AccessibleRelation::get_relationType(BSTR* aRelationType) *aRelationType = nullptr; -#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \ - case RelationType::goannaType: \ +#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \ + case RelationType::geckoType: \ *aRelationType = ::SysAllocString(ia2Type); \ break; diff --git a/accessible/windows/ia2/ia2AccessibleRelation.h b/accessible/windows/ia2/ia2AccessibleRelation.h index de169f12b1..fd1df09103 100644 --- a/accessible/windows/ia2/ia2AccessibleRelation.h +++ b/accessible/windows/ia2/ia2AccessibleRelation.h @@ -64,13 +64,13 @@ private: /** - * Goanna to IAccessible2 relation types map. + * Gecko to IAccessible2 relation types map. */ const WCHAR *const IA2_RELATION_NULL = L""; -#define RELATIONTYPE(goannaType, name, atkType, msaaType, ia2Type) \ - std::pair(RelationType::goannaType, ia2Type), +#define RELATIONTYPE(geckoType, name, atkType, msaaType, ia2Type) \ + std::pair(RelationType::geckoType, ia2Type), static const std::pair sRelationTypePairs[] = { #include "RelationTypeMap.h" diff --git a/accessible/windows/ia2/ia2AccessibleText.cpp b/accessible/windows/ia2/ia2AccessibleText.cpp index a171f6f3f8..e0fbe3c759 100644 --- a/accessible/windows/ia2/ia2AccessibleText.cpp +++ b/accessible/windows/ia2/ia2AccessibleText.cpp @@ -289,7 +289,7 @@ ia2AccessibleText::get_textBeforeOffset(long aOffset, endOffset = textAcc->CharacterCount(); textAcc->TextSubstring(startOffset, endOffset, text); } else { - AccessibleTextBoundary boundaryType = GetGoannaTextBoundary(aBoundaryType); + AccessibleTextBoundary boundaryType = GetGeckoTextBoundary(aBoundaryType); if (boundaryType == -1) return S_FALSE; @@ -338,7 +338,7 @@ ia2AccessibleText::get_textAfterOffset(long aOffset, endOffset = textAcc->CharacterCount(); textAcc->TextSubstring(startOffset, endOffset, text); } else { - AccessibleTextBoundary boundaryType = GetGoannaTextBoundary(aBoundaryType); + AccessibleTextBoundary boundaryType = GetGeckoTextBoundary(aBoundaryType); if (boundaryType == -1) return S_FALSE; textAcc->TextAfterOffset(aOffset, boundaryType, &startOffset, &endOffset, text); @@ -384,7 +384,7 @@ ia2AccessibleText::get_textAtOffset(long aOffset, endOffset = textAcc->CharacterCount(); textAcc->TextSubstring(startOffset, endOffset, text); } else { - AccessibleTextBoundary boundaryType = GetGoannaTextBoundary(aBoundaryType); + AccessibleTextBoundary boundaryType = GetGeckoTextBoundary(aBoundaryType); if (boundaryType == -1) return S_FALSE; textAcc->TextAtOffset(aOffset, boundaryType, &startOffset, &endOffset, text); @@ -591,7 +591,7 @@ ia2AccessibleText::GetModifiedText(bool aGetInsertedText, } AccessibleTextBoundary -ia2AccessibleText::GetGoannaTextBoundary(enum IA2TextBoundaryType aBoundaryType) +ia2AccessibleText::GetGeckoTextBoundary(enum IA2TextBoundaryType aBoundaryType) { switch (aBoundaryType) { case IA2_TEXT_BOUNDARY_CHAR: diff --git a/accessible/windows/ia2/ia2AccessibleText.h b/accessible/windows/ia2/ia2AccessibleText.h index 9ac38a2504..e621329cb2 100644 --- a/accessible/windows/ia2/ia2AccessibleText.h +++ b/accessible/windows/ia2/ia2AccessibleText.h @@ -120,7 +120,7 @@ protected: private: HRESULT GetModifiedText(bool aGetInsertedText, IA2TextSegment *aNewText); - AccessibleTextBoundary GetGoannaTextBoundary(enum IA2TextBoundaryType coordinateType); + AccessibleTextBoundary GetGeckoTextBoundary(enum IA2TextBoundaryType coordinateType); }; } // namespace a11y diff --git a/accessible/windows/msaa/AccessibleWrap.cpp b/accessible/windows/msaa/AccessibleWrap.cpp index e332d4b063..05e4f958dc 100644 --- a/accessible/windows/msaa/AccessibleWrap.cpp +++ b/accessible/windows/msaa/AccessibleWrap.cpp @@ -516,7 +516,7 @@ AccessibleWrap::get_accState( // MSAA only has 31 states and the lowest 31 bits of our state bit mask // are the same states as MSAA. - // Note: we map the following Goanna states to different MSAA states: + // Note: we map the following Gecko states to different MSAA states: // REQUIRED -> ALERT_LOW // ALERT -> ALERT_MEDIUM // INVALID -> ALERT_HIGH @@ -968,9 +968,9 @@ AccessibleWrap::accNavigate( Accessible* navAccessible = nullptr; Maybe xpRelation; -#define RELATIONTYPE(goannaType, stringType, atkType, msaaType, ia2Type) \ +#define RELATIONTYPE(geckoType, stringType, atkType, msaaType, ia2Type) \ case msaaType: \ - xpRelation.emplace(RelationType::goannaType); \ + xpRelation.emplace(RelationType::geckoType); \ break; switch(navDir) { @@ -1361,7 +1361,7 @@ AccessibleWrap::GetXPAccessibleFor(const VARIANT& aVarChild) return nullptr; } - // Goanna child indices are 0-based in contrast to indices used in MSAA. + // Gecko child indices are 0-based in contrast to indices used in MSAA. return GetChildAt(aVarChild.lVal - 1); } @@ -1384,7 +1384,7 @@ AccessibleWrap::UpdateSystemCaretFor(Accessible* aAccessible) } // Create invisible bitmap for caret, otherwise its appearance interferes - // with Goanna caret + // with Gecko caret HBITMAP caretBitMap = CreateBitmap(1, caretRect.height, 1, 1, nullptr); if (::CreateCaret(caretWnd, caretBitMap, 1, caretRect.height)) { // Also destroys the last caret ::ShowCaret(caretWnd); diff --git a/accessible/windows/msaa/AccessibleWrap.h b/accessible/windows/msaa/AccessibleWrap.h index cbf0c75c60..f759a503e4 100644 --- a/accessible/windows/msaa/AccessibleWrap.h +++ b/accessible/windows/msaa/AccessibleWrap.h @@ -162,7 +162,7 @@ public: // construction, destruction * The system caret works more universally than the MSAA caret * For example, Window-Eyes, JAWS, ZoomText and Windows Tablet Edition use it * We will use an invisible system caret. - * Goanna is still responsible for drawing its own caret + * Gecko is still responsible for drawing its own caret */ void UpdateSystemCaretFor(Accessible* aAccessible); diff --git a/accessible/windows/msaa/HTMLWin32ObjectAccessible.h b/accessible/windows/msaa/HTMLWin32ObjectAccessible.h index b8616c529e..d4ec6880fe 100644 --- a/accessible/windows/msaa/HTMLWin32ObjectAccessible.h +++ b/accessible/windows/msaa/HTMLWin32ObjectAccessible.h @@ -18,7 +18,7 @@ class HTMLWin32ObjectOwnerAccessible : public AccessibleWrap public: // This will own the HTMLWin32ObjectAccessible. We create this where the // or exists in the tree, so that get_accNextSibling() etc. - // will still point to Goanna accessible sibling content. This is necessary + // will still point to Gecko accessible sibling content. This is necessary // because the native plugin accessible doesn't know where it exists in the // Mozilla tree, and returns null for previous and next sibling. This would // have the effect of cutting off all content after the plugin. diff --git a/b2g/app/B2GLoader.cpp b/b2g/app/B2GLoader.cpp index 067b4848f4..8846ac794e 100644 --- a/b2g/app/B2GLoader.cpp +++ b/b2g/app/B2GLoader.cpp @@ -279,7 +279,7 @@ main(int argc, const char* argv[]) ReserveFileDescriptors(reservedFds); /* - * Before fork(), libxul and static data of Goanna are loaded for + * Before fork(), libxul and static data of Gecko are loaded for * sharing. */ bool ok = LoadStaticData(argc, argv); diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js index 7aebfcd341..69c9712c33 100644 --- a/b2g/app/b2g.js +++ b/b2g/app/b2g.js @@ -792,7 +792,7 @@ pref("browser.prompt.allowNative", false); // a restart is required to enable a new value. pref("network.activity.blipIntervalMilliseconds", 250); -// By default we want the NetworkManager service to manage Goanna's offline +// By default we want the NetworkManager service to manage Gecko's offline // status for us according to the state of Wifi/cellular data connections. // In some environments, such as the emulator or hardware with other network // connectivity, this is not desireable, however, in which case this pref diff --git a/b2g/app/macbuild/Contents/Info.plist.in b/b2g/app/macbuild/Contents/Info.plist.in index 748503a0d2..7f11efefc6 100644 --- a/b2g/app/macbuild/Contents/Info.plist.in +++ b/b2g/app/macbuild/Contents/Info.plist.in @@ -31,6 +31,6 @@ NSHighResolutionCapable NSPrincipalClass - GoannaNSApplication + GeckoNSApplication diff --git a/b2g/app/moz.build b/b2g/app/moz.build index f267efcea7..0a9dc3fa18 100644 --- a/b2g/app/moz.build +++ b/b2g/app/moz.build @@ -6,9 +6,9 @@ if not CONFIG['LIBXUL_SDK']: if CONFIG['GAIADIR']: - GoannaProgram(CONFIG['MOZ_APP_NAME'] + "-bin") + GeckoProgram(CONFIG['MOZ_APP_NAME'] + "-bin") else: - GoannaProgram(CONFIG['MOZ_APP_NAME']) + GeckoProgram(CONFIG['MOZ_APP_NAME']) if CONFIG['MOZ_B2G_LOADER']: SOURCES += [ 'B2GLoader.cpp', diff --git a/b2g/app/nsBrowserApp.cpp b/b2g/app/nsBrowserApp.cpp index 6bb6dd1a07..b7fcea85f5 100644 --- a/b2g/app/nsBrowserApp.cpp +++ b/b2g/app/nsBrowserApp.cpp @@ -231,7 +231,7 @@ int main(int argc, _CONST char* argv[]) DllBlocklist_Initialize(); #endif - // B2G loader has already initialized Goanna so we can't initialize + // B2G loader has already initialized Gecko so we can't initialize // it again here. #ifndef MOZ_B2G_LOADER // We do this because of data in bug 771745 diff --git a/b2g/app/ua-update.json.in b/b2g/app/ua-update.json.in index 9512737449..b57927c557 100644 --- a/b2g/app/ua-update.json.in +++ b/b2g/app/ua-update.json.in @@ -4,7 +4,7 @@ // evangelism are included. { // bug 826347, msn.com - "msn.com": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Goanna) Chrome/18.0.1025.133 Mobile Safari/535.19", + "msn.com": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19", // bug 826353, itau.com.br "itau.com.br": "\\(Mobile#(Android; Mobile", // bug 826510, r7.com @@ -24,7 +24,7 @@ // bug 827573, webmotors.com.br "webmotors.com.br": "\\(Mobile#(Android; Mobile", // bug 827670, elpais.com.co - "elpais.com.co": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Goanna) Chrome/18.0.1025.133 Mobile Safari/535.19", + "elpais.com.co": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19", // bug 827674, avianca.com "avianca.com": "\\(Mobile#(Android; Mobile", // bug 827678, marca.com diff --git a/b2g/chrome/content/devtools/debugger.js b/b2g/chrome/content/devtools/debugger.js index f2612c2350..45c56db880 100644 --- a/b2g/chrome/content/devtools/debugger.js +++ b/b2g/chrome/content/devtools/debugger.js @@ -323,7 +323,7 @@ let WiFiRemoteDebugger = { let devtoolsWiFi = false; // Keep the old setting to not break people that won't have updated - // gaia and goanna. + // gaia and gecko. SettingsListener.observe("devtools.debugger.remote-enabled", false, function(value) { devtoolsUSB = value; diff --git a/b2g/chrome/content/identity.js b/b2g/chrome/content/identity.js index 204117652f..548ecf54d8 100644 --- a/b2g/chrome/content/identity.js +++ b/b2g/chrome/content/identity.js @@ -62,13 +62,13 @@ function identityCall(message) { } /* - * To close the dialog, we first tell the goanna SignInToWebsite manager that it + * To close the dialog, we first tell the gecko SignInToWebsite manager that it * can clean up. Then we tell the gaia component that we are finished. It is - * necessary to notify goanna first, so that the message can be sent before gaia + * necessary to notify gecko first, so that the message can be sent before gaia * destroys our context. */ function closeIdentityDialog() { - // tell goanna we're done. + // tell gecko we're done. func = null; options = null; sendAsyncMessage(kIdentityDelegateFinished); } diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js index b5a86c60c7..49a9fc850e 100644 --- a/b2g/chrome/content/settings.js +++ b/b2g/chrome/content/settings.js @@ -320,7 +320,7 @@ setUpdateTrackingId(); //In order of precedence they are: // //1. mozSettings "layers.composer.enabled" - //2. a goanna pref "layers.composer.enabled" + //2. a gecko pref "layers.composer.enabled" //3. presence of ro.display.colorfill at the Gonk level var req = navigator.mozSettings.createLock().get('layers.composer2d.enabled'); @@ -384,11 +384,11 @@ setUpdateTrackingId(); // =================== Telemetry ====================== (function setupTelemetrySettings() { let gaiaSettingName = 'debug.performance_data.shared'; - let goannaPrefName = 'toolkit.telemetry.enabled'; + let geckoPrefName = 'toolkit.telemetry.enabled'; SettingsListener.observe(gaiaSettingName, null, function(value) { if (value !== null) { - // Gaia setting has been set; update Goanna pref to that. - Services.prefs.setBoolPref(goannaPrefName, value); + // Gaia setting has been set; update Gecko pref to that. + Services.prefs.setBoolPref(geckoPrefName, value); return; } // Gaia setting has not been set; set the gaia setting to default. @@ -398,7 +398,7 @@ setUpdateTrackingId(); let prefValue = false; #endif try { - prefValue = Services.prefs.getBoolPref(goannaPrefName); + prefValue = Services.prefs.getBoolPref(geckoPrefName); } catch (e) { // Pref not set; use default value. } @@ -410,14 +410,14 @@ setUpdateTrackingId(); // =================== Low-precision buffer ====================== (function setupLowPrecisionSettings() { - // The gaia setting layers.low-precision maps to two goanna prefs + // The gaia setting layers.low-precision maps to two gecko prefs SettingsListener.observe('layers.low-precision', null, function(value) { if (value !== null) { - // Update goanna from the new Gaia setting + // Update gecko from the new Gaia setting Services.prefs.setBoolPref('layers.low-precision-buffer', value); Services.prefs.setBoolPref('layers.progressive-paint', value); } else { - // Update gaia setting from goanna value + // Update gaia setting from gecko value try { let prefValue = Services.prefs.getBoolPref('layers.low-precision-buffer'); let setting = { 'layers.low-precision': prefValue }; @@ -428,13 +428,13 @@ setUpdateTrackingId(); } }); - // The gaia setting layers.low-opacity maps to a string goanna pref (0.5/1.0) + // The gaia setting layers.low-opacity maps to a string gecko pref (0.5/1.0) SettingsListener.observe('layers.low-opacity', null, function(value) { if (value !== null) { - // Update goanna from the new Gaia setting + // Update gecko from the new Gaia setting Services.prefs.setCharPref('layers.low-precision-opacity', value ? '0.5' : '1.0'); } else { - // Update gaia setting from goanna value + // Update gaia setting from gecko value try { let prefValue = Services.prefs.getCharPref('layers.low-precision-opacity'); let setting = { 'layers.low-opacity': (prefValue == '0.5') }; diff --git a/b2g/components/LogShake.jsm b/b2g/components/LogShake.jsm index 548797a0b5..fdfa4bc623 100644 --- a/b2g/components/LogShake.jsm +++ b/b2g/components/LogShake.jsm @@ -219,7 +219,7 @@ let LogShake = { Cu.reportError("Unable to get device properties: " + ex); } - // Let Goanna perfom the dump to a file, and just collect it + // Let Gecko perfom the dump to a file, and just collect it try { LogCapture.readAboutMemory().then(aboutMemory => { let file = OS.Path.basename(aboutMemory); diff --git a/b2g/components/SystemAppProxy.jsm b/b2g/components/SystemAppProxy.jsm index 355433d555..74abffddd3 100644 --- a/b2g/components/SystemAppProxy.jsm +++ b/b2g/components/SystemAppProxy.jsm @@ -51,7 +51,7 @@ let SystemAppProxy = { /* * Common way to send an event to the system app. * - * // In goanna code: + * // In gecko code: * SystemAppProxy.sendCustomEvent('foo', { data: 'bar' }); * // In system app: * window.addEventListener('foo', function (event) { diff --git a/b2g/components/UpdatePrompt.js b/b2g/components/UpdatePrompt.js index 903e4da606..fee312fb74 100644 --- a/b2g/components/UpdatePrompt.js +++ b/b2g/components/UpdatePrompt.js @@ -214,10 +214,10 @@ UpdatePrompt.prototype = { setUpdateStatus: function UP_setUpdateStatus(aStatus) { if (useSettings()) { - log("Setting goanna.updateStatus: " + aStatus); + log("Setting gecko.updateStatus: " + aStatus); let lock = Services.settings.createLock(); - lock.set("goanna.updateStatus", aStatus, null); + lock.set("gecko.updateStatus", aStatus, null); } }, @@ -364,7 +364,7 @@ UpdatePrompt.prototype = { finishUpdate: function UP_finishUpdate() { if (!this._update.isOSUpdate) { - // Standard goanna+gaia updates will just need to restart the process + // Standard gecko+gaia updates will just need to restart the process this.restartProcess(); return; } diff --git a/b2g/config/dolphin-512/config.json b/b2g/config/dolphin-512/config.json index 0ba25b7255..22fb524007 100644 --- a/b2g/config/dolphin-512/config.json +++ b/b2g/config/dolphin-512/config.json @@ -22,9 +22,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], + ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] + ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] ], "env": { "VARIANT": "user", @@ -33,7 +33,7 @@ "b2g_manifest": "dolphin-512.xml", "b2g_manifest_intree": true, "additional_source_tarballs": [], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/dolphin/config.json b/b2g/config/dolphin/config.json index f191cbe530..04164bd609 100644 --- a/b2g/config/dolphin/config.json +++ b/b2g/config/dolphin/config.json @@ -24,9 +24,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], + ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] + ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] ], "env": { "VARIANT": "user", @@ -36,7 +36,7 @@ "b2g_manifest": "dolphin.xml", "b2g_manifest_intree": true, "additional_source_tarballs": [], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/emulator-ics/config.json b/b2g/config/emulator-ics/config.json index be304e14fc..10ebd25167 100644 --- a/b2g/config/emulator-ics/config.json +++ b/b2g/config/emulator-ics/config.json @@ -16,7 +16,7 @@ "{workdir}/sources.xml" ], "upload_platform": "emulator-ics", - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/emulator-jb/config.json b/b2g/config/emulator-jb/config.json index df3458f67e..b04f9f6e94 100644 --- a/b2g/config/emulator-jb/config.json +++ b/b2g/config/emulator-jb/config.json @@ -21,7 +21,7 @@ "{workdir}/sources.xml" ], "upload_platform": "emulator-jb", - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/emulator-kk/config.json b/b2g/config/emulator-kk/config.json index afbeb1c05e..462910a071 100644 --- a/b2g/config/emulator-kk/config.json +++ b/b2g/config/emulator-kk/config.json @@ -21,7 +21,7 @@ "{workdir}/sources.xml" ], "upload_platform": "emulator-kk", - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/emulator/config.json b/b2g/config/emulator/config.json index 3ee2fa4331..b6d1276fb1 100644 --- a/b2g/config/emulator/config.json +++ b/b2g/config/emulator/config.json @@ -21,7 +21,7 @@ "{objdir}/dist/b2g-*.tar.gz", "{workdir}/sources.xml" ], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/flame-kk/config.json b/b2g/config/flame-kk/config.json index 3eff001117..6f838b74ed 100644 --- a/b2g/config/flame-kk/config.json +++ b/b2g/config/flame-kk/config.json @@ -26,9 +26,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], + ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] + ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] ], "env": { "VARIANT": "user", @@ -40,7 +40,7 @@ "b2g_manifest": "flame-kk.xml", "b2g_manifest_intree": true, "additional_source_tarballs": ["backup-flame.tar.xz"], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/flame/config.json b/b2g/config/flame/config.json index 574e520f48..f620a065b0 100644 --- a/b2g/config/flame/config.json +++ b/b2g/config/flame/config.json @@ -25,9 +25,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], + ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] + ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] ], "env": { "VARIANT": "user", @@ -39,7 +39,7 @@ "b2g_manifest": "flame.xml", "b2g_manifest_intree": true, "additional_source_tarballs": ["backup-flame.tar.xz"], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/hamachi/config.json b/b2g/config/hamachi/config.json index a6ebdcb42c..a1895113c5 100644 --- a/b2g/config/hamachi/config.json +++ b/b2g/config/hamachi/config.json @@ -19,9 +19,9 @@ ], "zip_files": [ "{workdir}/profile.sh", - ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], + ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] + ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] ], "env": { "VARIANT": "user", @@ -32,7 +32,7 @@ "b2g_manifest": "hamachi.xml", "b2g_manifest_intree": true, "additional_source_tarballs": ["backup-hamachi.tar.xz"], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/hamachi/limited-memory-config.json b/b2g/config/hamachi/limited-memory-config.json index f216e2c7c3..9c91650267 100644 --- a/b2g/config/hamachi/limited-memory-config.json +++ b/b2g/config/hamachi/limited-memory-config.json @@ -26,7 +26,7 @@ "b2g_manifest": "hamachi.xml", "b2g_manifest_branch": "master", "additional_source_tarballs": ["backup-hamachi.tar.xz"], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/helix/config.json b/b2g/config/helix/config.json index acb79ac40d..4abc0dc7d1 100644 --- a/b2g/config/helix/config.json +++ b/b2g/config/helix/config.json @@ -24,9 +24,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], + ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] + ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] ], "env": { "VARIANT": "user", @@ -38,7 +38,7 @@ "b2g_manifest": "helix.xml", "b2g_manifest_intree": true, "additional_source_tarballs": ["helix-ics.tar.xz"], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/nexus-4/config.json b/b2g/config/nexus-4/config.json index a3aaccd617..45a6600e11 100644 --- a/b2g/config/nexus-4/config.json +++ b/b2g/config/nexus-4/config.json @@ -25,9 +25,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], + ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] + ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] ], "env": { "VARIANT": "user", @@ -38,7 +38,7 @@ "b2g_manifest": "nexus-4.xml", "b2g_manifest_intree": true, "additional_source_tarballs": [], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/nexus-5-l/config.json b/b2g/config/nexus-5-l/config.json index 2b052eafd7..39152c2f5a 100644 --- a/b2g/config/nexus-5-l/config.json +++ b/b2g/config/nexus-5-l/config.json @@ -25,9 +25,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], + ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] + ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] ], "env": { "VARIANT": "userdebug", @@ -38,7 +38,7 @@ "b2g_manifest": "nexus-5-l.xml", "b2g_manifest_intree": true, "additional_source_tarballs": [], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/config/wasabi/config.json b/b2g/config/wasabi/config.json index eba79fdd6e..d3b1573a81 100644 --- a/b2g/config/wasabi/config.json +++ b/b2g/config/wasabi/config.json @@ -20,9 +20,9 @@ "{workdir}/.config", "{workdir}/sources.xml", "{workdir}/profile.sh", - ["{workdir}/goanna/tools/profiler/merge-profiles.py", "goanna/tools/profiler/"], + ["{workdir}/gecko/tools/profiler/merge-profiles.py", "gecko/tools/profiler/"], ["{workdir}/scripts/profile-symbolicate.py", "scripts/"], - ["{workdir}/goanna/tools/rb/fix_stack_using_bpsyms.py", "goanna/tools/rb/"] + ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"] ], "env": { "VARIANT": "user", @@ -32,7 +32,7 @@ "b2g_manifest": "wasabi.xml", "b2g_manifest_intree": true, "additional_source_tarballs": ["backup-wasabi.tar.gz"], - "goanna_l10n_root": "https://hg.mozilla.org/l10n-central", + "gecko_l10n_root": "https://hg.mozilla.org/l10n-central", "gaia": { "l10n": { "vcs": "hgtool", diff --git a/b2g/confvars.sh b/b2g/confvars.sh index d6c1ae9ddc..bcf7f661c9 100755 --- a/b2g/confvars.sh +++ b/b2g/confvars.sh @@ -11,7 +11,7 @@ MOZ_APP_UA_NAME=Firefox MOZ_UA_OS_AGNOSTIC=1 MOZ_B2G_VERSION=3.0.0.0-prerelease -MOZ_B2G_OS_NAME=Boot2Goanna +MOZ_B2G_OS_NAME=Boot2Gecko MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official diff --git a/b2g/locales/Makefile.in b/b2g/locales/Makefile.in index c5c30cf378..e2c01341c5 100644 --- a/b2g/locales/Makefile.in +++ b/b2g/locales/Makefile.in @@ -134,7 +134,7 @@ endif ident: - @printf 'goanna_revision ' + @printf 'gecko_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(GECKO_PLATFORM_INI_PATH) Build SourceStamp @printf 'b2g_revision ' @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(B2G_APPLICATION_INI_PATH) App SourceStamp diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in index 41149fb88a..c479663952 100644 --- a/browser/app/macbuild/Contents/Info.plist.in +++ b/browser/app/macbuild/Contents/Info.plist.in @@ -224,6 +224,6 @@ NSSupportsAutomaticGraphicsSwitching NSPrincipalClass - GoannaNSApplication + GeckoNSApplication diff --git a/browser/app/moz.build b/browser/app/moz.build index 929139a6a3..c40fe170c9 100644 --- a/browser/app/moz.build +++ b/browser/app/moz.build @@ -8,9 +8,9 @@ DIRS += ['profile/extensions'] if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_ASAN']: - GoannaProgram(CONFIG['MOZ_APP_NAME']) + GeckoProgram(CONFIG['MOZ_APP_NAME']) else: - GoannaProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static') + GeckoProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static') JS_PREFERENCE_FILES += [ 'profile/palemoon.js', diff --git a/browser/base/content/browser-fullScreen.js b/browser/base/content/browser-fullScreen.js index c56928315e..bd6de100d9 100644 --- a/browser/base/content/browser-fullScreen.js +++ b/browser/base/content/browser-fullScreen.js @@ -315,7 +315,7 @@ var FullScreen = { Services.perms.EXPIRE_NEVER); else if (isApproved) { // The user has only temporarily approved fullscren for this fullscreen - // session only. Add the permission (so Goanna knows to approve any further + // session only. Add the permission (so Gecko knows to approve any further // fullscreen requests for this host in this fullscreen session) but add // a listener to revoke the permission when the chrome document exits // fullscreen. diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 690d11988d..7a4b4c865b 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -5122,7 +5122,7 @@ function handleDroppedLink(event, url, name) loadURI(uri, null, postData.value, false); // Keep the event from being handled by the dragDrop listeners - // built-in to goanna if they happen to be above us. + // built-in to gecko if they happen to be above us. event.preventDefault(); }; diff --git a/browser/components/feeds/WebContentConverter.js b/browser/components/feeds/WebContentConverter.js index 674c8f3638..41679b0281 100644 --- a/browser/components/feeds/WebContentConverter.js +++ b/browser/components/feeds/WebContentConverter.js @@ -63,7 +63,7 @@ const PREF_SELECTED_WEB = "browser.feeds.handlers.webservice"; const PREF_SELECTED_ACTION = "browser.feeds.handler"; const PREF_SELECTED_READER = "browser.feeds.handler.default"; const PREF_HANDLER_EXTERNAL_PREFIX = "network.protocol-handler.external"; -const PREF_ALLOW_DIFFERENT_HOST = "goanna.handlerService.allowRegisterFromDifferentHost"; +const PREF_ALLOW_DIFFERENT_HOST = "gecko.handlerService.allowRegisterFromDifferentHost"; const STRING_BUNDLE_URI = "chrome://browser/locale/feeds/subscribe.properties"; diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js index 13ea9da12f..b5bd0094f7 100644 --- a/browser/components/nsBrowserContentHandler.js +++ b/browser/components/nsBrowserContentHandler.js @@ -94,9 +94,9 @@ const OVERRIDE_NEW_BUILD_ID = 3; * Returns: * OVERRIDE_NEW_PROFILE if this is the first run with a new profile. * OVERRIDE_NEW_MSTONE if this is the first run with a build with a different - * Goanna milestone (i.e. right after an upgrade). + * Gecko milestone (i.e. right after an upgrade). * OVERRIDE_NEW_BUILD_ID if this is the first run with a new build ID of the - * same Goanna milestone (i.e. after a nightly upgrade). + * same Gecko milestone (i.e. after a nightly upgrade). * OVERRIDE_NONE otherwise. */ function needHomepageOverride(prefb) { diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index baf179b443..769f63cd04 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -541,7 +541,7 @@ BrowserGlue.prototype = { cookies = aHttpChannel.getRequestHeader("Cookie"); } catch (e) { /* no cookie sent */ } if (cookies && cookies.indexOf("MoodleSession") > -1) - return aOriginalUA.replace(/Goanna\/[^ ]*/, "Goanna/20100101"); + return aOriginalUA.replace(/Gecko\/[^ ]*/, "Gecko/20100101"); return null; }); } diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index 9770d4733f..9a15842089 100644 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -455,7 +455,7 @@ ${WriteRegStr2} $TmpVal "$0" "Plugins" "$8\plugins" 0 StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}" - ${WriteRegStr2} $TmpVal "$0" "GoannaVer" "${GREVersion}" 0 + ${WriteRegStr2} $TmpVal "$0" "GeckoVer" "${GREVersion}" 0 StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}" ${WriteRegStr2} $TmpVal "$0" "" "${GREVersion}" 0 diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties index d4e02ece49..1d461c186d 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -22,22 +22,22 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s # profile database. Note that "new" is defined as "has a different URL"; this # means that it's not possible to update the name of existing handler, so # don't make any spelling errors here. -goanna.handlerService.defaultHandlersVersion=3 +gecko.handlerService.defaultHandlersVersion=3 # The default set of protocol handlers for webcal: -goanna.handlerService.schemes.webcal.0.name=30 Boxes -goanna.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s +gecko.handlerService.schemes.webcal.0.name=30 Boxes +gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s # The default set of protocol handlers for mailto: -goanna.handlerService.schemes.mailto.0.name=Yahoo! Mail -goanna.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s -goanna.handlerService.schemes.mailto.1.name=Gmail -goanna.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s +gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail +gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s +gecko.handlerService.schemes.mailto.1.name=Gmail +gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s # The default set of protocol handlers for irc: -goanna.handlerService.schemes.irc.0.name=Mibbit -goanna.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.irc.0.name=Mibbit +gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s # The default set of protocol handlers for ircs: -goanna.handlerService.schemes.ircs.0.name=Mibbit -goanna.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.ircs.0.name=Mibbit +gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s diff --git a/browser/locales/filter.py b/browser/locales/filter.py index 8e097db059..7e85def502 100644 --- a/browser/locales/filter.py +++ b/browser/locales/filter.py @@ -33,5 +33,5 @@ def test(mod, path, entity = None): return not (re.match(r"browser\.search\.order\.[1-9]", entity) or re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or - re.match(r"goanna\.handlerService\.schemes\.", entity) or - re.match(r"goanna\.handlerService\.defaultHandlersVersion", entity)) + re.match(r"gecko\.handlerService\.schemes\.", entity) or + re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity)) diff --git a/build/annotationProcessors/AnnotationInfo.java b/build/annotationProcessors/AnnotationInfo.java index ae415ecb09..2477132eb4 100644 --- a/build/annotationProcessors/AnnotationInfo.java +++ b/build/annotationProcessors/AnnotationInfo.java @@ -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/. */ -package org.mozilla.goanna.annotationProcessors; +package org.mozilla.gecko.annotationProcessors; /** * Object holding annotation data. Used by GeneratableElementIterator. diff --git a/build/annotationProcessors/AnnotationProcessor.java b/build/annotationProcessors/AnnotationProcessor.java index 6a0e80f066..1408891a1d 100644 --- a/build/annotationProcessors/AnnotationProcessor.java +++ b/build/annotationProcessors/AnnotationProcessor.java @@ -2,12 +2,12 @@ * 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/. */ -package org.mozilla.goanna.annotationProcessors; +package org.mozilla.gecko.annotationProcessors; -import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity; -import org.mozilla.goanna.annotationProcessors.classloader.ClassWithOptions; -import org.mozilla.goanna.annotationProcessors.classloader.IterableJarLoadingURLClassLoader; -import org.mozilla.goanna.annotationProcessors.utils.GeneratableElementIterator; +import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity; +import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions; +import org.mozilla.gecko.annotationProcessors.classloader.IterableJarLoadingURLClassLoader; +import org.mozilla.gecko.annotationProcessors.utils.GeneratableElementIterator; import java.io.FileOutputStream; import java.io.IOException; diff --git a/build/annotationProcessors/CodeGenerator.java b/build/annotationProcessors/CodeGenerator.java index 635eb8a7f1..9b965f1bc3 100644 --- a/build/annotationProcessors/CodeGenerator.java +++ b/build/annotationProcessors/CodeGenerator.java @@ -2,11 +2,11 @@ * 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/. */ -package org.mozilla.goanna.annotationProcessors; +package org.mozilla.gecko.annotationProcessors; -import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity; -import org.mozilla.goanna.annotationProcessors.classloader.ClassWithOptions; -import org.mozilla.goanna.annotationProcessors.utils.Utils; +import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity; +import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions; +import org.mozilla.gecko.annotationProcessors.utils.Utils; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; diff --git a/build/annotationProcessors/SDKProcessor.java b/build/annotationProcessors/SDKProcessor.java index ea7fc3e7bb..2ffc1905ed 100644 --- a/build/annotationProcessors/SDKProcessor.java +++ b/build/annotationProcessors/SDKProcessor.java @@ -2,16 +2,16 @@ * 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/. */ -package org.mozilla.goanna.annotationProcessors; +package org.mozilla.gecko.annotationProcessors; import com.android.tools.lint.checks.ApiLookup; import com.android.tools.lint.LintCliClient; -import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity; -import org.mozilla.goanna.annotationProcessors.classloader.ClassWithOptions; -import org.mozilla.goanna.annotationProcessors.classloader.IterableJarLoadingURLClassLoader; -import org.mozilla.goanna.annotationProcessors.utils.GeneratableElementIterator; -import org.mozilla.goanna.annotationProcessors.utils.Utils; +import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity; +import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions; +import org.mozilla.gecko.annotationProcessors.classloader.IterableJarLoadingURLClassLoader; +import org.mozilla.gecko.annotationProcessors.utils.GeneratableElementIterator; +import org.mozilla.gecko.annotationProcessors.utils.Utils; import java.io.File; import java.io.FileInputStream; diff --git a/build/annotationProcessors/classloader/AnnotatableEntity.java b/build/annotationProcessors/classloader/AnnotatableEntity.java index 6ad64ccc17..9dffe6033b 100644 --- a/build/annotationProcessors/classloader/AnnotatableEntity.java +++ b/build/annotationProcessors/classloader/AnnotatableEntity.java @@ -2,9 +2,9 @@ * 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/. */ -package org.mozilla.goanna.annotationProcessors.classloader; +package org.mozilla.gecko.annotationProcessors.classloader; -import org.mozilla.goanna.annotationProcessors.AnnotationInfo; +import org.mozilla.gecko.annotationProcessors.AnnotationInfo; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/build/annotationProcessors/classloader/ClassWithOptions.java b/build/annotationProcessors/classloader/ClassWithOptions.java index 851a301503..070cff8b67 100644 --- a/build/annotationProcessors/classloader/ClassWithOptions.java +++ b/build/annotationProcessors/classloader/ClassWithOptions.java @@ -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/. */ -package org.mozilla.goanna.annotationProcessors.classloader; +package org.mozilla.gecko.annotationProcessors.classloader; public class ClassWithOptions { public final Class wrappedClass; diff --git a/build/annotationProcessors/classloader/IterableJarLoadingURLClassLoader.java b/build/annotationProcessors/classloader/IterableJarLoadingURLClassLoader.java index e6a8b65402..7e74399ca9 100644 --- a/build/annotationProcessors/classloader/IterableJarLoadingURLClassLoader.java +++ b/build/annotationProcessors/classloader/IterableJarLoadingURLClassLoader.java @@ -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/. */ -package org.mozilla.goanna.annotationProcessors.classloader; +package org.mozilla.gecko.annotationProcessors.classloader; import java.io.File; import java.io.IOException; diff --git a/build/annotationProcessors/classloader/JarClassIterator.java b/build/annotationProcessors/classloader/JarClassIterator.java index 5e5d256819..003856a1c3 100644 --- a/build/annotationProcessors/classloader/JarClassIterator.java +++ b/build/annotationProcessors/classloader/JarClassIterator.java @@ -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/. */ -package org.mozilla.goanna.annotationProcessors.classloader; +package org.mozilla.gecko.annotationProcessors.classloader; import java.util.Iterator; diff --git a/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java b/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java index d63fef076c..2ee2ae56a5 100644 --- a/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java +++ b/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java @@ -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/. */ -package org.mozilla.goanna.annotationProcessors.utils; +package org.mozilla.gecko.annotationProcessors.utils; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/build/annotationProcessors/utils/GeneratableElementIterator.java b/build/annotationProcessors/utils/GeneratableElementIterator.java index caf51aa151..fa1e89dbc4 100644 --- a/build/annotationProcessors/utils/GeneratableElementIterator.java +++ b/build/annotationProcessors/utils/GeneratableElementIterator.java @@ -2,10 +2,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/. */ -package org.mozilla.goanna.annotationProcessors.utils; +package org.mozilla.gecko.annotationProcessors.utils; -import org.mozilla.goanna.annotationProcessors.AnnotationInfo; -import org.mozilla.goanna.annotationProcessors.classloader.AnnotatableEntity; +import org.mozilla.gecko.annotationProcessors.AnnotationInfo; +import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; @@ -50,7 +50,7 @@ public class GeneratableElementIterator implements Iterator { // Check for "Wrap ALL the things" flag. for (Annotation annotation : aClass.getDeclaredAnnotations()) { final String annotationTypeName = annotation.annotationType().getName(); - if (annotationTypeName.equals("org.mozilla.goanna.mozglue.generatorannotations.WrapEntireClassForJNI")) { + if (annotationTypeName.equals("org.mozilla.gecko.mozglue.generatorannotations.WrapEntireClassForJNI")) { mIterateEveryEntry = true; break; } @@ -71,7 +71,7 @@ public class GeneratableElementIterator implements Iterator { // WrappedJNIMethod has parameters. Use Reflection to obtain them. Class annotationType = annotation.annotationType(); final String annotationTypeName = annotationType.getName(); - if (annotationTypeName.equals("org.mozilla.goanna.mozglue.generatorannotations.WrapElementForJNI")) { + if (annotationTypeName.equals("org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI")) { String stubName = null; boolean isMultithreadedStub = false; boolean noThrow = false; diff --git a/build/annotationProcessors/utils/Utils.java b/build/annotationProcessors/utils/Utils.java index 7d6f84a551..03e71291cd 100644 --- a/build/annotationProcessors/utils/Utils.java +++ b/build/annotationProcessors/utils/Utils.java @@ -2,9 +2,9 @@ * 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/. */ -package org.mozilla.goanna.annotationProcessors.utils; +package org.mozilla.gecko.annotationProcessors.utils; -import org.mozilla.goanna.annotationProcessors.AnnotationInfo; +import org.mozilla.gecko.annotationProcessors.AnnotationInfo; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/build/appini_header.py b/build/appini_header.py index 94a2a44b7b..d637d5ef37 100644 --- a/build/appini_header.py +++ b/build/appini_header.py @@ -24,7 +24,7 @@ def main(file): appdata['flags'] = ' | '.join(flags) if flags else '0' appdata['App:profile'] = '"%s"' % appdata['App:profile'] if 'App:profile' in appdata else 'NULL' expected = ('App:vendor', 'App:name', 'App:remotingname', 'App:version', 'App:buildid', - 'App:id', 'Goanna:minversion', 'Goanna:maxversion') + 'App:id', 'Gecko:minversion', 'Gecko:maxversion') missing = [var for var in expected if var not in appdata] if missing: print >>sys.stderr, \ @@ -47,8 +47,8 @@ def main(file): NULL, // copyright %(flags)s, NULL, // xreDirectory - "%(Goanna:minversion)s", - "%(Goanna:maxversion)s", + "%(Gecko:minversion)s", + "%(Gecko:maxversion)s", "%(Crash Reporter:serverurl)s", %(App:profile)s };''' % appdata diff --git a/build/application.ini b/build/application.ini index 975b2ec934..549397beb6 100644 --- a/build/application.ini +++ b/build/application.ini @@ -43,7 +43,7 @@ SourceStamp=@MOZ_SOURCE_STAMP@ #endif ID=@MOZ_APP_ID@ -[Goanna] +[Gecko] MinVersion=@GRE_MILESTONE@ MaxVersion=@GRE_MILESTONE@ diff --git a/build/autoconf/config.status.m4 b/build/autoconf/config.status.m4 index e35a52a81c..93348b4be9 100644 --- a/build/autoconf/config.status.m4 +++ b/build/autoconf/config.status.m4 @@ -177,7 +177,7 @@ cat >> $CONFIG_STATUS <> $CONFIG_STATUS < - @@ -28,7 +28,7 @@ - diff --git a/build/mobile/robocop/Assert.java b/build/mobile/robocop/Assert.java index f65541fcd8..aa76dcf2b8 100644 --- a/build/mobile/robocop/Assert.java +++ b/build/mobile/robocop/Assert.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; public interface Assert { void dumpLog(String message); diff --git a/build/mobile/robocop/Driver.java b/build/mobile/robocop/Driver.java index 974651607b..4c8373c5bf 100644 --- a/build/mobile/robocop/Driver.java +++ b/build/mobile/robocop/Driver.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import android.app.Activity; @@ -24,10 +24,10 @@ public interface Driver { int getPageHeight(); int getScrollHeight(); int getHeight(); - int getGoannaTop(); - int getGoannaLeft(); - int getGoannaWidth(); - int getGoannaHeight(); + int getGeckoTop(); + int getGeckoLeft(); + int getGeckoWidth(); + int getGeckoHeight(); void startFrameRecording(); int stopFrameRecording(); diff --git a/build/mobile/robocop/Element.java b/build/mobile/robocop/Element.java index 73219c41f5..97610ff32a 100644 --- a/build/mobile/robocop/Element.java +++ b/build/mobile/robocop/Element.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; /** * Element provides access to a specific UI view (android.view.View). diff --git a/build/mobile/robocop/FennecInstrumentationTestRunner.java b/build/mobile/robocop/FennecInstrumentationTestRunner.java index 11093775f0..d4fb727d16 100644 --- a/build/mobile/robocop/FennecInstrumentationTestRunner.java +++ b/build/mobile/robocop/FennecInstrumentationTestRunner.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import android.os.Bundle; import android.test.InstrumentationTestRunner; diff --git a/build/mobile/robocop/FennecMochitestAssert.java b/build/mobile/robocop/FennecMochitestAssert.java index dd36e97fe9..918f576fdd 100644 --- a/build/mobile/robocop/FennecMochitestAssert.java +++ b/build/mobile/robocop/FennecMochitestAssert.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/build/mobile/robocop/FennecNativeActions.java b/build/mobile/robocop/FennecNativeActions.java index c655b64a82..2870ca25fc 100644 --- a/build/mobile/robocop/FennecNativeActions.java +++ b/build/mobile/robocop/FennecNativeActions.java @@ -2,19 +2,19 @@ * 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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import org.json.JSONObject; -import org.mozilla.goanna.FennecNativeDriver.LogLevel; -import org.mozilla.goanna.gfx.LayerView; -import org.mozilla.goanna.gfx.LayerView.DrawListener; -import org.mozilla.goanna.mozglue.GoannaLoader; -import org.mozilla.goanna.sqlite.SQLiteBridge; -import org.mozilla.goanna.util.GeckoEventListener; +import org.mozilla.gecko.FennecNativeDriver.LogLevel; +import org.mozilla.gecko.gfx.LayerView; +import org.mozilla.gecko.gfx.LayerView.DrawListener; +import org.mozilla.gecko.mozglue.GeckoLoader; +import org.mozilla.gecko.sqlite.SQLiteBridge; +import org.mozilla.gecko.util.GeckoEventListener; import android.app.Activity; import android.app.Instrumentation; @@ -37,7 +37,7 @@ public class FennecNativeActions implements Actions { mInstr = instrumentation; mAsserter = asserter; - GoannaLoader.loadSQLiteLibs(activity, activity.getApplication().getPackageResourcePath()); + GeckoLoader.loadSQLiteLibs(activity, activity.getApplication().getPackageResourcePath()); } class GeckoEventExpecter implements RepeatedEventExpecter { diff --git a/build/mobile/robocop/FennecNativeDriver.java b/build/mobile/robocop/FennecNativeDriver.java index 01edd8af58..7bc84de3f4 100644 --- a/build/mobile/robocop/FennecNativeDriver.java +++ b/build/mobile/robocop/FennecNativeDriver.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -20,9 +20,9 @@ import java.util.Map; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.goanna.gfx.LayerView; -import org.mozilla.goanna.gfx.PanningPerfAPI; -import org.mozilla.goanna.util.GeckoEventListener; +import org.mozilla.gecko.gfx.LayerView; +import org.mozilla.gecko.gfx.PanningPerfAPI; +import org.mozilla.gecko.util.GeckoEventListener; import android.app.Activity; import android.util.Log; @@ -64,58 +64,58 @@ public class FennecNativeDriver implements Driver { mRootPath = rootPath; } - //Information on the location of the Goanna Frame. - private boolean mGoannaInfo = false; - private int mGoannaTop = 100; - private int mGoannaLeft = 0; - private int mGoannaHeight= 700; - private int mGoannaWidth = 1024; + //Information on the location of the Gecko Frame. + private boolean mGeckoInfo = false; + private int mGeckoTop = 100; + private int mGeckoLeft = 0; + private int mGeckoHeight= 700; + private int mGeckoWidth = 1024; - private void getGoannaInfo() { - View goannaLayout = mActivity.findViewById(R.id.goanna_layout); - if (goannaLayout != null) { + private void getGeckoInfo() { + View geckoLayout = mActivity.findViewById(R.id.gecko_layout); + if (geckoLayout != null) { int[] pos = new int[2]; - goannaLayout.getLocationOnScreen(pos); - mGoannaTop = pos[1]; - mGoannaLeft = pos[0]; - mGoannaWidth = goannaLayout.getWidth(); - mGoannaHeight = goannaLayout.getHeight(); - mGoannaInfo = true; + geckoLayout.getLocationOnScreen(pos); + mGeckoTop = pos[1]; + mGeckoLeft = pos[0]; + mGeckoWidth = geckoLayout.getWidth(); + mGeckoHeight = geckoLayout.getHeight(); + mGeckoInfo = true; } else { - throw new RoboCopException("Unable to find view goanna_layout"); + throw new RoboCopException("Unable to find view gecko_layout"); } } @Override - public int getGoannaTop() { - if (!mGoannaInfo) { - getGoannaInfo(); + public int getGeckoTop() { + if (!mGeckoInfo) { + getGeckoInfo(); } - return mGoannaTop; + return mGeckoTop; } @Override - public int getGoannaLeft() { - if (!mGoannaInfo) { - getGoannaInfo(); + public int getGeckoLeft() { + if (!mGeckoInfo) { + getGeckoInfo(); } - return mGoannaLeft; + return mGeckoLeft; } @Override - public int getGoannaHeight() { - if (!mGoannaInfo) { - getGoannaInfo(); + public int getGeckoHeight() { + if (!mGeckoInfo) { + getGeckoInfo(); } - return mGoannaHeight; + return mGeckoHeight; } @Override - public int getGoannaWidth() { - if (!mGoannaInfo) { - getGoannaInfo(); + public int getGeckoWidth() { + if (!mGeckoInfo) { + getGeckoInfo(); } - return mGoannaWidth; + return mGeckoWidth; } /** Find the element with given id. diff --git a/build/mobile/robocop/FennecNativeElement.java b/build/mobile/robocop/FennecNativeElement.java index f26c65200a..105c2b7c4b 100644 --- a/build/mobile/robocop/FennecNativeElement.java +++ b/build/mobile/robocop/FennecNativeElement.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import android.app.Activity; import android.view.View; diff --git a/build/mobile/robocop/FennecTalosAssert.java b/build/mobile/robocop/FennecTalosAssert.java index f4008d50eb..862f667770 100644 --- a/build/mobile/robocop/FennecTalosAssert.java +++ b/build/mobile/robocop/FennecTalosAssert.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; public class FennecTalosAssert implements Assert { diff --git a/build/mobile/robocop/PaintedSurface.java b/build/mobile/robocop/PaintedSurface.java index 6554dce845..17d77b7586 100644 --- a/build/mobile/robocop/PaintedSurface.java +++ b/build/mobile/robocop/PaintedSurface.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/build/mobile/robocop/RoboCopException.java b/build/mobile/robocop/RoboCopException.java index 6c7e754a85..420df818d9 100644 --- a/build/mobile/robocop/RoboCopException.java +++ b/build/mobile/robocop/RoboCopException.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; public class RoboCopException extends RuntimeException { diff --git a/build/mobile/robocop/RobocopShare1.java b/build/mobile/robocop/RobocopShare1.java index 5d5ecca5b7..80ab3396c2 100644 --- a/build/mobile/robocop/RobocopShare1.java +++ b/build/mobile/robocop/RobocopShare1.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import android.os.Bundle; import android.support.v4.app.FragmentActivity; diff --git a/build/mobile/robocop/RobocopShare2.java b/build/mobile/robocop/RobocopShare2.java index 1aa18f9c04..4874dffb76 100644 --- a/build/mobile/robocop/RobocopShare2.java +++ b/build/mobile/robocop/RobocopShare2.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import android.os.Bundle; import android.support.v4.app.FragmentActivity; diff --git a/build/mobile/robocop/RobocopUtils.java b/build/mobile/robocop/RobocopUtils.java index 8339152d48..7a33abfa64 100644 --- a/build/mobile/robocop/RobocopUtils.java +++ b/build/mobile/robocop/RobocopUtils.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/build/mobile/robocop/StructuredLogger.java b/build/mobile/robocop/StructuredLogger.java index ddd454148e..87d5a3c250 100644 --- a/build/mobile/robocop/StructuredLogger.java +++ b/build/mobile/robocop/StructuredLogger.java @@ -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/. */ -package org.mozilla.goanna; +package org.mozilla.gecko; import java.util.HashSet; import java.util.Arrays; diff --git a/build/mobile/robocop/moz.build b/build/mobile/robocop/moz.build index b3498dfdf2..12d61eb171 100644 --- a/build/mobile/robocop/moz.build +++ b/build/mobile/robocop/moz.build @@ -15,6 +15,6 @@ main.assets = TOPSRCDIR + '/mobile/android/base/tests/assets' main.referenced_projects += ['Fennec'] main.add_classpathentry('harness', SRCDIR, - dstdir='harness/org/mozilla/goanna') + dstdir='harness/org/mozilla/gecko') main.add_classpathentry('src', TOPSRCDIR + '/mobile/android/base/tests', - dstdir='src/org/mozilla/goanna/tests') + dstdir='src/org/mozilla/gecko/tests') diff --git a/build/pgo/js-input/sunspider/string-unpack-code.html b/build/pgo/js-input/sunspider/string-unpack-code.html index fc832429ab..ba80c99ea1 100644 --- a/build/pgo/js-input/sunspider/string-unpack-code.html +++ b/build/pgo/js-input/sunspider/string-unpack-code.html @@ -88,7 +88,7 @@ var decompressedJQuery = function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('if(V z=="1k"){(B(){if(V D["1o"]=="1k"){D.1o={}}if((!D["1z"])||(!1z["ca"])){D.1z={}}A cn=["rA","rz","1K","ry","rx","9f","rw","rv","ru","rt","rs","rr","rq","ro","rn","rm"];A i=0,24;1s(24=cn[i++]){if(!1z[24]){1z[24]=B(){}}}if(V D["z"]=="1k"){D.z={}}z.1W=D;A d3={im:U,rl:U,rk:"",rj:"",ri:"",rh:K,rg:U};R(A 8z in d3){if(V 1o[8z]=="1k"){1o[8z]=d3[8z]}}A jK=["rf","rd","rc","rb"];A t;1s(t=jK.3a()){z["is"+t]=U}})();z.8h=1o.8h;z.cY={jJ:0,jI:9,jH:0,jG:"",jF:2V("$ra: r9 $".1f(/[0-9]+/)[0]),2i:B(){4G(z.cY){C jJ+"."+jI+"."+jH+jG+" ("+jF+")"}}};z.d1=B(jE,jD,1V){A 2h=1V||z.1W;R(A i=0,p;2h&&(p=jE[i]);i++){2h=(p in 2h?2h[p]:(jD?2h[p]={}:1k))}C 2h};z.88=B(jC,jA,jB){A d2=jC.1A("."),p=d2.8q(),M=z.d1(d2,K,jB);C(M&&p?(M[p]=jA):1k)};z.6q=B(jz,jy,jx){C z.d1(jz.1A("."),jy,jx)};z.r8=B(jw,M){C!!z.6q(jw,U,M)};z["3u"]=B(d0){C z.1W.3u?z.1W.3u(d0):3u(d0)};z.ia=B(jv,cZ,cX){A 8y="r7: "+jv;if(cZ){8y+=" "+cZ}if(cX){8y+=" -- r6 be r5 in cY: "+cX}1z.1K(8y)};z.r4=B(ju,cW){A cV="r3: "+ju+" -- r2 r1 4F r0 qZ qY.";if(cW){cV+=" "+cW}1z.1K(cV)};(B(){A cR={53:{},6p:0,1h:{},8k:{z:{1p:"z",1Z:"."},cU:{1p:"cU",1Z:"../qX/cU"},cT:{1p:"cT",1Z:"cT"}},cN:B(cS){A mp=D.8k;C jp(mp[cS]&&mp[cS].1Z)},jk:B(8x){A mp=D.8k;if(D.cN(8x)){C mp[8x].1Z}C 8x},8v:[],6t:U,56:[],8t:[],8u:U};R(A cQ in cR){z[cQ]=cR[cQ]}})();z.jg=B(8w,cP,cb){A 1g=(((8w.2s(0)=="/"||8w.1f(/^\\w+:/)))?"":D.51)+8w;if(1o.jt&&z.c8){1g+="?"+67(1o.jt).2f(/\\W+/g,"")}1u{C!cP?D.cO(1g,cb):D.jq(1g,cP,cb)}1y(e){1z.1K(e);C U}};z.cO=B(1g,cb){if(D.8v[1g]){C K}A 6u=D.iR(1g,K);if(!6u){C U}D.8v[1g]=K;D.8v.Y(1g);if(cb){6u="("+6u+")"}A jr=z["3u"](6u+"\\r\\n//@ qW="+1g);if(cb){cb(jr)}C K};z.jq=B(1g,jo,cb){A ok=U;1u{ok=D.cO(1g,cb)}1y(e){1z.1K("qV je ",1g," 4G 9f: ",e)}C jp(ok&&D.53[jo])};z.6m=B(){D.8u=K;D.6t=K;A 57=D.56;D.56=[];R(A x=0;x<57.G;x++){57[x]()}D.8u=U;if(z.6t&&z.6p==0&&D.56.G>0){z.8s()}};z.ck=B(){A 57=D.8t;1s(57.G){(57.8q())()}};z.qU=B(M,jn){A d=z;if(P.G==1){d.56.Y(M)}I{if(P.G>1){d.56.Y(B(){M[jn]()})}}if(d.6t&&d.6p==0&&!d.8u){d.8s()}};z.dW=B(M,jm){A d=z;if(P.G==1){d.8t.Y(M)}I{if(P.G>1){d.8t.Y(B(){M[jm]()})}}};z.iM=B(){if(D.6t){C}if(D.6p>0){1z.1K("qT qS in qR!");C}z.8s()};z.8s=B(){if(V 5c=="8b"||(1o["qQ"]&&z.2M)){5c("z.6m();",0)}I{z.6m()}};z.cF=B(jl){A 4v=jl.1A(".");R(A i=4v.G;i>0;i--){A 8r=4v.2w(0,i).22(".");if((i==1)&&!D.cN(8r)){4v[0]="../"+4v[0]}I{A cM=D.jk(8r);if(cM!=8r){4v.3S(0,i,cM);3f}}}C 4v};z.jj=U;z.8m=B(2T,qP,55){55=D.jj||55;A 54=D.53[2T];if(54){C 54}A cL=2T.1A(".");A 3L=D.cF(2T);A jh=((3L[0].2s(0)!="/")&&!3L[0].1f(/^\\w+:/));A ji=3L[3L.G-1];A 3m;if(ji=="*"){2T=cL.2w(0,-1).22(".");3L.8q();3m=3L.22("/")+"/"+(1o["qO"]||"qN")+".js";if(jh&&3m.2s(0)=="/"){3m=3m.2w(1)}}I{3m=3L.22("/")+".js";2T=cL.22(".")}A jf=(!55)?2T:L;A ok=D.jg(3m,jf);if((!ok)&&(!55)){2m S 1O("qM 3O 4E \'"+2T+"\'; 72 qL \'"+3m+"\'")}if((!55)&&(!D["qK"])){54=D.53[2T];if(!54){2m S 1O("qJ \'"+2T+"\' is 3O qI a8 je \'"+3m+"\'")}}C 54};z.8c=z.8m;z.1Q=B(cK){A cJ=cK+"";A 8p=cJ;A 6s=cK.1A(/\\./);if(6s[6s.G-1]=="*"){6s.8q();8p=6s.22(".")}A 8o=z.6q(8p,K);D.53[cJ]=8o;D.53[8p]=8o;C 8o};z.qH=B(8n){A jd=8n["qG"]||[];A cI=jd.3U(8n[z.j4]||8n["aY"]||[]);R(A x=0;x0&&!(j==1&&1X[0]=="")&&1X[j]==".."&&1X[j-1]!=".."){if(j==(1X.G-1)){1X.3S(j,1);1X[j-1]=""}I{1X.3S(j-1,2);j-=2}}}}1t.28=1X.22("/")}}}}1g="";if(1t.4t){1g+=1t.4t+":"}if(1t.3l){1g+="//"+1t.3l}1g+=1t.28;if(1t.1r){1g+="?"+1t.1r}if(1t.52){1g+="#"+1t.52}}D.1g=1g.2i();A r=D.1g.1f(j7);D.4t=r[2]||(r[1]?"":n);D.3l=r[4]||(r[3]?"":n);D.28=r[5];D.1r=r[7]||(r[6]?"":n);D.52=r[9]||(r[8]?"":n);if(D.3l!=n){r=D.3l.1f(j6);D.8X=r[3]||n;D.8W=r[4]||n;D.qw=r[5];D.qv=r[7]||n}};z.4r.1C.2i=B(){C D.1g}})();z.qu=B(j5,2E){A 2B=z.cF(j5).22("/");if(!2B){C L}if(2B.31("/")!=2B.G-1){2B+="/"}A cE=2B.T(":");if(2B.2s(0)!="/"&&(cE==-1||cE>2B.T("/"))){2B=z.51+2B}C S z.4r(2B,2E)};if(V 26!="1k"){z.c8=K;z.j4="qt";(B(){A d=z;if(1q&&1q.4I){A 8j=1q.4I("ak");A j3=/z(\\.qs)?\\.js([\\?\\.]|$)/i;R(A i=0;i<8j.G;i++){A 4X=8j[i].5t("4X");if(!4X){6c}A m=4X.1f(j3);if(m){if(!1o["51"]){1o["51"]=4X.21(0,m.hK)}A cD=8j[i].5t("1o");if(cD){A cC=3u("({ "+cD+" })");R(A x in cC){1o[x]=cC[x]}}3f}}}d.51=1o["51"];A n=cq;A 8i=n.iL;A 4Z=n.qr;A 6r=2k(4Z);d.2M=(8i.T("qq")>=0)?6r:0;d.6B=(4Z.T("qo")>=0)||(4Z.T("j2")>=0)?6r:0;d.3o=(4Z.T("j2")>=0)?6r:0;A j1=8i.T("qn");d.gu=d.7B=((j1>=0)&&(!d.6B))?6r:0;d.j0=0;d.1l=0;d.iV=0;1u{if(d.7B){d.j0=2k(8i.1A("qm/")[1].1A(" ")[0])}if((1q.gx)&&(!d.2M)){d.1l=2k(4Z.1A("qk ")[1].1A(";")[0])}}1y(e){}if(z.1l&&(26.8f.cu==="9q:")){1o.iT=K}d.iX=B(){A 2A;A qj;A cB=d.6q("cz.cy");if(cB){C cB}if(V iZ!="1k"){2A=S iZ()}I{if(d.1l){1u{2A=S 9j("qi.qh")}1y(e){}}I{if(cq.qg["8Z/x-iY"]){2A=1q.a9("8b");2A.cA("Z","8Z/x-iY");2A.cA("3n",0);2A.cA("58",0);2A.1c.gq="7C";1q.5K.4c(2A)}}}if(!2A){C L}z.88("cz.cy.qf",2A);C z.6q("cz.cy")};A iW=d.iX();if(iW){d.iV=K}A cm=1q["aX"];d.qe=(cm=="aW")||(cm=="gr")||(d.1l<6);d.8h=1o.8h||(d.1l?n.qd:n.qc).1M();d.qb=1z.1K;d.cx=["iU.8g","em.8g","iU.8g.4.0"];d.9b=B(){A 4s=L;A cv=L;if(!z.1l||!1o.iT){1u{4s=S qa()}1y(e){}}if(!4s){R(A i=0;i<3;++i){A cw=z.cx[i];1u{4s=S 9j(cw)}1y(e){cv=e}if(4s){z.cx=[cw];3f}}}if(!4s){2m S 1O("8g 3O q9: "+cv)}C 4s};d.8Y=B(iS){A 4Y=iS.3N||0;C((4Y>=q8)&&(4Y0);d.iR=B(1g,iP){A 3K=D.9b();if(!iQ&&z.4r){1g=(S z.4r(26.8f,1g)).2i()}3K.dL("dD",1g,U);1u{3K.dI(L);if(!d.8Y(3K)){A 1G=1O("q2 4F 4E "+1g+" 3N:"+3K.3N);1G.3N=3K.3N;1G.2G=3K.2G;2m 1G}}1y(e){if(iP){C L}2m e}C 3K.2G}})();z.iO=U;z.6o=B(e){z.iO=K;A cr=(e&&e.Z)?e.Z.1M():"4E";if(P.2O.iN||(cr!="q1"&&cr!="4E")){C}P.2O.iN=K;if(V z["8e"]!="1k"){dX(z.8e);63 z.8e}if(z.6p==0){z.iM()}};if(1q.66){if(z.2M||(z.7B&&(1o["q0"]===K))){1q.66("pZ",z.6o,L)}26.66("4E",z.6o,L)}if(/(pY|pX)/i.6Z(cq.iL)){z.8e=dN(B(){if(/6m|iJ/.6Z(1q.6F)){z.6o()}},10)}(B(){A 3g=26;A 8d=B(cp,fp){A iK=3g[cp]||B(){};3g[cp]=B(){fp.14(3g,P);iK.14(3g,P)}};if(z.1l){1q.fJ(""+"");A co=K;8d("iG",B(){3g.5c(B(){co=U},0)});8d("pU",B(){if(co){z.ck()}});1u{1q.pT.2P("v","pS:pR-pQ-pP:pO");1q.pN().pM("v\\\\:*","pL:2E(#aY#pK)")}1y(e){}}I{8d("iG",B(){z.ck()})}})();z.pJ=B(){};z.1e=26["1q"]||L;z.3E=B(){C z.1e.3E||z.1e.4I("3E")[0]};z.ch=B(iF,iE){z.1W=iF;z.1e=iE};z.cf=B(4q,6n,iD){if((6n)&&((V 4q=="3c")||(4q 1N 67))){4q=6n[4q]}C(6n?4q.14(6n,iD||[]):4q())};z.pI=B(cj,iC,iB,iA){A cg;A iz=z.1W;A iy=z.1e;1u{z.ch(cj,cj.1q);cg=z.cf(iC,iB,iA)}ir{z.ch(iz,iy)}C cg};z.pH=B(ix,iw,iv,iu){A ce;A ip=z.1e;1u{z.1e=ix;ce=z.cf(iw,iv,iu)}ir{z.1e=ip}C ce};if(1o["cd"]){R(A cc in 1o["cd"]){z.io(cc,1o["cd"][cc])}}}if(1o.im){if(!1z.ca){z.8c("z.pG.ca")}}}if(!z.1h["z.X.c9"]){z.1h["z.X.c9"]=K;z.1Q("z.X.c9");z.1R=B(it){C(V it=="3c"||it 1N 67)};z.2l=B(it){C(it&&it 1N 4e||V it=="6a"||((V z["1H"]!="1k")&&(it 1N z.1H)))};if(z.c8&&z.3o){z.1Y=B(it){if((V(it)=="B")&&(it=="[8b 1H]")){C U}C(V it=="B"||it 1N bI)}}I{z.1Y=B(it){C(V it=="B"||it 1N bI)}}z.ib=B(it){if(V it=="1k"){C U}C(it===L||V it=="8b"||z.2l(it)||z.1Y(it))};z.pF=B(it){A d=z;if((!it)||(V it=="1k")){C U}if(d.1R(it)){C U}if(d.1Y(it)){C U}if(d.2l(it)){C K}if((it.5w)&&(it.5w.1M()=="3R")){C U}if(pE(it.G)){C K}C U};z.pD=B(it){if(!it){C U}C!z.1Y(it)&&/\\{\\s*\\[il 5h\\]\\s*\\}/.6Z(67(it))};z.c7=B(M,4W){A 8a={};R(A x in 4W){if((V 8a[x]=="1k")||(8a[x]!=4W[x])){M[x]=4W[x]}}if(z.1l){A p=4W.2i;if((V(p)=="B")&&(p!=M.2i)&&(p!=8a.2i)&&(p!="\\pC 2i() {\\n [il 5h]\\n}\\n")){M.2i=4W.2i}}C M};z.1x=B(M,pB){R(A i=1,l=P.G;i2){C z.ig.14(z,P)}if(!3k){3k=2z;2z=L}if(z.1R(3k)){2z=2z||z.1W;if(!2z[3k]){2m(["z.2p: ie[\\"",3k,"\\"] is L (ie=\\"",2z,"\\")"].22(""))}C B(){C 2z[3k].14(2z,P||[])}}I{C(!2z?3k:B(){C 3k.14(2z,P||[])})}};z.6j=B(M,c3){B c4(){};c4.1C=M;A c2=S c4();if(c3){z.1x(c2,c3)}C c2};z.7X=B(pz){A Q=[L];C z.2p.14(z,Q.3U(z.4d(P)))};z.4d=B(M,ic){A Q=[];R(A x=ic||0;x3)){z.ia("z.2r: R 9P \'"+6l+"\' py pw B as \'1P\' pv pu of as a pt i3.","","1.0");A c=3j;3j=P[3]||{};3j.1P=c}A dd=P.2O,4V=L;if(z.2l(4p)){4V=4p;4p=4V.3a()}if(4V){R(A i=0,m;i<4V.G;i++){m=4V[i];if(!m){2m("ps #"+i+" 4F pr of "+6l+" is L. pq\'s pp a po pl is 3O 6m.")}4p=dd.6j(4p,m)}}A i9=(3j||0).1P,6k=dd.6j(4p),fn;R(A i in 3j){if(z.1Y(fn=3j[i])&&(!0[i])){fn.i4=i}}z.4M(6k,{4o:6l,bY:i9,bZ:L},3j||0);6k.1C.1P=6k;C z.88(6l,6k)};z.1x(z.2r,{6j:B(c0,i8){A bp=(c0||0).1C,mp=(i8||0).1C;A 2S=z.2r.i7();z.1x(2S,{84:bp,1x:mp});if(c0){2S.1C=z.6j(bp)}z.4M(2S,z.2r.i6,mp||0,{bY:L});2S.1C.1P=2S;2S.1C.4o=(bp||0).4o+"pk"+(mp||0).4o;z.88(2S.1C.4o,2S);C 2S},i7:B(){C B(){D.i5(P)}},i6:{i5:B(86){A c=86.2O,s=c.84,ct=s&&s.1P,m=c.1x,87=m&&m.1P,a=86,ii,fn;if(a[0]){if((fn=a[0]["bZ"])){a=fn.14(D,a)||a}}if(fn=c.1C.bZ){a=fn.14(D,a)||a}if(ct&&ct.14){ct.14(D,a)}if(87&&87.14){87.14(D,a)}if(ii=c.1C.bY){ii.14(D,86)}},bX:B(85){A c=D.1P,p,m;1s(c){p=c.84;m=c.1x;if(m==85||(m 1N 85.1P)){C p}if(m&&(m=m.bX(85))){C m}c=p&&p.1P}},6h:B(83,82,bW,6i){A p=bW,c,m,f;do{c=p.1P;m=c.1x;if(m&&(m=D.6h(83,82,m,6i))){C m}if((f=p[83])&&(6i==(f==82))){C p}p=c.84}1s(p);C!6i&&(p=D.bX(bW))&&D.6h(83,82,p,6i)},bU:B(2R,4U,bV){A a=P;if(!z.1R(a[0])){bV=4U;4U=2R;2R=4U.2O.i4}A c=4U.2O,p=D.1P.1C,a=bV||4U,fn,mp;if(D[2R]!=c||p[2R]==c){mp=D.6h(2R,c,p,K);if(!mp){2m(D.4o+": 1p i3 (\\""+2R+"\\") 4F bU pj 1f 2O (2r.js)")}p=D.6h(2R,c,mp,U)}fn=p&&p[2R];if(!fn){1z.1K(mp.4o+": no bU \\""+2R+"\\" ph pg (2r.js)");C}C fn.14(D,a)}}})}if(!z.1h["z.X.2c"]){z.1h["z.X.2c"]=K;z.1Q("z.X.2c");z.3i={i2:B(){C B(){A ap=4e.1C,c=P.2O,ls=c.2b,t=c.5V;A r=t&&t.14(D,P);R(A i in ls){if(!(i in ap)){ls[i].14(D,P)}}C r}},2P:B(6g,bT,i1){6g=6g||z.1W;A f=6g[bT];if(!f||!f.2b){A d=z.3i.i2();d.5V=f;d.2b=[];f=6g[bT]=d}C f.2b.Y(i1)},3J:B(i0,hZ,bS){A f=(i0||z.1W)[hZ];if(f&&f.2b&&bS--){63 f.2b[bS]}}};z.2c=B(M,pd,pc,pa,p9){A a=P,F=[],i=0;F.Y(z.1R(a[0])?L:a[i++],a[i++]);A a1=a[i+1];F.Y(z.1R(a1)||z.1Y(a1)?a[i++]:L,a[i++]);R(A l=a.G;i2){6e=z.7X(6e,P,2)}C D.5k(6e,6e)},ef:B(cb,4T){A 7Y=z.2p(cb,4T);if(P.G>2){7Y=z.7X(7Y,P,2)}C D.5k(7Y,L)},ed:B(cb,4T){A 7W=z.2p(cb,4T);if(P.G>2){7W=z.7X(7W,P,2)}C D.5k(L,7W)},5k:B(cb,eb){D.bM.Y([cb,eb]);if(D.2y>=0){D.7U()}C D},7U:B(){A bL=D.bM;A 4n=D.2y;A 1v=D.4R[4n];A 4S=D;A cb=L;1s((bL.G>0)&&(D.3M==0)){A f=bL.3a()[4n];if(!f){6c}1u{1v=f(1v);4n=((1v 1N 1O)?1:0);if(1v 1N z.30){cb=B(1v){4S.7V(1v);4S.3M--;if((4S.3M==0)&&(4S.2y>=0)){4S.7U()}};D.3M++}}1y(1G){1z.1K(1G);4n=1;1v=1G}}D.2y=4n;D.4R[4n]=1v;if((cb)&&(D.3M)){1v.9e(cb)}}})}if(!z.1h["z.X.2e"]){z.1h["z.X.2e"]=K;z.1Q("z.X.2e");z.5m=B(2e){1u{C 3u("("+2e+")")}1y(e){1z.1K(e);C 2e}};z.bK=B(2H){C("\\""+2H.2f(/(["\\\\])/g,"\\\\$1")+"\\"").2f(/[\\f]/g,"\\\\f").2f(/[\\b]/g,"\\\\b").2f(/[\\n]/g,"\\\\n").2f(/[\\t]/g,"\\\\t").2f(/[\\r]/g,"\\\\r")};z.hM="\\t";z.eq=B(it,4l,4P){4P=4P||"";A 4k=(4l?4P+z.hM:"");A 6b=(4l?"\\n":"");A 4Q=V(it);if(4Q=="1k"){C"1k"}I{if((4Q=="4J")||(4Q=="p1")){C it+""}I{if(it===L){C"L"}}}if(4Q=="3c"){C z.bK(it)}A 6d=P.2O;A 4m;if(V it.hL=="B"){4m=it.hL();if(it!==4m){C 6d(4m,4l,4k)}}if(V it.2e=="B"){4m=it.2e();if(it!==4m){C 6d(4m,4l,4k)}}if(z.2l(it)){A 1v=[];R(A i=0;i>=7R;t[x]=7R==4?17*c:c});t.a=1;C t};z.7P=B(a,M){A t=M||S z.1J();t.bz(2V(a[0]),2V(a[1]),2V(a[2]),2V(a[3]));if(2L(t.a)){t.a=1}C t.7Q()};z.hq=B(2H,M){A a=z.1J.hp[2H];C a&&z.7P(a,M)||z.ho(2H,M)||z.hn(2H,M)}}if(!z.1h["z.X"]){z.1h["z.X"]=K;z.1Q("z.X")}if(!z.1h["z.X.5Z"]){z.1h["z.X.5Z"]=K;z.1Q("z.X.5Z");(B(){A 1j=z.b2={2P:B(E,68,fp){if(!E){C}68=1j.4O(68);fp=1j.7G(68,fp);E.66(68,fp,U);C fp},3J:B(E,hm,hl){(E)&&(E.oF(1j.4O(hm),hl,U))},4O:B(1p){C(1p.2w(0,2)=="on"?1p.2w(2):1p)},7G:B(1p,fp){C(1p!="4b"?fp:B(e){C fp.2d(D,1j.4i(e,D))})},4i:B(H,oE){4w(H.Z){2X"4b":1j.7K(H);3f}C H},7K:B(H){H.oD=(H.3h?67.oC(H.3h):"")}};z.oB=B(H,hk){C 1j.4i(H,hk)};z.gY=B(H){H.7J();H.7I()};A 7O=z.3i;z.by=B(M,bx,hh,hg,hi){A hj=M&&(M.2t||M.oA||M.66);A bw=!hj?0:(!hi?1:2),l=[z.3i,1j,7O][bw];A h=l.2P(M,bx,z.2p(hh,hg));C[M,bx,h,bw]};z.bv=B(M,he,hd,hf){([z.3i,1j,7O][hf]).3J(M,he,hd)};z.5W={oz:8,gV:9,oy:12,ox:13,ow:16,ov:17,ou:18,gG:19,ot:20,os:27,or:32,b5:33,b4:34,gE:35,gF:36,b7:37,b9:38,b6:39,b8:40,gD:45,8S:46,oq:47,oo:91,om:92,ol:93,oj:96,oi:97,oh:98,og:99,oe:6D,od:oc,ob:oa,o9:o8,o7:o6,o5:o4,o3:bi,o2:o1,o0:nZ,nY:nX,nW:nV,nU:bk,gS:nT,gR:nS,gQ:nR,gP:nQ,gO:nP,gN:nO,gM:nN,gL:nM,gK:nL,gJ:nK,gI:nJ,gH:nI,nH:nG,nF:nE,nD:nC,gB:nB,gC:nA};if(z.1l){bf=B(e,5h){1u{C(e.3I=5h)}1y(e){C 0}};A 61=z.3i;if(!1o.nz){7O=61=z.gy={b3:[],2P:B(64,bu,hc){64=64||z.1W;A f=64[bu];if(!f||!f.2b){A d=z.gz();d.5V=f&&(7M.Y(f)-1);d.2b=[];f=64[bu]=d}C f.2b.Y(7M.Y(hc)-1)},3J:B(hb,ha,7N){A f=(hb||z.1W)[ha],l=f&&f.2b;if(f&&l&&7N--){63 7M[l[7N]];63 l[7N]}}};A 7M=61.b3}z.1x(1j,{2P:B(E,62,fp){if(!E){C}62=1j.4O(62);if(62=="h3"){A kd=E.bs;if(!kd||!kd.2b||!kd.h9){1j.2P(E,"bs",1j.h4);E.bs.h9=K}}C 61.2P(E,62,1j.7G(fp))},3J:B(E,h8,h7){61.3J(E,1j.4O(h8),h7)},4O:B(7L){C(7L.2w(0,2)!="on"?"on"+7L:7L)},ny:B(){},4i:B(H,4N){if(!H){A w=(4N)&&((4N.aD||4N.1q||4N).nx)||26;H=w.5Z}if(!H){C(H)}H.5V=H.br;H.bh=(4N||H.br);H.nw=H.nv;H.nu=H.nr;A bq=H.br,1e=(bq&&bq.aD)||1q;A bn=((z.1l<6)||(1e["aX"]=="aW"))?1e.3E:1e.5K;A bm=z.aB();H.nq=H.np+z.aH(bn.5I||0)-bm.x;H.nn=H.nm+(bn.5G||0)-bm.y;if(H.Z=="fk"){H.h6=H.nl}if(H.Z=="fj"){H.h6=H.nk}H.7I=1j.bc;H.7J=1j.ba;C 1j.h5(H)},h5:B(H){4w(H.Z){2X"4b":A c=("3h"in H?H.3h:H.3I);if(c==10){c=0;H.3I=13}I{if(c==13||c==27){c=0}I{if(c==3){c=99}}}H.3h=c;1j.7K(H);3f}C H},gZ:{bi:42,bk:47,h2:59,nj:43,ni:44,nh:45,ng:46,nf:47,60:96,h1:91,nb:92,na:93,h0:39},h4:B(H){A kp=H.bh.h3;if(!kp||!kp.2b){C}A k=H.3I;A bj=(k!=13)&&(k!=32)&&(k!=27)&&(k<48||k>90)&&(k<96||k>bk)&&(k60)&&(kh0);if(bj||H.5Y){A c=(bj?0:k);if(H.5Y){if(k==3||k==13){C}I{if(c>95&&c=65&&c<=90)){c+=32}I{c=1j.gZ[c]||c}}}}A 2x=1j.7H(H,{Z:"4b",2x:K,3h:c});kp.2d(H.bh,2x);H.bg=2x.bg;H.bd=2x.bd;bf(H,2x.3I)}},bc:B(){D.bg=K},ba:B(){D.n9=D.3I;if(D.5Y){bf(D,0)}D.bd=U}});z.gY=B(H){H=H||26.5Z;1j.bc.2d(H);1j.ba.2d(H)}}1j.7H=B(H,gX){A 2x=z.1x({},H,gX);1j.7K(2x);2x.7J=B(){H.7J()};2x.7I=B(){H.7I()};C 2x};if(z.2M){z.1x(1j,{4i:B(H,n8){4w(H.Z){2X"4b":A c=H.n7;if(c==3){c=99}c=((c<41)&&(!H.5X)?0:c);if((H.5Y)&&(!H.5X)&&(c>=65)&&(c<=90)){c+=32}C 1j.7H(H,{3h:c})}C H}})}if(z.3o){z.1x(1j,{4i:B(H,n6){4w(H.Z){2X"4b":A c=H.3h,s=H.5X,k=H.3I;k=k||gA[H.gW]||0;if(H.gW=="n5"){c=0}I{if((H.5Y)&&(c>0)&&(c<27)){c+=96}I{if(c==z.5W.gU){c=z.5W.gV;s=K}I{c=(c>=32&&c gh",E).1n(B(i){i.1c.7E=i.1c.7E.2f(/gk:[^;]*;/i,"")})}}I{A o="mh(mg="+(7D*6D)+")";E.1c.3T=o}if(E.gj.1M()=="gi"){z.1r("> gh",E).1n(B(i){i.1c.3T=o})}C 7D}:B(E,gg){C E.1c.2W=gg});A 5Q={3n:K,58:K,2g:K,5J:K};A gd=B(E,Z,5P){Z=Z.1M();if(5Q[Z]===K){C z.4g(E,5P)}I{if(5Q[Z]===U){C 5P}I{if((Z.T("mf")>=0)||(Z.T("md")>=0)||(Z.T("3n")>=0)||(Z.T("58")>=0)||(Z.T("5q")>=0)||(Z.T("mc")>=0)||(Z.T("ma")>=0)){5Q[Z]=K;C z.4g(E,5P)}I{5Q[Z]=U;C 5P}}}};z.1c=B(E,5O,aT){A n=z.1D(E),F=P.G,op=(5O=="2W");if(F==3){C op?z.gf(n,aT):n.1c[5O]=aT}if(F==2&&op){C z.ge(n)}A s=z.3F(n);C(F==1)?s:gd(n,5O,s[5O])};z.7A=B(n,gc){A s=gc||1E(n),px=z.4g,l=px(n,s.m9),t=px(n,s.m8);C{l:l,t:t,w:l+px(n,s.m7),h:t+px(n,s.m6)}};z.5N=B(n,gb){A ne="7C",px=z.4g,s=gb||1E(n),bl=(s.m5!=ne?px(n,s.m4):0),bt=(s.m3!=ne?px(n,s.m2):0);C{l:bl,t:bt,w:bl+(s.m1!=ne?px(n,s.m0):0),h:bt+(s.lZ!=ne?px(n,s.lY):0)}};z.aN=B(n,ga){A s=ga||1E(n),p=z.7A(n,s),b=z.5N(n,s);C{l:p.l+b.l,t:p.t+b.t,w:p.w+b.w,h:p.h+b.h}};z.aM=B(n,g9){A s=g9||1E(n),px=z.4g,l=px(n,s.lX),t=px(n,s.lW),r=px(n,s.lV),b=px(n,s.lU);if(z.3o&&(s.ax!="fU")){r=l}C{l:l,t:t,w:l+r,h:t+b}};z.au=B(E,g8){A s=g8||1E(E),me=z.aM(E,s);A l=E.fT-me.l,t=E.fS-me.t;if(z.7B){A aS=2k(s.2g),aR=2k(s.5J);if(!2L(aS)&&!2L(aR)){l=aS,t=aR}I{A p=E.1L;if(p&&p.1c){A aQ=1E(p);if(aQ.lT!="lS"){A be=z.5N(p,aQ);l+=be.l,t+=be.t}}}}I{if(z.2M){A p=E.1L;if(p){A be=z.5N(p);l-=be.l,t-=be.t}}}C{l:l,t:t,w:E.6v+me.w,h:E.8D+me.h}};z.aK=B(E,g7){A s=g7||1E(E),pe=z.7A(E,s),be=z.5N(E,s),w=E.aF,h;if(!w){w=E.6v,h=E.8D}I{h=E.lR,be.w=be.h=0}if(z.2M){pe.l+=be.l;pe.t+=be.t}C{l:pe.l,t:pe.t,w:w-pe.w-be.w,h:h-pe.h-be.h}};z.lQ=B(E,g6){A s=g6||1E(E),pe=z.7A(E,s),cb=z.aK(E,s);C{l:cb.l-pe.l,t:cb.t-pe.t,w:cb.w+pe.w,h:cb.h+pe.h}};z.aL=B(E,l,t,w,h,u){u=u||"px";4G(E.1c){if(!2L(l)){2g=l+u}if(!2L(t)){5J=t+u}if(w>=0){3n=w+u}if(h>=0){58=h+u}}};z.aO=B(E){A n=E.5w;C(z.aP=="g5-3G")||(n=="lP")||(n=="lO")};z.fX=B(E,7z,7y,g4){A bb=z.aO(E);if(bb){A pb=z.aN(E,g4);if(7z>=0){7z+=pb.w}if(7y>=0){7y+=pb.h}}z.aL(E,g3,g3,7z,7y)};z.fY=B(E,g1,g0,5M,5L,g2){A s=g2||z.3F(E);A bb=z.aO(E),pb=bb?fZ:z.aN(E,s),mb=z.aM(E,s);if(5M>=0){5M=2Y.5q(5M-pb.w-mb.w,0)}if(5L>=0){5L=2Y.5q(5L-pb.h-mb.h,0)}z.aL(E,g1,g0,5M,5L)};A fZ={l:0,t:0,w:0,h:0};z.lN=B(E,3G){A n=z.1D(E),s=1E(n),b=3G;C!b?z.au(n,s):z.fY(n,b.l,b.t,b.w,b.h,s)};z.lM=B(E,3G){A n=z.1D(E),s=1E(n),b=3G;C!b?z.aK(n,s):z.fX(n,b.w,b.h,s)};A 5H=B(E,1a){if(!(E=(E||0).1L)){C 0}A 1U,aJ=0,2h=z.3E();1s(E&&E.1c){if(1E(E).ax=="lL"){C 0}1U=E[1a];if(1U){aJ+=1U-0;if(E==2h){3f}}E=E.1L}C aJ};z.fQ=B(){A 2h=z.3E();A 3g=z.1W;A de=z.1e.5K;C{y:(3g.lK||de.5G||2h.5G||0),x:(3g.lJ||z.aH(de.5I)||2h.5I||0)}};z.aG=B(){C V z.aI=="1k"?(z.aI=z.3F(z.3E()).lI=="lH"):z.aI};z.aB=B(){A de=z.1e.5K;if(z.1l>=7){C{x:de.aC().2g,y:de.aC().5J}}I{C{x:z.aG()||26.am==26?de.fW:de.6v-de.aF-de.fW,y:de.lG}}};z.aH=B(aE){if(z.1l&&!z.aG()){A de=z.1e.5K;C aE+de.aF-de.lF}C aE};z.fP=B(E,aw){A ay=E.aD;A J={x:0,y:0};A 7w=U;A db=z.3E();if(z.1l){A aA=E.aC();A az=z.aB();J.x=aA.2g-az.x;J.y=aA.5J-az.y}I{if(ay["fV"]){A bo=ay.fV(E);J.x=bo.x-5H(E,"5I");J.y=bo.y-5H(E,"5G")}I{if(E["fR"]){7w=K;A 7x;if(z.3o&&(1E(E).ax=="fU")&&(E.1L==db)){7x=db}I{7x=db.1L}if(E.1L!=db){A nd=E;if(z.2M){nd=db}J.x-=5H(nd,"5I");J.y-=5H(nd,"5G")}A 4f=E;do{A n=4f["fT"];if(!z.2M||n>0){J.x+=2L(n)?0:n}A m=4f["fS"];J.y+=2L(m)?0:m;4f=4f.fR}1s((4f!=7x)&&4f)}I{if(E["x"]&&E["y"]){J.x+=2L(E.x)?0:E.x;J.y+=2L(E.y)?0:E.y}}}}if(7w||aw){A av=z.fQ();A m=7w?(!aw?-1:0):1;J.y+=m*av.y;J.x+=m*av.x}C J};z.af=B(E,fO){A n=z.1D(E),s=1E(n),mb=z.au(n,s);A at=z.fP(n,fO);mb.x=at.x;mb.y=at.y;C mb}})();z.fL=B(E,fN){C((" "+E.3A+" ").T(" "+fN+" ")>=0)};z.7s=B(E,ar){A 7v=E.3A;if((" "+7v+" ").T(" "+ar+" ")<0){E.3A=7v+(7v?" ":"")+ar}};z.7r=B(E,fM){A t=z.7g((" "+E.3A+" ").2f(" "+fM+" "," "));if(E.3A!=t){E.3A=t}};z.lE=B(E,aq,7u){if(V 7u=="1k"){7u=!z.fL(E,aq)}z[7u?"7s":"7r"](E,aq)}}if(!z.1h["z.X.1H"]){z.1h["z.X.1H"]=K;z.1Q("z.X.1H");(B(){A d=z;z.1H=B(){A F=P;if((F.G==1)&&(V F[0]=="4J")){D.G=eK(F[0])}I{if(F.G){d.1n(F,B(i){D.Y(i)},D)}}};z.1H.1C=S 4e;if(d.1l){A fK=B(al){C("A a2 = am."+al+"; "+"A ap = 4e.1C; "+"A ao = a2.1C; "+"R(A x in ao){ ap[x] = ao[x]; } "+"am."+al+" = 4e; ")};A fI=fK("z.1H");A aj=26.lD();aj.1q.fJ(""+fI+"");aj.lC(1,1,1,1)}z.4M(z.1H,{T:B(fH,fG){C d.T(D,fH,fG)},31:B(lB,lA){A aa=d.4d(P);aa.ae(D);C d.31.14(d,aa)},ah:B(fF,fE){C d.ah(D,fF,fE)},ag:B(fD,fC){C d.ag(D,fD,fC)},1n:B(fB,fA){d.1n(D,fB,fA);C D},23:B(7t,M){C d.23(D,7t,M,d.1H)},af:B(){C d.23(D,d.af)},1c:B(lz,ly){A aa=d.4d(P);aa.ae(D[0]);A s=d.1c.14(d,aa);C(P.G>1)?D:s},lx:B(lw,lv){A aa=d.4d(P);aa.ae(L);A s=D.23(B(i){aa[0]=i;C d.1c.14(d,aa)});C(P.G>1)?D:s},7s:B(fz){C D.1n(B(i){z.7s(i,fz)})},7r:B(fy){C D.1n(B(i){z.7r(i,fy)})},5E:B(fw,7q){A 1m=d.1r(fw)[0];7q=7q||"72";R(A x=0;x=0){if(i[x]<1d){1d=i[x]}}}C(1d<0)?ql:1d};A 6X=B(7l){A i=2I(7l);if(i[0]!=-1){C 7l.21(i[0]+1,a0(7l,1))}I{C""}};A 5r=B(7k){A 5D;A i=2I(7k);if((i[0]==0)||(i[1]==0)){5D=0}I{5D=a0(7k,0)}C((5D>0)?7k.3b(0,5D).1M():"*")};A fg=B(Q){A J=-1;R(A x=0;x=0){if((1S>J)||(J==-1)){J=1S}}}C J};A 9H=B(7i){A i=2I(7i);if(-1==i[1]){C""}A di=i[1]+1;A 7j=fg(i.2w(2));if(di<7j){C 7i.21(di,7j)}I{if(-1==7j){C 7i.3b(di)}I{C""}}};A f3=[{1i:"|=",1f:B(15,fe){C"[5z(3U(\' \',@"+15+",\' \'), \' "+fe+"-\')]"}},{1i:"~=",1f:B(15,fd){C"[5z(3U(\' \',@"+15+",\' \'), \' "+fd+" \')]"}},{1i:"^=",1f:B(15,fb){C"[li-4G(@"+15+", \'"+fb+"\')]"}},{1i:"*=",1f:B(15,fa){C"[5z(@"+15+", \'"+fa+"\')]"}},{1i:"$=",1f:B(15,9Z){C"[21(@"+15+", 3c-G(@"+15+")-"+(9Z.G-1)+")=\'"+9Z+"\']"}},{1i:"!=",1f:B(15,f9){C"[3O(@"+15+"=\'"+f9+"\')]"}},{1i:"=",1f:B(15,f8){C"[@"+15+"=\'"+f8+"\']"}}];A 9C=B(9Y,3Z,f7,f6){A 49;A i=2I(3Z);if(i[2]>=0){A 4L=3Z.T("]",i[2]);A 29=3Z.21(i[2]+1,4L);1s(29&&29.G){if(29.2s(0)=="@"){29=29.2w(1)}49=L;R(A x=0;x<9Y.G;x++){A 1S=9Y[x];A 7h=29.T(1S.1i);if(7h>=0){A 15=29.21(0,7h);A 4a=29.21(7h+1S.1i.G);if((4a.2s(0)=="\\"")||(4a.2s(0)=="\'")){4a=4a.21(1,4a.G-1)}49=1S.1f(d.7g(15),d.7g(4a));3f}}if((!49)&&(29.G)){49=f7(29)}if(49){f6(49)}29=L;A 7f=3Z.T("[",4L);if(0<=7f){4L=3Z.T("]",7f);if(0<=4L){29=3Z.21(7f+1,4L)}}}}};A f0=B(f5){A 4K=".";A 7e=f5.1A(" ");1s(7e.G){A 2K=7e.3a();A 7d;if(2K==">"){7d="/";2K=7e.3a()}I{7d="//"}A f4=5r(2K);4K+=7d+f4;A id=6X(2K);if(id.G){4K+="[@id=\'"+id+"\'][1]"}A cn=9H(2K);if(cn.G){A 9X=" ";if(cn.2s(cn.G-1)=="*"){9X="";cn=cn.3b(0,cn.G-1)}4K+="[5z(3U(\' \',@9P,\' \'), \' "+cn+9X+"\')]"}9C(f3,2K,B(f2){C"[@"+f2+"]"},B(f1){4K+=f1})}C 4K};A 7a={};A eC=B(28){if(7a[28]){C 7a[28]}A 1e=d.1e;A 9W=f0(28);A 4H=B(9V){A J=[];A 7b;1u{7b=1e.9x(9W,9V,L,lh.lg,L)}1y(e){1z.1K("lf in le:",9W,"lc:",9V);1z.1K(e)}A 7c=7b.eZ();1s(7c){J.Y(7c);7c=7b.eZ()}C J};C 7a[28]=4H};A 5x={};A 9B={};A 3y=B(79,78){if(!79){C 78}if(!78){C 79}C B(){C 79.14(26,P)&&78.14(26,P)}};A 75=B(9U,3Y,5B,2J){A 2v=2J+1;A 76=(3Y.G==2v);A 2K=3Y[2J];if(2K==">"){A 77=9U.3W;if(!77.G){C}2v++;76=(3Y.G==2v);A 4H=6O(3Y[2J+1]);R(A x=0,11;x<77.G,11=77[x];x++){if(4H(11)){if(76){5B.Y(11)}I{75(11,3Y,5B,2v)}}}}A 5C=6U(2K)(9U);if(76){1s(5C.G){5B.Y(5C.3a())}}I{1s(5C.G){75(5C.3a(),3Y,5B,2v)}}};A eE=B(9T,eY){A J=[];A x=9T.G-1,11;1s(11=9T[x--]){75(11,eY,J,0)}C J};A 6O=B(3D){if(5x[3D]){C 5x[3D]}A ff=L;A 9S=5r(3D);if(9S!="*"){ff=3y(ff,B(N){C((N.2t==1)&&(9S==N.5w.1M()))})}A 9R=6X(3D);if(9R.G){ff=3y(ff,B(N){C((N.2t==1)&&(N.id==9R))})}if(2Y.5q.14(D,2I(3D).2w(1))>=0){ff=3y(ff,9z(3D))}C 5x[3D]=ff};A 5y=B(E){A pn=E.1L;A 9Q=pn.3W;A 2v=-1;A 3C=pn.5A;if(!3C){C 2v}A ci=E["eW"];A cl=pn["eX"];if(((V cl=="4J")&&(cl!=9Q.G))||(V ci!="4J")){pn["eX"]=9Q.G;A 2J=1;do{if(3C===E){2v=2J}if(3C.2t==1){3C["eW"]=2J;2J++}3C=3C.71}1s(3C)}I{2v=ci}C 2v};A lb=0;A 3X=B(N,15){A 74="";if(15=="9P"){C N.3A||74}if(15=="R"){C N.la||74}C N.5t(15,2)||74};A eH=[{1i:"|=",1f:B(15,9O){A eV=" "+9O+"-";C B(N){A ea=" "+(N.5t(15,2)||"");C((ea==9O)||(ea.T(eV)==0))}}},{1i:"^=",1f:B(15,eU){C B(N){C(3X(N,15).T(eU)==0)}}},{1i:"*=",1f:B(15,eT){C B(N){C(3X(N,15).T(eT)>=0)}}},{1i:"~=",1f:B(15,eS){A 9N=" "+eS+" ";C B(N){A ea=" "+3X(N,15)+" ";C(ea.T(9N)>=0)}}},{1i:"$=",1f:B(15,73){A 9N=" "+73;C B(N){A ea=" "+3X(N,15);C(ea.31(73)==(ea.G-73.G))}}},{1i:"!=",1f:B(15,eR){C B(N){C(3X(N,15)!=eR)}}},{1i:"=",1f:B(15,eQ){C B(N){C(3X(N,15)==eQ)}}}];A 9E=[{1i:"9M-9K",1f:B(1p,l9){C B(N){if(N.2t!=1){C U}A fc=N.eP;1s(fc&&(fc.2t!=1)){fc=fc.eP}C(!fc)}}},{1i:"72-9K",1f:B(1p,l8){C B(N){if(N.2t!=1){C U}A nc=N.71;1s(nc&&(nc.2t!=1)){nc=nc.71}C(!nc)}}},{1i:"l7",1f:B(1p,l6){C B(N){A cn=N.3W;A eO=N.3W.G;R(A x=eO-1;x>=0;x--){A nt=cn[x].2t;if((nt==1)||(nt==3)){C U}}C K}}},{1i:"5z",1f:B(1p,eN){C B(N){C(N.9L.T(eN)>=0)}}},{1i:"3O",1f:B(1p,eM){A eL=6O(eM);C B(N){C(!eL(N))}}},{1i:"l5-9K",1f:B(1p,2u){A pi=eK;if(2u=="l4"){C B(N){C(((5y(N))%2)==1)}}I{if((2u=="2n")||(2u=="l3")){C B(N){C((5y(N)%2)==0)}}I{if(2u.T("l2+")==0){A 70=pi(2u.3b(3));C B(N){C(N.1L.3W[70-1]===N)}}I{if((2u.T("n+")>0)&&(2u.G>3)){A 9J=2u.1A("n+",2);A eJ=pi(9J[0]);A 2J=pi(9J[1]);C B(N){C((5y(N)%eJ)==2J)}}I{if(2u.T("n")==-1){A 70=pi(2u);C B(N){C(5y(N)==70)}}}}}}}}];A 9z=B(3e){A 9I=(9B[3e]||5x[3e]);if(9I){C 9I}A ff=L;A i=2I(3e);if(i[0]>=0){A 24=5r(3e);if(24!="*"){ff=3y(ff,B(N){C(N.5w.1M()==24)})}}A 5u;A 3B=9H(3e);if(3B.G){A 9F=3B.2s(3B.G-1)=="*";if(9F){3B=3B.3b(0,3B.G-1)}A re=S 9G("(?:^|\\\\s)"+3B+(9F?".*":"")+"(?:\\\\s|$)");ff=3y(ff,B(N){C re.6Z(N.3A)})}if(i[3]>=0){A 3z=3e.3b(i[3]+1);A 9D="";A 5v=3z.T("(");A 6Y=3z.31(")");if((0<=5v)&&(0<=6Y)&&(6Y>5v)){9D=3z.21(5v+1,6Y);3z=3z.3b(0,5v)}5u=L;R(A x=0;x<9E.G;x++){A 1S=9E[x];if(1S.1i==3z){5u=1S.1f(3z,9D);3f}}if(5u){ff=3y(ff,5u)}}A eG=(d.1l)?B(5s){A eI=5s.1M();C B(N){C N[5s]||N[eI]}}:B(5s){C B(N){C(N&&N.5t&&N.l1(5s))}};9C(eH,3e,eG,B(eF){ff=3y(ff,eF)});if(!ff){ff=B(){C K}}C 9B[3e]=ff};A 6W={};A 6U=B(3d,1B){A 9A=6W[3d];if(9A){C 9A}A i=2I(3d);A id=6X(3d);if(i[0]==0){C 6W[3d]=B(1B){C[d.1D(id)]}}A 9y=9z(3d);A 5p;if(i[0]>=0){5p=B(1B){A 11=d.1D(id);if(9y(11)){C[11]}}}I{A 3V;A 24=5r(3d);if(2Y.5q.14(D,2I(3d))==-1){5p=B(1B){A J=[];A 11,x=0,3V=1B.4I(24);1s(11=3V[x++]){J.Y(11)}C J}}I{5p=B(1B){A J=[];A 11,x=0,3V=1B.4I(24);1s(11=3V[x++]){if(9y(11)){J.Y(11)}}C J}}}C 6W[3d]=5p};A l0={};A 5o={">":B(1B){A J=[];A 11,x=0,3V=1B.3W;1s(11=3V[x++]){if(11.2t==1){J.Y(11)}}C J}};A 9w=B(6V){if(0>6V.T(" ")){C 6U(6V)}A eD=B(1B){A 6S=6V.1A(" ");A 6T;if(6S[0]==">"){6T=[1B]}I{6T=6U(6S.3a())(1B)}C eE(6T,6S)};C eD};A 9v=((1q["9x"]&&!d.3o)?B(3x){A 6R=3x.1A(" ");if((1q["9x"])&&(3x.T(":")==-1)&&((K))){if(((6R.G>2)&&(3x.T(">")==-1))||(6R.G>3)||(3x.T("[")>=0)||((1==6R.G)&&(0<=3x.T(".")))){C eC(3x)}}C 9w(3x)}:9w);A ey=B(3w){if(5o[3w]){C 5o[3w]}if(0>3w.T(",")){C 5o[3w]=9v(3w)}I{A eB=3w.1A(/\\s*,\\s*/);A 4H=B(1B){A eA=0;A J=[];A 6Q;1s(6Q=eB[eA++]){J=J.3U(9v(6Q,6Q.T(" "))(1B))}C J};C 5o[3w]=4H}};A 5n=0;A ez=B(Q){A J=S d.1H();if(!Q){C J}if(Q[0]){J.Y(Q[0])}if(Q.G<2){C J}5n++;Q[0]["9u"]=5n;R(A x=1,11;11=Q[x];x++){if(Q[x]["9u"]!=5n){J.Y(11)}11["9u"]=5n}C J};d.1r=B(6P,1B){if(V 6P!="3c"){C S d.1H(6P)}if(V 1B=="3c"){1B=d.1D(1B)}C ez(ey(6P)(1B||d.1e))};d.9t=B(ex,9s){A 9r=S d.1H();A ff=(9s)?6O(9s):B(){C K};R(A x=0,11;11=ex[x];x++){if(ff(11)){9r.Y(11)}}C 9r}})()}if(!z.1h["z.X.1b"]){z.1h["z.X.1b"]=K;z.1Q("z.X.1b");z.6K=B(ew){A J={};A iq="kZ[Z!=9q][Z!=kY][Z!=et][Z!=kX][Z!=kW], kV, kU";z.1r(iq,ew).3T(B(E){C(!E.kT)}).1n(B(1m){A 3v=1m.1p;A Z=(1m.Z||"").1M();if((Z=="kS")||(Z=="kR")){if(1m.kQ){J[3v]=1m.1Z}}I{if(1m.kP){A ev=J[3v]=[];z.1r("kO[kN]",1m).1n(B(eu){ev.Y(eu.1Z)})}I{J[3v]=1m.1Z;if(Z=="et"){J[3v+".x"]=J[3v+".y"]=J[3v].x=J[3v].y=0}}}});C J};z.9h=B(23){A ec=kM;A J="";A es={};R(A x in 23){if(23[x]!=es[x]){if(z.2l(23[x])){R(A y=0;y<23[x].G;y++){J+=ec(x)+"="+ec(23[x][y])+"&"}}I{J+=ec(x)+"="+ec(23[x])+"&"}}}if((J.G)&&(J.2s(J.G-1)=="&")){J=J.3b(0,J.G-1)}C J};z.kL=B(er){C z.9h(z.6K(er))};z.kK=B(ep){C z.eq(z.6K(ep))};z.kJ=B(2H){A J={};A qp=2H.1A("&");A dc=kI;z.1n(qp,B(1m){if(1m.G){A 9p=1m.1A("=");A 1p=dc(9p.3a());A 1U=dc(9p.22("="));if(z.1R(J[1p])){J[1p]=[J[1p]]}if(z.2l(J[1p])){J[1p].Y(1U)}I{J[1p]=1U}}});C J};z.e1=U;z.e6={"9g":B(1b){C 1b.2G},"2e":B(1b){if(!1o.eo){1z.1K("kH kG kF a kE of 9g/2e-6M-9m"+" 4F kD kC kB kA 4G en kz"+" (ky 1o.eo=K 4F kx kw D kv)")}C z.5m(1b.2G)},"2e-6M-ku":B(1b){A 6N=1b.2G;A 9o=6N.T("/*");A 9n=6N.31("*/");if((9o==-1)||(9n==-1)){C z.5m(1b.2G)}C z.5m(6N.21(9o+2,9n))},"2e-6M-9m":B(1b){A 6L=1b.2G;A 9l=6L.T("/*");A 9k=6L.31("*/");if((9l==-1)||(9k==-1)){1z.1K("kt en ks\'t 6M 9m!");C""}C z.5m(6L.21(9l+2,9k))},"kr":B(1b){C z.3u(1b.2G)},"kq":B(1b){if(z.1l&&!1b.el){z.1n(["ko","em","kn","km"],B(i){1u{A 1e=S 9j(kl[i]+".kk");1e.kj=U;1e.ki(1b.2G);C 1e}1y(e){}})}I{C 1b.el}}};(B(){z.e5=B(F,ej,ei,eh){A 2F={};2F.F=F;A 6J=L;if(F.3R){A 3R=z.1D(F.3R);A 9i=3R.kh("kg");2F.2E=F.2E||(9i?9i.1Z:L);6J=z.6K(3R)}I{2F.2E=F.2E}A 5l=[{}];if(6J){5l.Y(6J)}if(F.5g){5l.Y(F.5g)}if(F.ek){5l.Y({"z.ek":S 5d().8O()})}2F.1r=z.9h(z.1x.14(L,5l));2F.9d=F.9d||"9g";A d=S z.30(ej);d.5k(ei,B(eg){C eh(eg,d)});A ld=F.4E;if(ld&&z.1Y(ld)){d.ef(B(ee){C ld.2d(F,ee,2F)})}A 1G=F.9f;if(1G&&z.1Y(1G)){d.ed(B(e9){C 1G.2d(F,e9,2F)})}A 6I=F.kf;if(6I&&z.1Y(6I)){d.9e(B(e8){C 6I.2d(F,e8,2F)})}d.1F=2F;C d};A e4=B(O){O.e0=K;A 1b=O.1F.1b;if(V 1b.e7=="B"){1b.e7()}};A e3=B(O){C z.e6[O.1F.9d](O.1F.1b)};A e2=B(9c,O){1z.1K(9c);C 9c};A 3Q=B(F){A O=z.e5(F,e4,e3,e2);O.1F.1b=z.9b(O.1F.F);C O};A 5j=L;A 3t=[];A 94=B(){A dZ=(S 5d()).dU();if(!z.e1){z.1n(3t,B(4D,6H){if(!4D){C}A O=4D.O;1u{if(!O||O.e0||!4D.dT(O)){3t.3S(6H,1);C}if(4D.dR(O)){3t.3S(6H,1);4D.dP(O)}I{if(O.9a){if(O.9a+(O.1F.F.6G||0)0){5c(z.2p(D,B(){D.5b(L,8R)}),d);C D}D.4A=S 5d().8O();if(D.2Z){D.4A-=D.8Q*D.2o}D.8N=D.4A+D.8Q;D.2D=K;D.2Z=U;A 8P=D.2C.4x(D.2o);if(!D.2o){if(!D.4y){D.4y=D.4z}D.3q("dt",[8P])}D.3q("ds",[8P]);D.8M();C D},jS:B(){5e(D.3r);if(!D.2D){C D}D.2Z=K;D.3q("dr",[D.2C.4x(D.2o)]);C D},jR:B(dq,dp){5e(D.3r);D.2D=D.2Z=K;D.2o=dq*6D;if(dp){D.5b()}C D},jQ:B(dn){if(!D.3r){C}5e(D.3r);if(dn){D.2o=1}D.3q("dm",[D.2C.4x(D.2o)]);D.2D=D.2Z=U;C D},3N:B(){if(D.2D){C D.2Z?"3M":"jP"}C"jO"},8M:B(){5e(D.3r);if(D.2D){A dl=S 5d().8O();A 2q=(dl-D.4A)/(D.8N-D.4A);if(2q>=1){2q=1}D.2o=2q;if(D.5a){2q=D.5a(2q)}D.3q("8B",[D.2C.4x(2q)]);if(2q<1){D.3r=5c(z.2p(D,"8M"),D.dj)}I{D.2D=U;if(D.4z>0){D.4z--;D.5b(L,K)}I{if(D.4z==-1){D.5b(L,K)}I{if(D.4y){D.4z=D.4y;D.4y=0}}}D.2o=0;D.3q("dh")}}C D}});(B(){A df=B(E){if(z.1l){A ns=E.1c;if(!ns.8L.G&&z.1c(E,"8L")=="dg"){ns.8L="1"}if(!ns.3n.G&&z.1c(E,"3n")=="8K"){ns.3n="8K"}}};z.6C=B(F){if(V F.1d=="1k"){2m S 1O("z.6C jN an 1d 1Z")}F.E=z.1D(F.E);A 3p=z.1x({6w:{}},F);A 8J=(3p.6w.2W={});8J.1w=(V 3p.1w=="1k")?B(){C 2V(z.1c(3p.E,"2W"))}:3p.1w;8J.1d=3p.1d;A 2U=z.6y(3p);z.2c(2U,"6x",L,B(){df(3p.E)});C 2U};z.8I=B(F){C z.6C(z.1x({1d:1},F))};z.8H=B(F){C z.6C(z.1x({1d:0},F))};if(z.6B&&!z.3o){z.8E=B(n){C 2k("0.5")+((2Y.da((n+2k("1.5"))*2Y.d9))/2)}}I{z.8E=B(n){C 0.5+((2Y.da((n+1.5)*2Y.d9))/2)}}A d4=B(6A){D.8G=6A;R(A p in 6A){A 1a=6A[p];if(1a.1w 1N z.1J){1a.d7=S z.1J()}}D.4x=B(r){A J={};R(A p in D.8G){A 1a=D.8G[p];A 6z=L;if(1a.1w 1N z.1J){6z=z.d8(1a.1w,1a.1d,r,1a.d7).8F()}I{if(!z.2l(1a.1w)){6z=((1a.1d-1a.1w)*r)+1a.1w+(p!="2W"?1a.jM||"px":"")}}J[p]=6z}C J}};z.6y=B(F){F.E=z.1D(F.E);if(!F.5a){F.5a=z.8E}A 2U=S z.d6(F);z.2c(2U,"6x",2U,B(){A pm={};R(A p in D.6w){A 1a=pm[p]=z.1x({},D.6w[p]);if(z.1Y(1a.1w)){1a.1w=1a.1w()}if(z.1Y(1a.1d)){1a.1d=1a.1d()}A d5=(p.1M().T("jL")>=0);B 8C(E,p){4w(p){2X"58":C E.8D;2X"3n":C E.6v}A v=z.1c(E,p);C(p=="2W")?2V(v):2k(v)};if(V 1a.1d=="1k"){1a.1d=8C(D.E,p)}I{if(V 1a.1w=="1k"){1a.1w=8C(D.E,p)}}if(d5){1a.1w=S z.1J(1a.1w);1a.1d=S z.1J(1a.1d)}I{1a.1w=(p=="2W")?2V(1a.1w):2k(1a.1w)}}D.2C=S d4(pm)});z.2c(2U,"8B",2U,B(8A){R(A s in 8A){z.1c(D.E,s,8A[s])}});C 2U}})()}',62,1711,'|||||||||||||||||||||||||||||||||||dojo|var|function|return|this|node|args|length|evt|else|ret|true|null|obj|elem|dfd|arguments|arr|for|new|indexOf|false|typeof||_base|push|type||te|||apply|attr|||||prop|xhr|style|end|doc|match|uri|_hasResource|key|del|undefined|isIE|item|forEach|djConfig|name|document|query|while|_66|try|res|start|mixin|catch|console|split|root|prototype|byId|gcs|ioArgs|err|NodeList|_p|Color|debug|parentNode|toLowerCase|instanceof|Error|constructor|provide|isString|ta|255|val|_a|global|_69|isFunction|value||substring|join|map|tn||window||path|_343|_220|_listeners|connect|call|json|replace|left|_b|toString|128|parseFloat|isArray|throw||_percent|hitch|step|declare|charAt|nodeType|_3c3|nidx|slice|faux|fired|_c4|_7e|loc|curve|_active|url|_44c|responseText|str|_312|idx|tqp|isNaN|isOpera|_22d|callee|add|_18b|_f8|_e2|_41|anim|Number|opacity|case|Math|_paused|Deferred|lastIndexOf|||||||||shift|substr|string|_3e7|_3ce|break|_w|charCode|_listener|_d5|_c5|authority|_49|width|isSafari|_49e|fire|_timer|_47b|_465|eval|_in|_40c|_409|_362|_3d9|className|_3d5|_386|_37a|body|getComputedStyle|box|_221|keyCode|remove|_8d|_46|paused|status|not|_478|_461|form|splice|filter|concat|tret|childNodes|_38b|_367|_33d||||||||||_340|_348|keypress|appendChild|_toArray|Array|_2b0|_toPixelValue|ref|_fixEvent|_19f|_14c|_14a|_150|_141|declaredClass|_d4|_99|_Url|_83|scheme|_67|_3d|switch|getValue|_startRepeatCount|repeat|_startTime|_47e|cancel|tif|load|to|with|tf|getElementsByTagName|number|_34c|_342|extend|_1e3|_normalizeEventName|_14b|_14e|results|self|cbfn|_f9|_d8|_b2|src|_88|dav||baseUrl|fragment|_loadedModules|_44|_43|_loaders|mll|height||easing|play|setTimeout|Date|clearTimeout|hdr|content|code|errback|_464|addCallbacks|_450|fromJson|_413|_3fc|_3ee|max|_31e|cond|getAttribute|_3d4|obi|tagName|_360|_381|contains|firstChild|_368|_372|_320|place|_2fa|scrollTop|_299|scrollLeft|top|documentElement|_288|_287|_getBorderExtents|_23f|_23d|_239|_218|_216|_211|eles|target|keys|shiftKey|ctrlKey|event|192|iel|_1db|delete|_1cf||addEventListener|String|_1af|_157|array|_14d|continue|_14f|_137|_11f|_106|_findMethod|has|_delegate|_dc|_d3|loaded|_9a|_loadInit|_inFlightCount|getObject|tv|_4f|_postLoad|_2d|offsetWidth|properties|beforeBegin|animateProperty|_4ad|_4a6|isKhtml|_fade|100|headers|readyState|timeout|_469|_457|_44d|formToObject|_441|comment|_43d|_36f|_419|tp|_40a|_406|_407|_373|_403|_3e6|_31b|cbi|test|_3c7|nextSibling|last|_3a1|_38e|_365|_36b|ecn|_364|_363|_356|_35e|_35f|_34f|_34d|_349|trim|tci|_328|_32b|_31f|_31c|_anim|_300|_2ff|_2f5|_2e7|removeClass|addClass|func|_2c4|cls|_2a9|_2ae|_280|_27f|_getPadExtents|isMoz|none|_233|cssText|_214|_fixCallback|_synthesizeEvent|stopPropagation|preventDefault|_setKeyChar|_1e1|ieh|_1d7|_1be|colorFromArray|sanitize|bits|rgb|_156|_fire|_resback|_13d|partial|_13a|silentlyCancelled|_topics|_127|_f1|_f0|superclass|_ec|_e3|mct|setObject|_bf|_b3|object|require|_92|_khtmlTimer|location|XMLHTTP|locale|dua|_71|_modulePrefixes|_55|_loadModule|_51|_50|_4e|pop|_3f|_callLoaded|_unloaders|_loadNotifying|_loadedUrls|_27|_24|_1d|_5|_4b7|onAnimate|getStyle|offsetHeight|_defaultEasing|toCss|_properties|fadeOut|fadeIn|_49f|auto|zoom|_cycle|_endTime|valueOf|_494|duration|_492|DELETE|_ioAddQueryToUrl|putData|contentType|password|user|_isDocumentOk|application|||||_466||||||startTime|_xhrObj|_45f|handleAs|addBoth|error|text|objectToQuery|_44f|ActiveXObject|_443|_442|filtered|_43f|_43e|_437|file|tnl|_41c|_filterQueryResult|_zipIdx|_408|_402|evaluate|_3ed|_380|fHit|_361|_33b|_3da|_3ab|_3d6|RegExp|_327|_3cf|_3c9|child|innerHTML|first|tval|_391|class|pnc|_37e|_37c|_375|_366|_35c|_35a|_353|_33c|_336|_314|||_315|_oe|_307|_309|cloneNode|after|createElement||_2f8|_2ef|_2ee|unshift|coords|some|every||_2cb|script|_2c9|parent||a2p||_2c3|_2bd||abs|_getMarginBox|_2b3|_2a6|position|_2a7|_2ac|_2ab|_getIeDocumentElementOffset|getBoundingClientRect|ownerDocument|_2a3|clientWidth|_isBodyLtr|_fixIeBiDiScrollLeft|_bodyLtr|_29d|_getContentBox|_setBox|_getMarginExtents|_getPadBorderExtents|_usesBorderBox|boxModel|pcs|st|sl|_240|runtimeStyle|_dcm|BackCompat|compatMode|default|_21b|_d|html|_event_listener|handlers|PAGE_DOWN|PAGE_UP|RIGHT_ARROW|LEFT_ARROW|DOWN_ARROW|UP_ARROW|_preventDefault||_stopPropagation|returnValue||_trySetKeyCode|cancelBubble|currentTarget|106|_1ee|111||_1e8|_1e7|||se|srcElement|onkeydown||_1d0|_disconnect|lid|_1c0|_connect|_set|_195|_185|_183|_17d|_everyOrSome|_16b|_172|_15b|Function|_154|_escapeString|_140|chain|_check|canceller|_12d|_124|_11a|_10d|_107|inherited|_fa|_f2|_findMixin|_constructor|preamble|_de|clone|tmp|_c7|TMP|_be|_ba|_mixin|isBrowser|lang|firebug||param|modulePaths|_a7|_fireCallback|_a0|setContext||_9c|unloaded||||_96|_93|navigator|_90|_89||protocol|_84|_86|_XMLHTTP_PROGIDS|gears|google|setAttribute|_80|_77|cfg|_6f|_getModuleSymbols|_5a|_58|_53|_4d|_4c|_45|_40|_moduleHasPrefix|_loadUri|_28|_26|_21|_22|tests|doh|_20|_1f|_1c|version|_1b|_19|_getProp|_11|_4|_4a5|_4b3|_Animation|tempColor|blendColors|PI|sin|||||_49a|normal|onEnd||rate||curr|onStop|_497||_496|pct|onPause|onPlay|onBegin|delay||_491|_Line|_48b|wrapForm|PUT|_487|POST|GET|_476|_474|_472|_ioWatch|send|_471|setRequestHeader|open|callback|setInterval|_470|resHandle|_46f|ioCheck|_46e|validCheck|getTime|_ioCancelAll|addOnUnload|clearInterval|dojoType|now|canceled|_blockAsync|_45e|_45c|_459|_ioSetArgs|_contentHandlers|abort|_458|_456||||addErrback|_454|addCallback|_452|_44b|_44a|_449|preventCache|responseXML|Microsoft|JSON|usePlainJson|_431|toJson|_430|_42d|image|opt|ria|_421|_41b|_40b|_zip|_410|_40d|_357|sqf|_374|_3e5|_3df|_38f|clc|pred|parseInt|ntf|_3bf|_3bc|cnl|previousSibling|_3a9|_3a6|_39c|_399|_396|_392|__cachedIndex|__cachedLength|_376|iterateNext|_34a|_355|_354|_32c|_350|_34b|_33f|_33e|_33a|_338|_334|_332||_330|_32e||_322|_316|mousemove|mouseout|mouseover|_305|lastChild||_2f9||_2f2|_2f1|removeChild|_2ec|_2eb|_2ea|_2e6||_2e4|_2e2|_2d6|_2d5|_2d4|_2d3|_2d2|_2d1|_2cd|_2cc|scs|write|_2c8|hasClass|_2c0|_2bb|_2b5|_abs|_docScroll|offsetParent|offsetTop|offsetLeft|absolute|getBoxObjectFor|clientLeft|_setContentSize|_setMarginBox|_28d|_286|_285|_289|NaN|_281|border|_272|_26b|_260|_258|_253|_24c|_246|_23a|_getOpacity|_setOpacity|_238|td|tr|nodeName|FILTER|_22f|_22e|currentStyle|_22c|_22b|display|QuirksMode|unselectable|_217|isMozilla|getElementById|attributes|all|_ie_listener|_getIeDispatcher|_1fd|NUM_LOCK|SCROLL_LOCK|INSERT|END|HOME|PAUSE|F12|F11|F10|F9|F8|F7|F6|F5|F4|F3|F2|F1|63232|SHIFT_TAB|TAB|keyIdentifier|_1f3|stopEvent|_punctMap|222|219|186|onkeypress|_stealthKeyDown|_fixKeys|relatedTarget|_1e0|_1df|_stealthKeydown|_1d6|_1d5|_1d1|_1ca|_1c9|_1cb|_1c2|_1c1|_1c3|_1c4|_1bc|_1b3|_1b2|colorFromHex|colorFromRgb|named|colorFromString|mask|rgba|_19c|_197|_192|setColor|_180|_178|_177|_175|_174|_16d|_166|_164|_163|_162|_15c|_15d|_15e|index|__json__|toJsonIndentStr|_nextId|_12f|_12b|publish|_128|_126|_125|_122|_121|_123|_11c|_11b|_10c|_10b|_108|getDispatcher|argument|nom|_construct|_core|_makeCtor|_df|_db|deprecated|isObject|_cc||scope||_hitchArgs|_c2||pre|_c1|native|isDebug||registerModulePath|_a8||finally|||_a6|_a5|_a4|_a3|_a2|_a1|_9f|_9e|_9d|_9b|_98|_97|onbeforeunload|ipt|scr|complete|_95|userAgent|_modulesLoaded|initialized|_initFired|_8c|_8a|_getText|_87|ieForceActiveXXhr|Msxml2|isGears|_81|_gearsObject|googlegears|GearsFactory|isFF|_7d|Safari|_72|_name|_6c|ire|ore|_68|i18n|_5b|requireIf|_56|_52|loading|_4a|_loadPath|_47|_48|_global_omit_module_check|_getModulePrefix|_3c|_3a|_37|_30|Boolean|_loadUriAndCheck|_2e||cacheBust|_1e|_1a|_17|_16|_15|_14|_f|_10|_e|_9|_8|revision|flag|patch|minor|major|_6|color|units|needs|stopped|playing|stop|gotoPercent|pause|1000|implemented|yet|_48a|xhrDelete|rawXhrPut|xhrPut|postData|rawXhrPost|xhrPost|xhrGet|Type|Content|sync|response|http|bad|urlencoded|www|_watchInFlightError||exceeded|handle|action|getAttributeNode|loadXML|async|XMLDOM|prefixes|MSXML3|MSXML|MSXML2||xml|javascript|wasn|your|optional|message|off|turn|use|endpoints|issues|security|potential|avoid|mimetype|using|consider|please|decodeURIComponent|queryToObject|formToJson|formToQuery|encodeURIComponent|selected|option|multiple|checked|checkbox|radio|disabled|textarea|select|button|reset|submit|input|_3fb|hasAttribute|0n|even|odd|nth|_3b5|empty|_3b1|_3ad|htmlFor|_38a|under||exprssion|failure|ANY_TYPE|XPathResult|starts|keyup|keydown|mouseup|mousedown|blur|click|combine|span|addContent||adopt|orphan|_2de|_2dd|styles|_2da|_2d9|_2cf|_2ce|show|createPopup|toggleClass|scrollWidth|clientTop|ltr|direction|pageXOffset|pageYOffset|fixed|contentBox|marginBox|BUTTON|TABLE|_getBorderBox|clientHeight|visible|overflow|marginBottom|marginRight|marginTop|marginLeft|borderBottomWidth|borderBottomStyle|borderRightWidth|borderRightStyle|borderTopWidth|borderTopStyle|borderLeftWidth|borderLeftStyle|paddingBottom|paddingRight|paddingTop|paddingLeft|offset||min|padding||margin|Opacity|Alpha|alpha|filters|pixelLeft|medium|_22a|defaultView|before||insertBefore|KhtmlUserSelect|MozUserSelect|setSelectable|isDescendant|div|_destroyElement|BackgroundImageCache|execCommand|PageDown|PageUp|Right|Left|Down|Up|63289|63249|63248|PRINT_SCREEN|63302|63277|63276|63275|63273|63272|63250|63247|63246|63245|63244|63243|63242|63241|63240|63239|63238|63237|63236|63235|63234|63233|Enter|_1f9|which|_1f6|bubbledKeyCode|221|220||||191|190|189|188|187|toElement|fromElement|clientY|pageY||clientX|pageX|offsetY|||layerY|offsetX|layerX|parentWindow|_nop|_allow_leaks|145|144|126|F15|125|F14|124|F13|123|122|121|120|119|118|117|116|115|114|113|112|NUMPAD_DIVIDE|110|NUMPAD_PERIOD|109|NUMPAD_MINUS|108|NUMPAD_ENTER|107|NUMPAD_PLUS|NUMPAD_MULTIPLY|105|NUMPAD_9|104|NUMPAD_8|103|NUMPAD_7|102|NUMPAD_6|101|NUMPAD_5|NUMPAD_4||NUMPAD_3|NUMPAD_2|NUMPAD_1|NUMPAD_0||SELECT|RIGHT_WINDOW||LEFT_WINDOW||HELP|SPACE|ESCAPE|CAPS_LOCK|ALT|CTRL|SHIFT|ENTER|CLEAR|BACKSPACE|attachEvent|fixEvent|fromCharCode|keyChar|_1b9|removeEventListener|0x|round|toHex|toRgba|toRgb|aqua|teal|blue|navy|yellow|olive|lime|green|fuchsia|purple|red|maroon|white|gray|silver|black|boolean|called|already|Cancelled|connectPublisher|unsubscribe|subscribe|disconnect|_113|_112||_111|_110|||found|was||must|_|module|||required|likely|It|declaration|Mixin|separate|instead|property|initializer||pass|_c9|_bb|_b7|nfunction|isAlien|isFinite|isArrayLike|_firebug|withDoc|withGlobal|_writeIncludes|VML|behavior|addRule|createStyleSheet|vml|com|microsoft|schemas|urn|namespaces|onunload|onreadystatechange|defer|khtml|WebKit|DOMContentLoaded|enableMozDomContentLoaded|domcontentloaded|Unable|base|chrome|1223|304|300|200|available|XMLHttpRequest|_println|language|userLanguage|isQuirks|factory|mimeTypes|Factory|Gears|_7f|MSIE||Firefox|Goanna|Konqueror||Opera|appVersion|xd|browser|moduleUrl|port|host|hostenv|_requireLocalization|_5f|_5e|_5d|_5c|requireLocalization|requireAfterIf|_57|common|platformRequire|defined|symbol|_isXDomain|tried|Could|__package__|packageFileName|_42|useXDomain|flight|still|files|addOnLoad|failed|sourceURL|util|notice|without|change|subject|APIs|EXPERIMENTAL|experimental|removed|will|DEPRECATED|exists|10315|Rev|Mobile|Spidermonkey|Rhino||Browser|delayMozLoadingFix|preventBackButtonFix|libraryScriptUri|baseRelativePath|baseScriptUri|allowQueryConfig|warn|trace|timeEnd||time|profileEnd|profile|log|info|groupEnd|group|dirxml|dir|count|assert'.split('|'),0,{}); +var decompressedDojo = function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('if(V z=="1k"){(B(){if(V D["1o"]=="1k"){D.1o={}}if((!D["1z"])||(!1z["ca"])){D.1z={}}A cn=["rA","rz","1K","ry","rx","9f","rw","rv","ru","rt","rs","rr","rq","ro","rn","rm"];A i=0,24;1s(24=cn[i++]){if(!1z[24]){1z[24]=B(){}}}if(V D["z"]=="1k"){D.z={}}z.1W=D;A d3={im:U,rl:U,rk:"",rj:"",ri:"",rh:K,rg:U};R(A 8z in d3){if(V 1o[8z]=="1k"){1o[8z]=d3[8z]}}A jK=["rf","rd","rc","rb"];A t;1s(t=jK.3a()){z["is"+t]=U}})();z.8h=1o.8h;z.cY={jJ:0,jI:9,jH:0,jG:"",jF:2V("$ra: r9 $".1f(/[0-9]+/)[0]),2i:B(){4G(z.cY){C jJ+"."+jI+"."+jH+jG+" ("+jF+")"}}};z.d1=B(jE,jD,1V){A 2h=1V||z.1W;R(A i=0,p;2h&&(p=jE[i]);i++){2h=(p in 2h?2h[p]:(jD?2h[p]={}:1k))}C 2h};z.88=B(jC,jA,jB){A d2=jC.1A("."),p=d2.8q(),M=z.d1(d2,K,jB);C(M&&p?(M[p]=jA):1k)};z.6q=B(jz,jy,jx){C z.d1(jz.1A("."),jy,jx)};z.r8=B(jw,M){C!!z.6q(jw,U,M)};z["3u"]=B(d0){C z.1W.3u?z.1W.3u(d0):3u(d0)};z.ia=B(jv,cZ,cX){A 8y="r7: "+jv;if(cZ){8y+=" "+cZ}if(cX){8y+=" -- r6 be r5 in cY: "+cX}1z.1K(8y)};z.r4=B(ju,cW){A cV="r3: "+ju+" -- r2 r1 4F r0 qZ qY.";if(cW){cV+=" "+cW}1z.1K(cV)};(B(){A cR={53:{},6p:0,1h:{},8k:{z:{1p:"z",1Z:"."},cU:{1p:"cU",1Z:"../qX/cU"},cT:{1p:"cT",1Z:"cT"}},cN:B(cS){A mp=D.8k;C jp(mp[cS]&&mp[cS].1Z)},jk:B(8x){A mp=D.8k;if(D.cN(8x)){C mp[8x].1Z}C 8x},8v:[],6t:U,56:[],8t:[],8u:U};R(A cQ in cR){z[cQ]=cR[cQ]}})();z.jg=B(8w,cP,cb){A 1g=(((8w.2s(0)=="/"||8w.1f(/^\\w+:/)))?"":D.51)+8w;if(1o.jt&&z.c8){1g+="?"+67(1o.jt).2f(/\\W+/g,"")}1u{C!cP?D.cO(1g,cb):D.jq(1g,cP,cb)}1y(e){1z.1K(e);C U}};z.cO=B(1g,cb){if(D.8v[1g]){C K}A 6u=D.iR(1g,K);if(!6u){C U}D.8v[1g]=K;D.8v.Y(1g);if(cb){6u="("+6u+")"}A jr=z["3u"](6u+"\\r\\n//@ qW="+1g);if(cb){cb(jr)}C K};z.jq=B(1g,jo,cb){A ok=U;1u{ok=D.cO(1g,cb)}1y(e){1z.1K("qV je ",1g," 4G 9f: ",e)}C jp(ok&&D.53[jo])};z.6m=B(){D.8u=K;D.6t=K;A 57=D.56;D.56=[];R(A x=0;x<57.G;x++){57[x]()}D.8u=U;if(z.6t&&z.6p==0&&D.56.G>0){z.8s()}};z.ck=B(){A 57=D.8t;1s(57.G){(57.8q())()}};z.qU=B(M,jn){A d=z;if(P.G==1){d.56.Y(M)}I{if(P.G>1){d.56.Y(B(){M[jn]()})}}if(d.6t&&d.6p==0&&!d.8u){d.8s()}};z.dW=B(M,jm){A d=z;if(P.G==1){d.8t.Y(M)}I{if(P.G>1){d.8t.Y(B(){M[jm]()})}}};z.iM=B(){if(D.6t){C}if(D.6p>0){1z.1K("qT qS in qR!");C}z.8s()};z.8s=B(){if(V 5c=="8b"||(1o["qQ"]&&z.2M)){5c("z.6m();",0)}I{z.6m()}};z.cF=B(jl){A 4v=jl.1A(".");R(A i=4v.G;i>0;i--){A 8r=4v.2w(0,i).22(".");if((i==1)&&!D.cN(8r)){4v[0]="../"+4v[0]}I{A cM=D.jk(8r);if(cM!=8r){4v.3S(0,i,cM);3f}}}C 4v};z.jj=U;z.8m=B(2T,qP,55){55=D.jj||55;A 54=D.53[2T];if(54){C 54}A cL=2T.1A(".");A 3L=D.cF(2T);A jh=((3L[0].2s(0)!="/")&&!3L[0].1f(/^\\w+:/));A ji=3L[3L.G-1];A 3m;if(ji=="*"){2T=cL.2w(0,-1).22(".");3L.8q();3m=3L.22("/")+"/"+(1o["qO"]||"qN")+".js";if(jh&&3m.2s(0)=="/"){3m=3m.2w(1)}}I{3m=3L.22("/")+".js";2T=cL.22(".")}A jf=(!55)?2T:L;A ok=D.jg(3m,jf);if((!ok)&&(!55)){2m S 1O("qM 3O 4E \'"+2T+"\'; 72 qL \'"+3m+"\'")}if((!55)&&(!D["qK"])){54=D.53[2T];if(!54){2m S 1O("qJ \'"+2T+"\' is 3O qI a8 je \'"+3m+"\'")}}C 54};z.8c=z.8m;z.1Q=B(cK){A cJ=cK+"";A 8p=cJ;A 6s=cK.1A(/\\./);if(6s[6s.G-1]=="*"){6s.8q();8p=6s.22(".")}A 8o=z.6q(8p,K);D.53[cJ]=8o;D.53[8p]=8o;C 8o};z.qH=B(8n){A jd=8n["qG"]||[];A cI=jd.3U(8n[z.j4]||8n["aY"]||[]);R(A x=0;x0&&!(j==1&&1X[0]=="")&&1X[j]==".."&&1X[j-1]!=".."){if(j==(1X.G-1)){1X.3S(j,1);1X[j-1]=""}I{1X.3S(j-1,2);j-=2}}}}1t.28=1X.22("/")}}}}1g="";if(1t.4t){1g+=1t.4t+":"}if(1t.3l){1g+="//"+1t.3l}1g+=1t.28;if(1t.1r){1g+="?"+1t.1r}if(1t.52){1g+="#"+1t.52}}D.1g=1g.2i();A r=D.1g.1f(j7);D.4t=r[2]||(r[1]?"":n);D.3l=r[4]||(r[3]?"":n);D.28=r[5];D.1r=r[7]||(r[6]?"":n);D.52=r[9]||(r[8]?"":n);if(D.3l!=n){r=D.3l.1f(j6);D.8X=r[3]||n;D.8W=r[4]||n;D.qw=r[5];D.qv=r[7]||n}};z.4r.1C.2i=B(){C D.1g}})();z.qu=B(j5,2E){A 2B=z.cF(j5).22("/");if(!2B){C L}if(2B.31("/")!=2B.G-1){2B+="/"}A cE=2B.T(":");if(2B.2s(0)!="/"&&(cE==-1||cE>2B.T("/"))){2B=z.51+2B}C S z.4r(2B,2E)};if(V 26!="1k"){z.c8=K;z.j4="qt";(B(){A d=z;if(1q&&1q.4I){A 8j=1q.4I("ak");A j3=/z(\\.qs)?\\.js([\\?\\.]|$)/i;R(A i=0;i<8j.G;i++){A 4X=8j[i].5t("4X");if(!4X){6c}A m=4X.1f(j3);if(m){if(!1o["51"]){1o["51"]=4X.21(0,m.hK)}A cD=8j[i].5t("1o");if(cD){A cC=3u("({ "+cD+" })");R(A x in cC){1o[x]=cC[x]}}3f}}}d.51=1o["51"];A n=cq;A 8i=n.iL;A 4Z=n.qr;A 6r=2k(4Z);d.2M=(8i.T("qq")>=0)?6r:0;d.6B=(4Z.T("qo")>=0)||(4Z.T("j2")>=0)?6r:0;d.3o=(4Z.T("j2")>=0)?6r:0;A j1=8i.T("qn");d.gu=d.7B=((j1>=0)&&(!d.6B))?6r:0;d.j0=0;d.1l=0;d.iV=0;1u{if(d.7B){d.j0=2k(8i.1A("qm/")[1].1A(" ")[0])}if((1q.gx)&&(!d.2M)){d.1l=2k(4Z.1A("qk ")[1].1A(";")[0])}}1y(e){}if(z.1l&&(26.8f.cu==="9q:")){1o.iT=K}d.iX=B(){A 2A;A qj;A cB=d.6q("cz.cy");if(cB){C cB}if(V iZ!="1k"){2A=S iZ()}I{if(d.1l){1u{2A=S 9j("qi.qh")}1y(e){}}I{if(cq.qg["8Z/x-iY"]){2A=1q.a9("8b");2A.cA("Z","8Z/x-iY");2A.cA("3n",0);2A.cA("58",0);2A.1c.gq="7C";1q.5K.4c(2A)}}}if(!2A){C L}z.88("cz.cy.qf",2A);C z.6q("cz.cy")};A iW=d.iX();if(iW){d.iV=K}A cm=1q["aX"];d.qe=(cm=="aW")||(cm=="gr")||(d.1l<6);d.8h=1o.8h||(d.1l?n.qd:n.qc).1M();d.qb=1z.1K;d.cx=["iU.8g","em.8g","iU.8g.4.0"];d.9b=B(){A 4s=L;A cv=L;if(!z.1l||!1o.iT){1u{4s=S qa()}1y(e){}}if(!4s){R(A i=0;i<3;++i){A cw=z.cx[i];1u{4s=S 9j(cw)}1y(e){cv=e}if(4s){z.cx=[cw];3f}}}if(!4s){2m S 1O("8g 3O q9: "+cv)}C 4s};d.8Y=B(iS){A 4Y=iS.3N||0;C((4Y>=q8)&&(4Y0);d.iR=B(1g,iP){A 3K=D.9b();if(!iQ&&z.4r){1g=(S z.4r(26.8f,1g)).2i()}3K.dL("dD",1g,U);1u{3K.dI(L);if(!d.8Y(3K)){A 1G=1O("q2 4F 4E "+1g+" 3N:"+3K.3N);1G.3N=3K.3N;1G.2G=3K.2G;2m 1G}}1y(e){if(iP){C L}2m e}C 3K.2G}})();z.iO=U;z.6o=B(e){z.iO=K;A cr=(e&&e.Z)?e.Z.1M():"4E";if(P.2O.iN||(cr!="q1"&&cr!="4E")){C}P.2O.iN=K;if(V z["8e"]!="1k"){dX(z.8e);63 z.8e}if(z.6p==0){z.iM()}};if(1q.66){if(z.2M||(z.7B&&(1o["q0"]===K))){1q.66("pZ",z.6o,L)}26.66("4E",z.6o,L)}if(/(pY|pX)/i.6Z(cq.iL)){z.8e=dN(B(){if(/6m|iJ/.6Z(1q.6F)){z.6o()}},10)}(B(){A 3g=26;A 8d=B(cp,fp){A iK=3g[cp]||B(){};3g[cp]=B(){fp.14(3g,P);iK.14(3g,P)}};if(z.1l){1q.fJ(""+"");A co=K;8d("iG",B(){3g.5c(B(){co=U},0)});8d("pU",B(){if(co){z.ck()}});1u{1q.pT.2P("v","pS:pR-pQ-pP:pO");1q.pN().pM("v\\\\:*","pL:2E(#aY#pK)")}1y(e){}}I{8d("iG",B(){z.ck()})}})();z.pJ=B(){};z.1e=26["1q"]||L;z.3E=B(){C z.1e.3E||z.1e.4I("3E")[0]};z.ch=B(iF,iE){z.1W=iF;z.1e=iE};z.cf=B(4q,6n,iD){if((6n)&&((V 4q=="3c")||(4q 1N 67))){4q=6n[4q]}C(6n?4q.14(6n,iD||[]):4q())};z.pI=B(cj,iC,iB,iA){A cg;A iz=z.1W;A iy=z.1e;1u{z.ch(cj,cj.1q);cg=z.cf(iC,iB,iA)}ir{z.ch(iz,iy)}C cg};z.pH=B(ix,iw,iv,iu){A ce;A ip=z.1e;1u{z.1e=ix;ce=z.cf(iw,iv,iu)}ir{z.1e=ip}C ce};if(1o["cd"]){R(A cc in 1o["cd"]){z.io(cc,1o["cd"][cc])}}}if(1o.im){if(!1z.ca){z.8c("z.pG.ca")}}}if(!z.1h["z.X.c9"]){z.1h["z.X.c9"]=K;z.1Q("z.X.c9");z.1R=B(it){C(V it=="3c"||it 1N 67)};z.2l=B(it){C(it&&it 1N 4e||V it=="6a"||((V z["1H"]!="1k")&&(it 1N z.1H)))};if(z.c8&&z.3o){z.1Y=B(it){if((V(it)=="B")&&(it=="[8b 1H]")){C U}C(V it=="B"||it 1N bI)}}I{z.1Y=B(it){C(V it=="B"||it 1N bI)}}z.ib=B(it){if(V it=="1k"){C U}C(it===L||V it=="8b"||z.2l(it)||z.1Y(it))};z.pF=B(it){A d=z;if((!it)||(V it=="1k")){C U}if(d.1R(it)){C U}if(d.1Y(it)){C U}if(d.2l(it)){C K}if((it.5w)&&(it.5w.1M()=="3R")){C U}if(pE(it.G)){C K}C U};z.pD=B(it){if(!it){C U}C!z.1Y(it)&&/\\{\\s*\\[il 5h\\]\\s*\\}/.6Z(67(it))};z.c7=B(M,4W){A 8a={};R(A x in 4W){if((V 8a[x]=="1k")||(8a[x]!=4W[x])){M[x]=4W[x]}}if(z.1l){A p=4W.2i;if((V(p)=="B")&&(p!=M.2i)&&(p!=8a.2i)&&(p!="\\pC 2i() {\\n [il 5h]\\n}\\n")){M.2i=4W.2i}}C M};z.1x=B(M,pB){R(A i=1,l=P.G;i2){C z.ig.14(z,P)}if(!3k){3k=2z;2z=L}if(z.1R(3k)){2z=2z||z.1W;if(!2z[3k]){2m(["z.2p: ie[\\"",3k,"\\"] is L (ie=\\"",2z,"\\")"].22(""))}C B(){C 2z[3k].14(2z,P||[])}}I{C(!2z?3k:B(){C 3k.14(2z,P||[])})}};z.6j=B(M,c3){B c4(){};c4.1C=M;A c2=S c4();if(c3){z.1x(c2,c3)}C c2};z.7X=B(pz){A Q=[L];C z.2p.14(z,Q.3U(z.4d(P)))};z.4d=B(M,ic){A Q=[];R(A x=ic||0;x3)){z.ia("z.2r: R 9P \'"+6l+"\' py pw B as \'1P\' pv pu of as a pt i3.","","1.0");A c=3j;3j=P[3]||{};3j.1P=c}A dd=P.2O,4V=L;if(z.2l(4p)){4V=4p;4p=4V.3a()}if(4V){R(A i=0,m;i<4V.G;i++){m=4V[i];if(!m){2m("ps #"+i+" 4F pr of "+6l+" is L. pq\'s pp a po pl is 3O 6m.")}4p=dd.6j(4p,m)}}A i9=(3j||0).1P,6k=dd.6j(4p),fn;R(A i in 3j){if(z.1Y(fn=3j[i])&&(!0[i])){fn.i4=i}}z.4M(6k,{4o:6l,bY:i9,bZ:L},3j||0);6k.1C.1P=6k;C z.88(6l,6k)};z.1x(z.2r,{6j:B(c0,i8){A bp=(c0||0).1C,mp=(i8||0).1C;A 2S=z.2r.i7();z.1x(2S,{84:bp,1x:mp});if(c0){2S.1C=z.6j(bp)}z.4M(2S,z.2r.i6,mp||0,{bY:L});2S.1C.1P=2S;2S.1C.4o=(bp||0).4o+"pk"+(mp||0).4o;z.88(2S.1C.4o,2S);C 2S},i7:B(){C B(){D.i5(P)}},i6:{i5:B(86){A c=86.2O,s=c.84,ct=s&&s.1P,m=c.1x,87=m&&m.1P,a=86,ii,fn;if(a[0]){if((fn=a[0]["bZ"])){a=fn.14(D,a)||a}}if(fn=c.1C.bZ){a=fn.14(D,a)||a}if(ct&&ct.14){ct.14(D,a)}if(87&&87.14){87.14(D,a)}if(ii=c.1C.bY){ii.14(D,86)}},bX:B(85){A c=D.1P,p,m;1s(c){p=c.84;m=c.1x;if(m==85||(m 1N 85.1P)){C p}if(m&&(m=m.bX(85))){C m}c=p&&p.1P}},6h:B(83,82,bW,6i){A p=bW,c,m,f;do{c=p.1P;m=c.1x;if(m&&(m=D.6h(83,82,m,6i))){C m}if((f=p[83])&&(6i==(f==82))){C p}p=c.84}1s(p);C!6i&&(p=D.bX(bW))&&D.6h(83,82,p,6i)},bU:B(2R,4U,bV){A a=P;if(!z.1R(a[0])){bV=4U;4U=2R;2R=4U.2O.i4}A c=4U.2O,p=D.1P.1C,a=bV||4U,fn,mp;if(D[2R]!=c||p[2R]==c){mp=D.6h(2R,c,p,K);if(!mp){2m(D.4o+": 1p i3 (\\""+2R+"\\") 4F bU pj 1f 2O (2r.js)")}p=D.6h(2R,c,mp,U)}fn=p&&p[2R];if(!fn){1z.1K(mp.4o+": no bU \\""+2R+"\\" ph pg (2r.js)");C}C fn.14(D,a)}}})}if(!z.1h["z.X.2c"]){z.1h["z.X.2c"]=K;z.1Q("z.X.2c");z.3i={i2:B(){C B(){A ap=4e.1C,c=P.2O,ls=c.2b,t=c.5V;A r=t&&t.14(D,P);R(A i in ls){if(!(i in ap)){ls[i].14(D,P)}}C r}},2P:B(6g,bT,i1){6g=6g||z.1W;A f=6g[bT];if(!f||!f.2b){A d=z.3i.i2();d.5V=f;d.2b=[];f=6g[bT]=d}C f.2b.Y(i1)},3J:B(i0,hZ,bS){A f=(i0||z.1W)[hZ];if(f&&f.2b&&bS--){63 f.2b[bS]}}};z.2c=B(M,pd,pc,pa,p9){A a=P,F=[],i=0;F.Y(z.1R(a[0])?L:a[i++],a[i++]);A a1=a[i+1];F.Y(z.1R(a1)||z.1Y(a1)?a[i++]:L,a[i++]);R(A l=a.G;i2){6e=z.7X(6e,P,2)}C D.5k(6e,6e)},ef:B(cb,4T){A 7Y=z.2p(cb,4T);if(P.G>2){7Y=z.7X(7Y,P,2)}C D.5k(7Y,L)},ed:B(cb,4T){A 7W=z.2p(cb,4T);if(P.G>2){7W=z.7X(7W,P,2)}C D.5k(L,7W)},5k:B(cb,eb){D.bM.Y([cb,eb]);if(D.2y>=0){D.7U()}C D},7U:B(){A bL=D.bM;A 4n=D.2y;A 1v=D.4R[4n];A 4S=D;A cb=L;1s((bL.G>0)&&(D.3M==0)){A f=bL.3a()[4n];if(!f){6c}1u{1v=f(1v);4n=((1v 1N 1O)?1:0);if(1v 1N z.30){cb=B(1v){4S.7V(1v);4S.3M--;if((4S.3M==0)&&(4S.2y>=0)){4S.7U()}};D.3M++}}1y(1G){1z.1K(1G);4n=1;1v=1G}}D.2y=4n;D.4R[4n]=1v;if((cb)&&(D.3M)){1v.9e(cb)}}})}if(!z.1h["z.X.2e"]){z.1h["z.X.2e"]=K;z.1Q("z.X.2e");z.5m=B(2e){1u{C 3u("("+2e+")")}1y(e){1z.1K(e);C 2e}};z.bK=B(2H){C("\\""+2H.2f(/(["\\\\])/g,"\\\\$1")+"\\"").2f(/[\\f]/g,"\\\\f").2f(/[\\b]/g,"\\\\b").2f(/[\\n]/g,"\\\\n").2f(/[\\t]/g,"\\\\t").2f(/[\\r]/g,"\\\\r")};z.hM="\\t";z.eq=B(it,4l,4P){4P=4P||"";A 4k=(4l?4P+z.hM:"");A 6b=(4l?"\\n":"");A 4Q=V(it);if(4Q=="1k"){C"1k"}I{if((4Q=="4J")||(4Q=="p1")){C it+""}I{if(it===L){C"L"}}}if(4Q=="3c"){C z.bK(it)}A 6d=P.2O;A 4m;if(V it.hL=="B"){4m=it.hL();if(it!==4m){C 6d(4m,4l,4k)}}if(V it.2e=="B"){4m=it.2e();if(it!==4m){C 6d(4m,4l,4k)}}if(z.2l(it)){A 1v=[];R(A i=0;i>=7R;t[x]=7R==4?17*c:c});t.a=1;C t};z.7P=B(a,M){A t=M||S z.1J();t.bz(2V(a[0]),2V(a[1]),2V(a[2]),2V(a[3]));if(2L(t.a)){t.a=1}C t.7Q()};z.hq=B(2H,M){A a=z.1J.hp[2H];C a&&z.7P(a,M)||z.ho(2H,M)||z.hn(2H,M)}}if(!z.1h["z.X"]){z.1h["z.X"]=K;z.1Q("z.X")}if(!z.1h["z.X.5Z"]){z.1h["z.X.5Z"]=K;z.1Q("z.X.5Z");(B(){A 1j=z.b2={2P:B(E,68,fp){if(!E){C}68=1j.4O(68);fp=1j.7G(68,fp);E.66(68,fp,U);C fp},3J:B(E,hm,hl){(E)&&(E.oF(1j.4O(hm),hl,U))},4O:B(1p){C(1p.2w(0,2)=="on"?1p.2w(2):1p)},7G:B(1p,fp){C(1p!="4b"?fp:B(e){C fp.2d(D,1j.4i(e,D))})},4i:B(H,oE){4w(H.Z){2X"4b":1j.7K(H);3f}C H},7K:B(H){H.oD=(H.3h?67.oC(H.3h):"")}};z.oB=B(H,hk){C 1j.4i(H,hk)};z.gY=B(H){H.7J();H.7I()};A 7O=z.3i;z.by=B(M,bx,hh,hg,hi){A hj=M&&(M.2t||M.oA||M.66);A bw=!hj?0:(!hi?1:2),l=[z.3i,1j,7O][bw];A h=l.2P(M,bx,z.2p(hh,hg));C[M,bx,h,bw]};z.bv=B(M,he,hd,hf){([z.3i,1j,7O][hf]).3J(M,he,hd)};z.5W={oz:8,gV:9,oy:12,ox:13,ow:16,ov:17,ou:18,gG:19,ot:20,os:27,or:32,b5:33,b4:34,gE:35,gF:36,b7:37,b9:38,b6:39,b8:40,gD:45,8S:46,oq:47,oo:91,om:92,ol:93,oj:96,oi:97,oh:98,og:99,oe:6D,od:oc,ob:oa,o9:o8,o7:o6,o5:o4,o3:bi,o2:o1,o0:nZ,nY:nX,nW:nV,nU:bk,gS:nT,gR:nS,gQ:nR,gP:nQ,gO:nP,gN:nO,gM:nN,gL:nM,gK:nL,gJ:nK,gI:nJ,gH:nI,nH:nG,nF:nE,nD:nC,gB:nB,gC:nA};if(z.1l){bf=B(e,5h){1u{C(e.3I=5h)}1y(e){C 0}};A 61=z.3i;if(!1o.nz){7O=61=z.gy={b3:[],2P:B(64,bu,hc){64=64||z.1W;A f=64[bu];if(!f||!f.2b){A d=z.gz();d.5V=f&&(7M.Y(f)-1);d.2b=[];f=64[bu]=d}C f.2b.Y(7M.Y(hc)-1)},3J:B(hb,ha,7N){A f=(hb||z.1W)[ha],l=f&&f.2b;if(f&&l&&7N--){63 7M[l[7N]];63 l[7N]}}};A 7M=61.b3}z.1x(1j,{2P:B(E,62,fp){if(!E){C}62=1j.4O(62);if(62=="h3"){A kd=E.bs;if(!kd||!kd.2b||!kd.h9){1j.2P(E,"bs",1j.h4);E.bs.h9=K}}C 61.2P(E,62,1j.7G(fp))},3J:B(E,h8,h7){61.3J(E,1j.4O(h8),h7)},4O:B(7L){C(7L.2w(0,2)!="on"?"on"+7L:7L)},ny:B(){},4i:B(H,4N){if(!H){A w=(4N)&&((4N.aD||4N.1q||4N).nx)||26;H=w.5Z}if(!H){C(H)}H.5V=H.br;H.bh=(4N||H.br);H.nw=H.nv;H.nu=H.nr;A bq=H.br,1e=(bq&&bq.aD)||1q;A bn=((z.1l<6)||(1e["aX"]=="aW"))?1e.3E:1e.5K;A bm=z.aB();H.nq=H.np+z.aH(bn.5I||0)-bm.x;H.nn=H.nm+(bn.5G||0)-bm.y;if(H.Z=="fk"){H.h6=H.nl}if(H.Z=="fj"){H.h6=H.nk}H.7I=1j.bc;H.7J=1j.ba;C 1j.h5(H)},h5:B(H){4w(H.Z){2X"4b":A c=("3h"in H?H.3h:H.3I);if(c==10){c=0;H.3I=13}I{if(c==13||c==27){c=0}I{if(c==3){c=99}}}H.3h=c;1j.7K(H);3f}C H},gZ:{bi:42,bk:47,h2:59,nj:43,ni:44,nh:45,ng:46,nf:47,60:96,h1:91,nb:92,na:93,h0:39},h4:B(H){A kp=H.bh.h3;if(!kp||!kp.2b){C}A k=H.3I;A bj=(k!=13)&&(k!=32)&&(k!=27)&&(k<48||k>90)&&(k<96||k>bk)&&(k60)&&(kh0);if(bj||H.5Y){A c=(bj?0:k);if(H.5Y){if(k==3||k==13){C}I{if(c>95&&c=65&&c<=90)){c+=32}I{c=1j.gZ[c]||c}}}}A 2x=1j.7H(H,{Z:"4b",2x:K,3h:c});kp.2d(H.bh,2x);H.bg=2x.bg;H.bd=2x.bd;bf(H,2x.3I)}},bc:B(){D.bg=K},ba:B(){D.n9=D.3I;if(D.5Y){bf(D,0)}D.bd=U}});z.gY=B(H){H=H||26.5Z;1j.bc.2d(H);1j.ba.2d(H)}}1j.7H=B(H,gX){A 2x=z.1x({},H,gX);1j.7K(2x);2x.7J=B(){H.7J()};2x.7I=B(){H.7I()};C 2x};if(z.2M){z.1x(1j,{4i:B(H,n8){4w(H.Z){2X"4b":A c=H.n7;if(c==3){c=99}c=((c<41)&&(!H.5X)?0:c);if((H.5Y)&&(!H.5X)&&(c>=65)&&(c<=90)){c+=32}C 1j.7H(H,{3h:c})}C H}})}if(z.3o){z.1x(1j,{4i:B(H,n6){4w(H.Z){2X"4b":A c=H.3h,s=H.5X,k=H.3I;k=k||gA[H.gW]||0;if(H.gW=="n5"){c=0}I{if((H.5Y)&&(c>0)&&(c<27)){c+=96}I{if(c==z.5W.gU){c=z.5W.gV;s=K}I{c=(c>=32&&c gh",E).1n(B(i){i.1c.7E=i.1c.7E.2f(/gk:[^;]*;/i,"")})}}I{A o="mh(mg="+(7D*6D)+")";E.1c.3T=o}if(E.gj.1M()=="gi"){z.1r("> gh",E).1n(B(i){i.1c.3T=o})}C 7D}:B(E,gg){C E.1c.2W=gg});A 5Q={3n:K,58:K,2g:K,5J:K};A gd=B(E,Z,5P){Z=Z.1M();if(5Q[Z]===K){C z.4g(E,5P)}I{if(5Q[Z]===U){C 5P}I{if((Z.T("mf")>=0)||(Z.T("md")>=0)||(Z.T("3n")>=0)||(Z.T("58")>=0)||(Z.T("5q")>=0)||(Z.T("mc")>=0)||(Z.T("ma")>=0)){5Q[Z]=K;C z.4g(E,5P)}I{5Q[Z]=U;C 5P}}}};z.1c=B(E,5O,aT){A n=z.1D(E),F=P.G,op=(5O=="2W");if(F==3){C op?z.gf(n,aT):n.1c[5O]=aT}if(F==2&&op){C z.ge(n)}A s=z.3F(n);C(F==1)?s:gd(n,5O,s[5O])};z.7A=B(n,gc){A s=gc||1E(n),px=z.4g,l=px(n,s.m9),t=px(n,s.m8);C{l:l,t:t,w:l+px(n,s.m7),h:t+px(n,s.m6)}};z.5N=B(n,gb){A ne="7C",px=z.4g,s=gb||1E(n),bl=(s.m5!=ne?px(n,s.m4):0),bt=(s.m3!=ne?px(n,s.m2):0);C{l:bl,t:bt,w:bl+(s.m1!=ne?px(n,s.m0):0),h:bt+(s.lZ!=ne?px(n,s.lY):0)}};z.aN=B(n,ga){A s=ga||1E(n),p=z.7A(n,s),b=z.5N(n,s);C{l:p.l+b.l,t:p.t+b.t,w:p.w+b.w,h:p.h+b.h}};z.aM=B(n,g9){A s=g9||1E(n),px=z.4g,l=px(n,s.lX),t=px(n,s.lW),r=px(n,s.lV),b=px(n,s.lU);if(z.3o&&(s.ax!="fU")){r=l}C{l:l,t:t,w:l+r,h:t+b}};z.au=B(E,g8){A s=g8||1E(E),me=z.aM(E,s);A l=E.fT-me.l,t=E.fS-me.t;if(z.7B){A aS=2k(s.2g),aR=2k(s.5J);if(!2L(aS)&&!2L(aR)){l=aS,t=aR}I{A p=E.1L;if(p&&p.1c){A aQ=1E(p);if(aQ.lT!="lS"){A be=z.5N(p,aQ);l+=be.l,t+=be.t}}}}I{if(z.2M){A p=E.1L;if(p){A be=z.5N(p);l-=be.l,t-=be.t}}}C{l:l,t:t,w:E.6v+me.w,h:E.8D+me.h}};z.aK=B(E,g7){A s=g7||1E(E),pe=z.7A(E,s),be=z.5N(E,s),w=E.aF,h;if(!w){w=E.6v,h=E.8D}I{h=E.lR,be.w=be.h=0}if(z.2M){pe.l+=be.l;pe.t+=be.t}C{l:pe.l,t:pe.t,w:w-pe.w-be.w,h:h-pe.h-be.h}};z.lQ=B(E,g6){A s=g6||1E(E),pe=z.7A(E,s),cb=z.aK(E,s);C{l:cb.l-pe.l,t:cb.t-pe.t,w:cb.w+pe.w,h:cb.h+pe.h}};z.aL=B(E,l,t,w,h,u){u=u||"px";4G(E.1c){if(!2L(l)){2g=l+u}if(!2L(t)){5J=t+u}if(w>=0){3n=w+u}if(h>=0){58=h+u}}};z.aO=B(E){A n=E.5w;C(z.aP=="g5-3G")||(n=="lP")||(n=="lO")};z.fX=B(E,7z,7y,g4){A bb=z.aO(E);if(bb){A pb=z.aN(E,g4);if(7z>=0){7z+=pb.w}if(7y>=0){7y+=pb.h}}z.aL(E,g3,g3,7z,7y)};z.fY=B(E,g1,g0,5M,5L,g2){A s=g2||z.3F(E);A bb=z.aO(E),pb=bb?fZ:z.aN(E,s),mb=z.aM(E,s);if(5M>=0){5M=2Y.5q(5M-pb.w-mb.w,0)}if(5L>=0){5L=2Y.5q(5L-pb.h-mb.h,0)}z.aL(E,g1,g0,5M,5L)};A fZ={l:0,t:0,w:0,h:0};z.lN=B(E,3G){A n=z.1D(E),s=1E(n),b=3G;C!b?z.au(n,s):z.fY(n,b.l,b.t,b.w,b.h,s)};z.lM=B(E,3G){A n=z.1D(E),s=1E(n),b=3G;C!b?z.aK(n,s):z.fX(n,b.w,b.h,s)};A 5H=B(E,1a){if(!(E=(E||0).1L)){C 0}A 1U,aJ=0,2h=z.3E();1s(E&&E.1c){if(1E(E).ax=="lL"){C 0}1U=E[1a];if(1U){aJ+=1U-0;if(E==2h){3f}}E=E.1L}C aJ};z.fQ=B(){A 2h=z.3E();A 3g=z.1W;A de=z.1e.5K;C{y:(3g.lK||de.5G||2h.5G||0),x:(3g.lJ||z.aH(de.5I)||2h.5I||0)}};z.aG=B(){C V z.aI=="1k"?(z.aI=z.3F(z.3E()).lI=="lH"):z.aI};z.aB=B(){A de=z.1e.5K;if(z.1l>=7){C{x:de.aC().2g,y:de.aC().5J}}I{C{x:z.aG()||26.am==26?de.fW:de.6v-de.aF-de.fW,y:de.lG}}};z.aH=B(aE){if(z.1l&&!z.aG()){A de=z.1e.5K;C aE+de.aF-de.lF}C aE};z.fP=B(E,aw){A ay=E.aD;A J={x:0,y:0};A 7w=U;A db=z.3E();if(z.1l){A aA=E.aC();A az=z.aB();J.x=aA.2g-az.x;J.y=aA.5J-az.y}I{if(ay["fV"]){A bo=ay.fV(E);J.x=bo.x-5H(E,"5I");J.y=bo.y-5H(E,"5G")}I{if(E["fR"]){7w=K;A 7x;if(z.3o&&(1E(E).ax=="fU")&&(E.1L==db)){7x=db}I{7x=db.1L}if(E.1L!=db){A nd=E;if(z.2M){nd=db}J.x-=5H(nd,"5I");J.y-=5H(nd,"5G")}A 4f=E;do{A n=4f["fT"];if(!z.2M||n>0){J.x+=2L(n)?0:n}A m=4f["fS"];J.y+=2L(m)?0:m;4f=4f.fR}1s((4f!=7x)&&4f)}I{if(E["x"]&&E["y"]){J.x+=2L(E.x)?0:E.x;J.y+=2L(E.y)?0:E.y}}}}if(7w||aw){A av=z.fQ();A m=7w?(!aw?-1:0):1;J.y+=m*av.y;J.x+=m*av.x}C J};z.af=B(E,fO){A n=z.1D(E),s=1E(n),mb=z.au(n,s);A at=z.fP(n,fO);mb.x=at.x;mb.y=at.y;C mb}})();z.fL=B(E,fN){C((" "+E.3A+" ").T(" "+fN+" ")>=0)};z.7s=B(E,ar){A 7v=E.3A;if((" "+7v+" ").T(" "+ar+" ")<0){E.3A=7v+(7v?" ":"")+ar}};z.7r=B(E,fM){A t=z.7g((" "+E.3A+" ").2f(" "+fM+" "," "));if(E.3A!=t){E.3A=t}};z.lE=B(E,aq,7u){if(V 7u=="1k"){7u=!z.fL(E,aq)}z[7u?"7s":"7r"](E,aq)}}if(!z.1h["z.X.1H"]){z.1h["z.X.1H"]=K;z.1Q("z.X.1H");(B(){A d=z;z.1H=B(){A F=P;if((F.G==1)&&(V F[0]=="4J")){D.G=eK(F[0])}I{if(F.G){d.1n(F,B(i){D.Y(i)},D)}}};z.1H.1C=S 4e;if(d.1l){A fK=B(al){C("A a2 = am."+al+"; "+"A ap = 4e.1C; "+"A ao = a2.1C; "+"R(A x in ao){ ap[x] = ao[x]; } "+"am."+al+" = 4e; ")};A fI=fK("z.1H");A aj=26.lD();aj.1q.fJ(""+fI+"");aj.lC(1,1,1,1)}z.4M(z.1H,{T:B(fH,fG){C d.T(D,fH,fG)},31:B(lB,lA){A aa=d.4d(P);aa.ae(D);C d.31.14(d,aa)},ah:B(fF,fE){C d.ah(D,fF,fE)},ag:B(fD,fC){C d.ag(D,fD,fC)},1n:B(fB,fA){d.1n(D,fB,fA);C D},23:B(7t,M){C d.23(D,7t,M,d.1H)},af:B(){C d.23(D,d.af)},1c:B(lz,ly){A aa=d.4d(P);aa.ae(D[0]);A s=d.1c.14(d,aa);C(P.G>1)?D:s},lx:B(lw,lv){A aa=d.4d(P);aa.ae(L);A s=D.23(B(i){aa[0]=i;C d.1c.14(d,aa)});C(P.G>1)?D:s},7s:B(fz){C D.1n(B(i){z.7s(i,fz)})},7r:B(fy){C D.1n(B(i){z.7r(i,fy)})},5E:B(fw,7q){A 1m=d.1r(fw)[0];7q=7q||"72";R(A x=0;x=0){if(i[x]<1d){1d=i[x]}}}C(1d<0)?ql:1d};A 6X=B(7l){A i=2I(7l);if(i[0]!=-1){C 7l.21(i[0]+1,a0(7l,1))}I{C""}};A 5r=B(7k){A 5D;A i=2I(7k);if((i[0]==0)||(i[1]==0)){5D=0}I{5D=a0(7k,0)}C((5D>0)?7k.3b(0,5D).1M():"*")};A fg=B(Q){A J=-1;R(A x=0;x=0){if((1S>J)||(J==-1)){J=1S}}}C J};A 9H=B(7i){A i=2I(7i);if(-1==i[1]){C""}A di=i[1]+1;A 7j=fg(i.2w(2));if(di<7j){C 7i.21(di,7j)}I{if(-1==7j){C 7i.3b(di)}I{C""}}};A f3=[{1i:"|=",1f:B(15,fe){C"[5z(3U(\' \',@"+15+",\' \'), \' "+fe+"-\')]"}},{1i:"~=",1f:B(15,fd){C"[5z(3U(\' \',@"+15+",\' \'), \' "+fd+" \')]"}},{1i:"^=",1f:B(15,fb){C"[li-4G(@"+15+", \'"+fb+"\')]"}},{1i:"*=",1f:B(15,fa){C"[5z(@"+15+", \'"+fa+"\')]"}},{1i:"$=",1f:B(15,9Z){C"[21(@"+15+", 3c-G(@"+15+")-"+(9Z.G-1)+")=\'"+9Z+"\']"}},{1i:"!=",1f:B(15,f9){C"[3O(@"+15+"=\'"+f9+"\')]"}},{1i:"=",1f:B(15,f8){C"[@"+15+"=\'"+f8+"\']"}}];A 9C=B(9Y,3Z,f7,f6){A 49;A i=2I(3Z);if(i[2]>=0){A 4L=3Z.T("]",i[2]);A 29=3Z.21(i[2]+1,4L);1s(29&&29.G){if(29.2s(0)=="@"){29=29.2w(1)}49=L;R(A x=0;x<9Y.G;x++){A 1S=9Y[x];A 7h=29.T(1S.1i);if(7h>=0){A 15=29.21(0,7h);A 4a=29.21(7h+1S.1i.G);if((4a.2s(0)=="\\"")||(4a.2s(0)=="\'")){4a=4a.21(1,4a.G-1)}49=1S.1f(d.7g(15),d.7g(4a));3f}}if((!49)&&(29.G)){49=f7(29)}if(49){f6(49)}29=L;A 7f=3Z.T("[",4L);if(0<=7f){4L=3Z.T("]",7f);if(0<=4L){29=3Z.21(7f+1,4L)}}}}};A f0=B(f5){A 4K=".";A 7e=f5.1A(" ");1s(7e.G){A 2K=7e.3a();A 7d;if(2K==">"){7d="/";2K=7e.3a()}I{7d="//"}A f4=5r(2K);4K+=7d+f4;A id=6X(2K);if(id.G){4K+="[@id=\'"+id+"\'][1]"}A cn=9H(2K);if(cn.G){A 9X=" ";if(cn.2s(cn.G-1)=="*"){9X="";cn=cn.3b(0,cn.G-1)}4K+="[5z(3U(\' \',@9P,\' \'), \' "+cn+9X+"\')]"}9C(f3,2K,B(f2){C"[@"+f2+"]"},B(f1){4K+=f1})}C 4K};A 7a={};A eC=B(28){if(7a[28]){C 7a[28]}A 1e=d.1e;A 9W=f0(28);A 4H=B(9V){A J=[];A 7b;1u{7b=1e.9x(9W,9V,L,lh.lg,L)}1y(e){1z.1K("lf in le:",9W,"lc:",9V);1z.1K(e)}A 7c=7b.eZ();1s(7c){J.Y(7c);7c=7b.eZ()}C J};C 7a[28]=4H};A 5x={};A 9B={};A 3y=B(79,78){if(!79){C 78}if(!78){C 79}C B(){C 79.14(26,P)&&78.14(26,P)}};A 75=B(9U,3Y,5B,2J){A 2v=2J+1;A 76=(3Y.G==2v);A 2K=3Y[2J];if(2K==">"){A 77=9U.3W;if(!77.G){C}2v++;76=(3Y.G==2v);A 4H=6O(3Y[2J+1]);R(A x=0,11;x<77.G,11=77[x];x++){if(4H(11)){if(76){5B.Y(11)}I{75(11,3Y,5B,2v)}}}}A 5C=6U(2K)(9U);if(76){1s(5C.G){5B.Y(5C.3a())}}I{1s(5C.G){75(5C.3a(),3Y,5B,2v)}}};A eE=B(9T,eY){A J=[];A x=9T.G-1,11;1s(11=9T[x--]){75(11,eY,J,0)}C J};A 6O=B(3D){if(5x[3D]){C 5x[3D]}A ff=L;A 9S=5r(3D);if(9S!="*"){ff=3y(ff,B(N){C((N.2t==1)&&(9S==N.5w.1M()))})}A 9R=6X(3D);if(9R.G){ff=3y(ff,B(N){C((N.2t==1)&&(N.id==9R))})}if(2Y.5q.14(D,2I(3D).2w(1))>=0){ff=3y(ff,9z(3D))}C 5x[3D]=ff};A 5y=B(E){A pn=E.1L;A 9Q=pn.3W;A 2v=-1;A 3C=pn.5A;if(!3C){C 2v}A ci=E["eW"];A cl=pn["eX"];if(((V cl=="4J")&&(cl!=9Q.G))||(V ci!="4J")){pn["eX"]=9Q.G;A 2J=1;do{if(3C===E){2v=2J}if(3C.2t==1){3C["eW"]=2J;2J++}3C=3C.71}1s(3C)}I{2v=ci}C 2v};A lb=0;A 3X=B(N,15){A 74="";if(15=="9P"){C N.3A||74}if(15=="R"){C N.la||74}C N.5t(15,2)||74};A eH=[{1i:"|=",1f:B(15,9O){A eV=" "+9O+"-";C B(N){A ea=" "+(N.5t(15,2)||"");C((ea==9O)||(ea.T(eV)==0))}}},{1i:"^=",1f:B(15,eU){C B(N){C(3X(N,15).T(eU)==0)}}},{1i:"*=",1f:B(15,eT){C B(N){C(3X(N,15).T(eT)>=0)}}},{1i:"~=",1f:B(15,eS){A 9N=" "+eS+" ";C B(N){A ea=" "+3X(N,15)+" ";C(ea.T(9N)>=0)}}},{1i:"$=",1f:B(15,73){A 9N=" "+73;C B(N){A ea=" "+3X(N,15);C(ea.31(73)==(ea.G-73.G))}}},{1i:"!=",1f:B(15,eR){C B(N){C(3X(N,15)!=eR)}}},{1i:"=",1f:B(15,eQ){C B(N){C(3X(N,15)==eQ)}}}];A 9E=[{1i:"9M-9K",1f:B(1p,l9){C B(N){if(N.2t!=1){C U}A fc=N.eP;1s(fc&&(fc.2t!=1)){fc=fc.eP}C(!fc)}}},{1i:"72-9K",1f:B(1p,l8){C B(N){if(N.2t!=1){C U}A nc=N.71;1s(nc&&(nc.2t!=1)){nc=nc.71}C(!nc)}}},{1i:"l7",1f:B(1p,l6){C B(N){A cn=N.3W;A eO=N.3W.G;R(A x=eO-1;x>=0;x--){A nt=cn[x].2t;if((nt==1)||(nt==3)){C U}}C K}}},{1i:"5z",1f:B(1p,eN){C B(N){C(N.9L.T(eN)>=0)}}},{1i:"3O",1f:B(1p,eM){A eL=6O(eM);C B(N){C(!eL(N))}}},{1i:"l5-9K",1f:B(1p,2u){A pi=eK;if(2u=="l4"){C B(N){C(((5y(N))%2)==1)}}I{if((2u=="2n")||(2u=="l3")){C B(N){C((5y(N)%2)==0)}}I{if(2u.T("l2+")==0){A 70=pi(2u.3b(3));C B(N){C(N.1L.3W[70-1]===N)}}I{if((2u.T("n+")>0)&&(2u.G>3)){A 9J=2u.1A("n+",2);A eJ=pi(9J[0]);A 2J=pi(9J[1]);C B(N){C((5y(N)%eJ)==2J)}}I{if(2u.T("n")==-1){A 70=pi(2u);C B(N){C(5y(N)==70)}}}}}}}}];A 9z=B(3e){A 9I=(9B[3e]||5x[3e]);if(9I){C 9I}A ff=L;A i=2I(3e);if(i[0]>=0){A 24=5r(3e);if(24!="*"){ff=3y(ff,B(N){C(N.5w.1M()==24)})}}A 5u;A 3B=9H(3e);if(3B.G){A 9F=3B.2s(3B.G-1)=="*";if(9F){3B=3B.3b(0,3B.G-1)}A re=S 9G("(?:^|\\\\s)"+3B+(9F?".*":"")+"(?:\\\\s|$)");ff=3y(ff,B(N){C re.6Z(N.3A)})}if(i[3]>=0){A 3z=3e.3b(i[3]+1);A 9D="";A 5v=3z.T("(");A 6Y=3z.31(")");if((0<=5v)&&(0<=6Y)&&(6Y>5v)){9D=3z.21(5v+1,6Y);3z=3z.3b(0,5v)}5u=L;R(A x=0;x<9E.G;x++){A 1S=9E[x];if(1S.1i==3z){5u=1S.1f(3z,9D);3f}}if(5u){ff=3y(ff,5u)}}A eG=(d.1l)?B(5s){A eI=5s.1M();C B(N){C N[5s]||N[eI]}}:B(5s){C B(N){C(N&&N.5t&&N.l1(5s))}};9C(eH,3e,eG,B(eF){ff=3y(ff,eF)});if(!ff){ff=B(){C K}}C 9B[3e]=ff};A 6W={};A 6U=B(3d,1B){A 9A=6W[3d];if(9A){C 9A}A i=2I(3d);A id=6X(3d);if(i[0]==0){C 6W[3d]=B(1B){C[d.1D(id)]}}A 9y=9z(3d);A 5p;if(i[0]>=0){5p=B(1B){A 11=d.1D(id);if(9y(11)){C[11]}}}I{A 3V;A 24=5r(3d);if(2Y.5q.14(D,2I(3d))==-1){5p=B(1B){A J=[];A 11,x=0,3V=1B.4I(24);1s(11=3V[x++]){J.Y(11)}C J}}I{5p=B(1B){A J=[];A 11,x=0,3V=1B.4I(24);1s(11=3V[x++]){if(9y(11)){J.Y(11)}}C J}}}C 6W[3d]=5p};A l0={};A 5o={">":B(1B){A J=[];A 11,x=0,3V=1B.3W;1s(11=3V[x++]){if(11.2t==1){J.Y(11)}}C J}};A 9w=B(6V){if(0>6V.T(" ")){C 6U(6V)}A eD=B(1B){A 6S=6V.1A(" ");A 6T;if(6S[0]==">"){6T=[1B]}I{6T=6U(6S.3a())(1B)}C eE(6T,6S)};C eD};A 9v=((1q["9x"]&&!d.3o)?B(3x){A 6R=3x.1A(" ");if((1q["9x"])&&(3x.T(":")==-1)&&((K))){if(((6R.G>2)&&(3x.T(">")==-1))||(6R.G>3)||(3x.T("[")>=0)||((1==6R.G)&&(0<=3x.T(".")))){C eC(3x)}}C 9w(3x)}:9w);A ey=B(3w){if(5o[3w]){C 5o[3w]}if(0>3w.T(",")){C 5o[3w]=9v(3w)}I{A eB=3w.1A(/\\s*,\\s*/);A 4H=B(1B){A eA=0;A J=[];A 6Q;1s(6Q=eB[eA++]){J=J.3U(9v(6Q,6Q.T(" "))(1B))}C J};C 5o[3w]=4H}};A 5n=0;A ez=B(Q){A J=S d.1H();if(!Q){C J}if(Q[0]){J.Y(Q[0])}if(Q.G<2){C J}5n++;Q[0]["9u"]=5n;R(A x=1,11;11=Q[x];x++){if(Q[x]["9u"]!=5n){J.Y(11)}11["9u"]=5n}C J};d.1r=B(6P,1B){if(V 6P!="3c"){C S d.1H(6P)}if(V 1B=="3c"){1B=d.1D(1B)}C ez(ey(6P)(1B||d.1e))};d.9t=B(ex,9s){A 9r=S d.1H();A ff=(9s)?6O(9s):B(){C K};R(A x=0,11;11=ex[x];x++){if(ff(11)){9r.Y(11)}}C 9r}})()}if(!z.1h["z.X.1b"]){z.1h["z.X.1b"]=K;z.1Q("z.X.1b");z.6K=B(ew){A J={};A iq="kZ[Z!=9q][Z!=kY][Z!=et][Z!=kX][Z!=kW], kV, kU";z.1r(iq,ew).3T(B(E){C(!E.kT)}).1n(B(1m){A 3v=1m.1p;A Z=(1m.Z||"").1M();if((Z=="kS")||(Z=="kR")){if(1m.kQ){J[3v]=1m.1Z}}I{if(1m.kP){A ev=J[3v]=[];z.1r("kO[kN]",1m).1n(B(eu){ev.Y(eu.1Z)})}I{J[3v]=1m.1Z;if(Z=="et"){J[3v+".x"]=J[3v+".y"]=J[3v].x=J[3v].y=0}}}});C J};z.9h=B(23){A ec=kM;A J="";A es={};R(A x in 23){if(23[x]!=es[x]){if(z.2l(23[x])){R(A y=0;y<23[x].G;y++){J+=ec(x)+"="+ec(23[x][y])+"&"}}I{J+=ec(x)+"="+ec(23[x])+"&"}}}if((J.G)&&(J.2s(J.G-1)=="&")){J=J.3b(0,J.G-1)}C J};z.kL=B(er){C z.9h(z.6K(er))};z.kK=B(ep){C z.eq(z.6K(ep))};z.kJ=B(2H){A J={};A qp=2H.1A("&");A dc=kI;z.1n(qp,B(1m){if(1m.G){A 9p=1m.1A("=");A 1p=dc(9p.3a());A 1U=dc(9p.22("="));if(z.1R(J[1p])){J[1p]=[J[1p]]}if(z.2l(J[1p])){J[1p].Y(1U)}I{J[1p]=1U}}});C J};z.e1=U;z.e6={"9g":B(1b){C 1b.2G},"2e":B(1b){if(!1o.eo){1z.1K("kH kG kF a kE of 9g/2e-6M-9m"+" 4F kD kC kB kA 4G en kz"+" (ky 1o.eo=K 4F kx kw D kv)")}C z.5m(1b.2G)},"2e-6M-ku":B(1b){A 6N=1b.2G;A 9o=6N.T("/*");A 9n=6N.31("*/");if((9o==-1)||(9n==-1)){C z.5m(1b.2G)}C z.5m(6N.21(9o+2,9n))},"2e-6M-9m":B(1b){A 6L=1b.2G;A 9l=6L.T("/*");A 9k=6L.31("*/");if((9l==-1)||(9k==-1)){1z.1K("kt en ks\'t 6M 9m!");C""}C z.5m(6L.21(9l+2,9k))},"kr":B(1b){C z.3u(1b.2G)},"kq":B(1b){if(z.1l&&!1b.el){z.1n(["ko","em","kn","km"],B(i){1u{A 1e=S 9j(kl[i]+".kk");1e.kj=U;1e.ki(1b.2G);C 1e}1y(e){}})}I{C 1b.el}}};(B(){z.e5=B(F,ej,ei,eh){A 2F={};2F.F=F;A 6J=L;if(F.3R){A 3R=z.1D(F.3R);A 9i=3R.kh("kg");2F.2E=F.2E||(9i?9i.1Z:L);6J=z.6K(3R)}I{2F.2E=F.2E}A 5l=[{}];if(6J){5l.Y(6J)}if(F.5g){5l.Y(F.5g)}if(F.ek){5l.Y({"z.ek":S 5d().8O()})}2F.1r=z.9h(z.1x.14(L,5l));2F.9d=F.9d||"9g";A d=S z.30(ej);d.5k(ei,B(eg){C eh(eg,d)});A ld=F.4E;if(ld&&z.1Y(ld)){d.ef(B(ee){C ld.2d(F,ee,2F)})}A 1G=F.9f;if(1G&&z.1Y(1G)){d.ed(B(e9){C 1G.2d(F,e9,2F)})}A 6I=F.kf;if(6I&&z.1Y(6I)){d.9e(B(e8){C 6I.2d(F,e8,2F)})}d.1F=2F;C d};A e4=B(O){O.e0=K;A 1b=O.1F.1b;if(V 1b.e7=="B"){1b.e7()}};A e3=B(O){C z.e6[O.1F.9d](O.1F.1b)};A e2=B(9c,O){1z.1K(9c);C 9c};A 3Q=B(F){A O=z.e5(F,e4,e3,e2);O.1F.1b=z.9b(O.1F.F);C O};A 5j=L;A 3t=[];A 94=B(){A dZ=(S 5d()).dU();if(!z.e1){z.1n(3t,B(4D,6H){if(!4D){C}A O=4D.O;1u{if(!O||O.e0||!4D.dT(O)){3t.3S(6H,1);C}if(4D.dR(O)){3t.3S(6H,1);4D.dP(O)}I{if(O.9a){if(O.9a+(O.1F.F.6G||0)0){5c(z.2p(D,B(){D.5b(L,8R)}),d);C D}D.4A=S 5d().8O();if(D.2Z){D.4A-=D.8Q*D.2o}D.8N=D.4A+D.8Q;D.2D=K;D.2Z=U;A 8P=D.2C.4x(D.2o);if(!D.2o){if(!D.4y){D.4y=D.4z}D.3q("dt",[8P])}D.3q("ds",[8P]);D.8M();C D},jS:B(){5e(D.3r);if(!D.2D){C D}D.2Z=K;D.3q("dr",[D.2C.4x(D.2o)]);C D},jR:B(dq,dp){5e(D.3r);D.2D=D.2Z=K;D.2o=dq*6D;if(dp){D.5b()}C D},jQ:B(dn){if(!D.3r){C}5e(D.3r);if(dn){D.2o=1}D.3q("dm",[D.2C.4x(D.2o)]);D.2D=D.2Z=U;C D},3N:B(){if(D.2D){C D.2Z?"3M":"jP"}C"jO"},8M:B(){5e(D.3r);if(D.2D){A dl=S 5d().8O();A 2q=(dl-D.4A)/(D.8N-D.4A);if(2q>=1){2q=1}D.2o=2q;if(D.5a){2q=D.5a(2q)}D.3q("8B",[D.2C.4x(2q)]);if(2q<1){D.3r=5c(z.2p(D,"8M"),D.dj)}I{D.2D=U;if(D.4z>0){D.4z--;D.5b(L,K)}I{if(D.4z==-1){D.5b(L,K)}I{if(D.4y){D.4z=D.4y;D.4y=0}}}D.2o=0;D.3q("dh")}}C D}});(B(){A df=B(E){if(z.1l){A ns=E.1c;if(!ns.8L.G&&z.1c(E,"8L")=="dg"){ns.8L="1"}if(!ns.3n.G&&z.1c(E,"3n")=="8K"){ns.3n="8K"}}};z.6C=B(F){if(V F.1d=="1k"){2m S 1O("z.6C jN an 1d 1Z")}F.E=z.1D(F.E);A 3p=z.1x({6w:{}},F);A 8J=(3p.6w.2W={});8J.1w=(V 3p.1w=="1k")?B(){C 2V(z.1c(3p.E,"2W"))}:3p.1w;8J.1d=3p.1d;A 2U=z.6y(3p);z.2c(2U,"6x",L,B(){df(3p.E)});C 2U};z.8I=B(F){C z.6C(z.1x({1d:1},F))};z.8H=B(F){C z.6C(z.1x({1d:0},F))};if(z.6B&&!z.3o){z.8E=B(n){C 2k("0.5")+((2Y.da((n+2k("1.5"))*2Y.d9))/2)}}I{z.8E=B(n){C 0.5+((2Y.da((n+1.5)*2Y.d9))/2)}}A d4=B(6A){D.8G=6A;R(A p in 6A){A 1a=6A[p];if(1a.1w 1N z.1J){1a.d7=S z.1J()}}D.4x=B(r){A J={};R(A p in D.8G){A 1a=D.8G[p];A 6z=L;if(1a.1w 1N z.1J){6z=z.d8(1a.1w,1a.1d,r,1a.d7).8F()}I{if(!z.2l(1a.1w)){6z=((1a.1d-1a.1w)*r)+1a.1w+(p!="2W"?1a.jM||"px":"")}}J[p]=6z}C J}};z.6y=B(F){F.E=z.1D(F.E);if(!F.5a){F.5a=z.8E}A 2U=S z.d6(F);z.2c(2U,"6x",2U,B(){A pm={};R(A p in D.6w){A 1a=pm[p]=z.1x({},D.6w[p]);if(z.1Y(1a.1w)){1a.1w=1a.1w()}if(z.1Y(1a.1d)){1a.1d=1a.1d()}A d5=(p.1M().T("jL")>=0);B 8C(E,p){4w(p){2X"58":C E.8D;2X"3n":C E.6v}A v=z.1c(E,p);C(p=="2W")?2V(v):2k(v)};if(V 1a.1d=="1k"){1a.1d=8C(D.E,p)}I{if(V 1a.1w=="1k"){1a.1w=8C(D.E,p)}}if(d5){1a.1w=S z.1J(1a.1w);1a.1d=S z.1J(1a.1d)}I{1a.1w=(p=="2W")?2V(1a.1w):2k(1a.1w)}}D.2C=S d4(pm)});z.2c(2U,"8B",2U,B(8A){R(A s in 8A){z.1c(D.E,s,8A[s])}});C 2U}})()}',62,1711,'|||||||||||||||||||||||||||||||||||dojo|var|function|return|this|node|args|length|evt|else|ret|true|null|obj|elem|dfd|arguments|arr|for|new|indexOf|false|typeof||_base|push|type||te|||apply|attr|||||prop|xhr|style|end|doc|match|uri|_hasResource|key|del|undefined|isIE|item|forEach|djConfig|name|document|query|while|_66|try|res|start|mixin|catch|console|split|root|prototype|byId|gcs|ioArgs|err|NodeList|_p|Color|debug|parentNode|toLowerCase|instanceof|Error|constructor|provide|isString|ta|255|val|_a|global|_69|isFunction|value||substring|join|map|tn||window||path|_343|_220|_listeners|connect|call|json|replace|left|_b|toString|128|parseFloat|isArray|throw||_percent|hitch|step|declare|charAt|nodeType|_3c3|nidx|slice|faux|fired|_c4|_7e|loc|curve|_active|url|_44c|responseText|str|_312|idx|tqp|isNaN|isOpera|_22d|callee|add|_18b|_f8|_e2|_41|anim|Number|opacity|case|Math|_paused|Deferred|lastIndexOf|||||||||shift|substr|string|_3e7|_3ce|break|_w|charCode|_listener|_d5|_c5|authority|_49|width|isSafari|_49e|fire|_timer|_47b|_465|eval|_in|_40c|_409|_362|_3d9|className|_3d5|_386|_37a|body|getComputedStyle|box|_221|keyCode|remove|_8d|_46|paused|status|not|_478|_461|form|splice|filter|concat|tret|childNodes|_38b|_367|_33d||||||||||_340|_348|keypress|appendChild|_toArray|Array|_2b0|_toPixelValue|ref|_fixEvent|_19f|_14c|_14a|_150|_141|declaredClass|_d4|_99|_Url|_83|scheme|_67|_3d|switch|getValue|_startRepeatCount|repeat|_startTime|_47e|cancel|tif|load|to|with|tf|getElementsByTagName|number|_34c|_342|extend|_1e3|_normalizeEventName|_14b|_14e|results|self|cbfn|_f9|_d8|_b2|src|_88|dav||baseUrl|fragment|_loadedModules|_44|_43|_loaders|mll|height||easing|play|setTimeout|Date|clearTimeout|hdr|content|code|errback|_464|addCallbacks|_450|fromJson|_413|_3fc|_3ee|max|_31e|cond|getAttribute|_3d4|obi|tagName|_360|_381|contains|firstChild|_368|_372|_320|place|_2fa|scrollTop|_299|scrollLeft|top|documentElement|_288|_287|_getBorderExtents|_23f|_23d|_239|_218|_216|_211|eles|target|keys|shiftKey|ctrlKey|event|192|iel|_1db|delete|_1cf||addEventListener|String|_1af|_157|array|_14d|continue|_14f|_137|_11f|_106|_findMethod|has|_delegate|_dc|_d3|loaded|_9a|_loadInit|_inFlightCount|getObject|tv|_4f|_postLoad|_2d|offsetWidth|properties|beforeBegin|animateProperty|_4ad|_4a6|isKhtml|_fade|100|headers|readyState|timeout|_469|_457|_44d|formToObject|_441|comment|_43d|_36f|_419|tp|_40a|_406|_407|_373|_403|_3e6|_31b|cbi|test|_3c7|nextSibling|last|_3a1|_38e|_365|_36b|ecn|_364|_363|_356|_35e|_35f|_34f|_34d|_349|trim|tci|_328|_32b|_31f|_31c|_anim|_300|_2ff|_2f5|_2e7|removeClass|addClass|func|_2c4|cls|_2a9|_2ae|_280|_27f|_getPadExtents|isMoz|none|_233|cssText|_214|_fixCallback|_synthesizeEvent|stopPropagation|preventDefault|_setKeyChar|_1e1|ieh|_1d7|_1be|colorFromArray|sanitize|bits|rgb|_156|_fire|_resback|_13d|partial|_13a|silentlyCancelled|_topics|_127|_f1|_f0|superclass|_ec|_e3|mct|setObject|_bf|_b3|object|require|_92|_khtmlTimer|location|XMLHTTP|locale|dua|_71|_modulePrefixes|_55|_loadModule|_51|_50|_4e|pop|_3f|_callLoaded|_unloaders|_loadNotifying|_loadedUrls|_27|_24|_1d|_5|_4b7|onAnimate|getStyle|offsetHeight|_defaultEasing|toCss|_properties|fadeOut|fadeIn|_49f|auto|zoom|_cycle|_endTime|valueOf|_494|duration|_492|DELETE|_ioAddQueryToUrl|putData|contentType|password|user|_isDocumentOk|application|||||_466||||||startTime|_xhrObj|_45f|handleAs|addBoth|error|text|objectToQuery|_44f|ActiveXObject|_443|_442|filtered|_43f|_43e|_437|file|tnl|_41c|_filterQueryResult|_zipIdx|_408|_402|evaluate|_3ed|_380|fHit|_361|_33b|_3da|_3ab|_3d6|RegExp|_327|_3cf|_3c9|child|innerHTML|first|tval|_391|class|pnc|_37e|_37c|_375|_366|_35c|_35a|_353|_33c|_336|_314|||_315|_oe|_307|_309|cloneNode|after|createElement||_2f8|_2ef|_2ee|unshift|coords|some|every||_2cb|script|_2c9|parent||a2p||_2c3|_2bd||abs|_getMarginBox|_2b3|_2a6|position|_2a7|_2ac|_2ab|_getIeDocumentElementOffset|getBoundingClientRect|ownerDocument|_2a3|clientWidth|_isBodyLtr|_fixIeBiDiScrollLeft|_bodyLtr|_29d|_getContentBox|_setBox|_getMarginExtents|_getPadBorderExtents|_usesBorderBox|boxModel|pcs|st|sl|_240|runtimeStyle|_dcm|BackCompat|compatMode|default|_21b|_d|html|_event_listener|handlers|PAGE_DOWN|PAGE_UP|RIGHT_ARROW|LEFT_ARROW|DOWN_ARROW|UP_ARROW|_preventDefault||_stopPropagation|returnValue||_trySetKeyCode|cancelBubble|currentTarget|106|_1ee|111||_1e8|_1e7|||se|srcElement|onkeydown||_1d0|_disconnect|lid|_1c0|_connect|_set|_195|_185|_183|_17d|_everyOrSome|_16b|_172|_15b|Function|_154|_escapeString|_140|chain|_check|canceller|_12d|_124|_11a|_10d|_107|inherited|_fa|_f2|_findMixin|_constructor|preamble|_de|clone|tmp|_c7|TMP|_be|_ba|_mixin|isBrowser|lang|firebug||param|modulePaths|_a7|_fireCallback|_a0|setContext||_9c|unloaded||||_96|_93|navigator|_90|_89||protocol|_84|_86|_XMLHTTP_PROGIDS|gears|google|setAttribute|_80|_77|cfg|_6f|_getModuleSymbols|_5a|_58|_53|_4d|_4c|_45|_40|_moduleHasPrefix|_loadUri|_28|_26|_21|_22|tests|doh|_20|_1f|_1c|version|_1b|_19|_getProp|_11|_4|_4a5|_4b3|_Animation|tempColor|blendColors|PI|sin|||||_49a|normal|onEnd||rate||curr|onStop|_497||_496|pct|onPause|onPlay|onBegin|delay||_491|_Line|_48b|wrapForm|PUT|_487|POST|GET|_476|_474|_472|_ioWatch|send|_471|setRequestHeader|open|callback|setInterval|_470|resHandle|_46f|ioCheck|_46e|validCheck|getTime|_ioCancelAll|addOnUnload|clearInterval|dojoType|now|canceled|_blockAsync|_45e|_45c|_459|_ioSetArgs|_contentHandlers|abort|_458|_456||||addErrback|_454|addCallback|_452|_44b|_44a|_449|preventCache|responseXML|Microsoft|JSON|usePlainJson|_431|toJson|_430|_42d|image|opt|ria|_421|_41b|_40b|_zip|_410|_40d|_357|sqf|_374|_3e5|_3df|_38f|clc|pred|parseInt|ntf|_3bf|_3bc|cnl|previousSibling|_3a9|_3a6|_39c|_399|_396|_392|__cachedIndex|__cachedLength|_376|iterateNext|_34a|_355|_354|_32c|_350|_34b|_33f|_33e|_33a|_338|_334|_332||_330|_32e||_322|_316|mousemove|mouseout|mouseover|_305|lastChild||_2f9||_2f2|_2f1|removeChild|_2ec|_2eb|_2ea|_2e6||_2e4|_2e2|_2d6|_2d5|_2d4|_2d3|_2d2|_2d1|_2cd|_2cc|scs|write|_2c8|hasClass|_2c0|_2bb|_2b5|_abs|_docScroll|offsetParent|offsetTop|offsetLeft|absolute|getBoxObjectFor|clientLeft|_setContentSize|_setMarginBox|_28d|_286|_285|_289|NaN|_281|border|_272|_26b|_260|_258|_253|_24c|_246|_23a|_getOpacity|_setOpacity|_238|td|tr|nodeName|FILTER|_22f|_22e|currentStyle|_22c|_22b|display|QuirksMode|unselectable|_217|isMozilla|getElementById|attributes|all|_ie_listener|_getIeDispatcher|_1fd|NUM_LOCK|SCROLL_LOCK|INSERT|END|HOME|PAUSE|F12|F11|F10|F9|F8|F7|F6|F5|F4|F3|F2|F1|63232|SHIFT_TAB|TAB|keyIdentifier|_1f3|stopEvent|_punctMap|222|219|186|onkeypress|_stealthKeyDown|_fixKeys|relatedTarget|_1e0|_1df|_stealthKeydown|_1d6|_1d5|_1d1|_1ca|_1c9|_1cb|_1c2|_1c1|_1c3|_1c4|_1bc|_1b3|_1b2|colorFromHex|colorFromRgb|named|colorFromString|mask|rgba|_19c|_197|_192|setColor|_180|_178|_177|_175|_174|_16d|_166|_164|_163|_162|_15c|_15d|_15e|index|__json__|toJsonIndentStr|_nextId|_12f|_12b|publish|_128|_126|_125|_122|_121|_123|_11c|_11b|_10c|_10b|_108|getDispatcher|argument|nom|_construct|_core|_makeCtor|_df|_db|deprecated|isObject|_cc||scope||_hitchArgs|_c2||pre|_c1|native|isDebug||registerModulePath|_a8||finally|||_a6|_a5|_a4|_a3|_a2|_a1|_9f|_9e|_9d|_9b|_98|_97|onbeforeunload|ipt|scr|complete|_95|userAgent|_modulesLoaded|initialized|_initFired|_8c|_8a|_getText|_87|ieForceActiveXXhr|Msxml2|isGears|_81|_gearsObject|googlegears|GearsFactory|isFF|_7d|Safari|_72|_name|_6c|ire|ore|_68|i18n|_5b|requireIf|_56|_52|loading|_4a|_loadPath|_47|_48|_global_omit_module_check|_getModulePrefix|_3c|_3a|_37|_30|Boolean|_loadUriAndCheck|_2e||cacheBust|_1e|_1a|_17|_16|_15|_14|_f|_10|_e|_9|_8|revision|flag|patch|minor|major|_6|color|units|needs|stopped|playing|stop|gotoPercent|pause|1000|implemented|yet|_48a|xhrDelete|rawXhrPut|xhrPut|postData|rawXhrPost|xhrPost|xhrGet|Type|Content|sync|response|http|bad|urlencoded|www|_watchInFlightError||exceeded|handle|action|getAttributeNode|loadXML|async|XMLDOM|prefixes|MSXML3|MSXML|MSXML2||xml|javascript|wasn|your|optional|message|off|turn|use|endpoints|issues|security|potential|avoid|mimetype|using|consider|please|decodeURIComponent|queryToObject|formToJson|formToQuery|encodeURIComponent|selected|option|multiple|checked|checkbox|radio|disabled|textarea|select|button|reset|submit|input|_3fb|hasAttribute|0n|even|odd|nth|_3b5|empty|_3b1|_3ad|htmlFor|_38a|under||exprssion|failure|ANY_TYPE|XPathResult|starts|keyup|keydown|mouseup|mousedown|blur|click|combine|span|addContent||adopt|orphan|_2de|_2dd|styles|_2da|_2d9|_2cf|_2ce|show|createPopup|toggleClass|scrollWidth|clientTop|ltr|direction|pageXOffset|pageYOffset|fixed|contentBox|marginBox|BUTTON|TABLE|_getBorderBox|clientHeight|visible|overflow|marginBottom|marginRight|marginTop|marginLeft|borderBottomWidth|borderBottomStyle|borderRightWidth|borderRightStyle|borderTopWidth|borderTopStyle|borderLeftWidth|borderLeftStyle|paddingBottom|paddingRight|paddingTop|paddingLeft|offset||min|padding||margin|Opacity|Alpha|alpha|filters|pixelLeft|medium|_22a|defaultView|before||insertBefore|KhtmlUserSelect|MozUserSelect|setSelectable|isDescendant|div|_destroyElement|BackgroundImageCache|execCommand|PageDown|PageUp|Right|Left|Down|Up|63289|63249|63248|PRINT_SCREEN|63302|63277|63276|63275|63273|63272|63250|63247|63246|63245|63244|63243|63242|63241|63240|63239|63238|63237|63236|63235|63234|63233|Enter|_1f9|which|_1f6|bubbledKeyCode|221|220||||191|190|189|188|187|toElement|fromElement|clientY|pageY||clientX|pageX|offsetY|||layerY|offsetX|layerX|parentWindow|_nop|_allow_leaks|145|144|126|F15|125|F14|124|F13|123|122|121|120|119|118|117|116|115|114|113|112|NUMPAD_DIVIDE|110|NUMPAD_PERIOD|109|NUMPAD_MINUS|108|NUMPAD_ENTER|107|NUMPAD_PLUS|NUMPAD_MULTIPLY|105|NUMPAD_9|104|NUMPAD_8|103|NUMPAD_7|102|NUMPAD_6|101|NUMPAD_5|NUMPAD_4||NUMPAD_3|NUMPAD_2|NUMPAD_1|NUMPAD_0||SELECT|RIGHT_WINDOW||LEFT_WINDOW||HELP|SPACE|ESCAPE|CAPS_LOCK|ALT|CTRL|SHIFT|ENTER|CLEAR|BACKSPACE|attachEvent|fixEvent|fromCharCode|keyChar|_1b9|removeEventListener|0x|round|toHex|toRgba|toRgb|aqua|teal|blue|navy|yellow|olive|lime|green|fuchsia|purple|red|maroon|white|gray|silver|black|boolean|called|already|Cancelled|connectPublisher|unsubscribe|subscribe|disconnect|_113|_112||_111|_110|||found|was||must|_|module|||required|likely|It|declaration|Mixin|separate|instead|property|initializer||pass|_c9|_bb|_b7|nfunction|isAlien|isFinite|isArrayLike|_firebug|withDoc|withGlobal|_writeIncludes|VML|behavior|addRule|createStyleSheet|vml|com|microsoft|schemas|urn|namespaces|onunload|onreadystatechange|defer|khtml|WebKit|DOMContentLoaded|enableMozDomContentLoaded|domcontentloaded|Unable|base|chrome|1223|304|300|200|available|XMLHttpRequest|_println|language|userLanguage|isQuirks|factory|mimeTypes|Factory|Gears|_7f|MSIE||Firefox|Gecko|Konqueror||Opera|appVersion|xd|browser|moduleUrl|port|host|hostenv|_requireLocalization|_5f|_5e|_5d|_5c|requireLocalization|requireAfterIf|_57|common|platformRequire|defined|symbol|_isXDomain|tried|Could|__package__|packageFileName|_42|useXDomain|flight|still|files|addOnLoad|failed|sourceURL|util|notice|without|change|subject|APIs|EXPERIMENTAL|experimental|removed|will|DEPRECATED|exists|10315|Rev|Mobile|Spidermonkey|Rhino||Browser|delayMozLoadingFix|preventBackButtonFix|libraryScriptUri|baseRelativePath|baseScriptUri|allowQueryConfig|warn|trace|timeEnd||time|profileEnd|profile|log|info|groupEnd|group|dirxml|dir|count|assert'.split('|'),0,{}); /* diff --git a/build/sanitizers/lsan_suppressions.txt b/build/sanitizers/lsan_suppressions.txt index 6cde3dcd4f..78865b3049 100644 --- a/build/sanitizers/lsan_suppressions.txt +++ b/build/sanitizers/lsan_suppressions.txt @@ -1,4 +1,4 @@ -### !!! Please do not add suppressions for new leaks in Goanna code, unless they are intentional !!! +### !!! Please do not add suppressions for new leaks in Gecko code, unless they are intentional !!! ### ### Some of these leak in every test run. diff --git a/build/templates.mozbuild b/build/templates.mozbuild index c69096b0d6..1d99f3a27d 100644 --- a/build/templates.mozbuild +++ b/build/templates.mozbuild @@ -115,4 +115,4 @@ def HostLibrary(name): HOST_LIBRARY_NAME = name -include('goanna_templates.mozbuild') +include('gecko_templates.mozbuild') diff --git a/config/external/nss/moz.build b/config/external/nss/moz.build index c6cd836396..2dfa769415 100644 --- a/config/external/nss/moz.build +++ b/config/external/nss/moz.build @@ -10,7 +10,7 @@ if CONFIG['MOZ_NATIVE_NSS']: Library('nss') OS_LIBS += CONFIG['NSS_LIBS'] elif CONFIG['MOZ_FOLD_LIBS']: - GoannaSharedLibrary('nss', linkage=None) + GeckoSharedLibrary('nss', linkage=None) # TODO: The library name can be changed when bug 845217 is fixed. SHARED_LIBRARY_NAME = 'nss3' diff --git a/config/rules.mk b/config/rules.mk index 436a8c6bab..a4883930d0 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -1177,7 +1177,7 @@ endif #} XPT_NAME ifneq (,$(filter %.js,$(EXTRA_COMPONENTS) $(EXTRA_PP_COMPONENTS))) ifeq (,$(filter %.manifest,$(EXTRA_COMPONENTS) $(EXTRA_PP_COMPONENTS))) ifndef NO_JS_MANIFEST -$(error .js component without matching .manifest. See https://developer.mozilla.org/en/XPCOM/XPCOM_changes_in_Goanna_2.0) +$(error .js component without matching .manifest. See https://developer.mozilla.org/en/XPCOM/XPCOM_changes_in_Gecko_2.0) endif endif endif diff --git a/config/stl-headers b/config/stl-headers index 719c360461..dc7f6f0fb7 100644 --- a/config/stl-headers +++ b/config/stl-headers @@ -15,7 +15,7 @@ new # FIXME: these headers haven't been reviewed yet, but we use them -# unsafely in Goanna, so we might as well prevent them from +# unsafely in Gecko, so we might as well prevent them from # throwing exceptions algorithm atomic diff --git a/configure.in b/configure.in index 8771d444e6..5cae88e1f7 100644 --- a/configure.in +++ b/configure.in @@ -667,7 +667,7 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.]) MOZ_MSVC_STL_WRAP_RAISE=1 AC_DEFINE(MOZ_MSVC_STL_WRAP_RAISE) else - AC_MSG_ERROR([Goanna exception wrapping doesn't understand your your MSVC/SDK. Please file a bug describing this error and your build configuration.]) + AC_MSG_ERROR([Gecko exception wrapping doesn't understand your your MSVC/SDK. Please file a bug describing this error and your build configuration.]) fi fi @@ -2284,7 +2284,7 @@ ia64*-hpux*) dnl See https://connect.microsoft.com/VisualStudio/feedback/details/1044914/fatal-error-lnk1248 LDFLAGS="$LDFLAGS -MaxILKSize:0x7FF00000" fi - dnl Minimum reqiurement of Goanna is VS2010 or later which supports + dnl Minimum reqiurement of Gecko is VS2010 or later which supports dnl both SSSE3 and SSE4.1. HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1 HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=1 @@ -6264,7 +6264,7 @@ fi AC_SUBST(MOZ_CONTENT_SANDBOX) dnl ======================================================== -dnl = Goanna Media Plugin sandboxing +dnl = Gecko Media Plugin sandboxing dnl ======================================================== case $OS_TARGET in WINNT) diff --git a/docshell/base/nsIContentViewer.idl b/docshell/base/nsIContentViewer.idl index 9f774fabfa..507a5f41e2 100644 --- a/docshell/base/nsIContentViewer.idl +++ b/docshell/base/nsIContentViewer.idl @@ -181,7 +181,7 @@ interface nsIContentViewer : nsISupports /** * Returns whether this content viewer is in a hidden state. * - * @note Only Goanna internal code should set the attribute! + * @note Only Gecko internal code should set the attribute! */ attribute boolean isHidden; diff --git a/docshell/base/nsIGlobalHistory2.idl b/docshell/base/nsIGlobalHistory2.idl index 5967068028..aa8b446205 100644 --- a/docshell/base/nsIGlobalHistory2.idl +++ b/docshell/base/nsIGlobalHistory2.idl @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /** - * Provides information about global history to goanna. + * Provides information about global history to gecko. * * @note This interface replaces and deprecates nsIGlobalHistory. */ diff --git a/docshell/base/nsIWebNavigationInfo.idl b/docshell/base/nsIWebNavigationInfo.idl index 098058e1d2..cb6035650f 100644 --- a/docshell/base/nsIWebNavigationInfo.idl +++ b/docshell/base/nsIWebNavigationInfo.idl @@ -9,7 +9,7 @@ interface nsIWebNavigation; /** * The nsIWebNavigationInfo interface exposes a way to get information - * on the capabilities of Goanna webnavigation objects. + * on the capabilities of Gecko webnavigation objects. */ [scriptable, uuid(62a93afb-93a1-465c-84c8-0432264229de)] interface nsIWebNavigationInfo : nsISupports diff --git a/dom/alarm/AlarmService.jsm b/dom/alarm/AlarmService.jsm index a73a93e19a..2cc80d21ff 100644 --- a/dom/alarm/AlarmService.jsm +++ b/dom/alarm/AlarmService.jsm @@ -44,8 +44,8 @@ XPCOMUtils.defineLazyGetter(this, "powerManagerService", function() { * AlarmService is primarily used by the mozAlarms API (navigator.mozAlarms) * which uses IPC to communicate with the service. * - * AlarmService can also be used by Goanna code by importing the module and then - * using AlarmService.add() and AlarmService.remove(). Only Goanna code running + * AlarmService can also be used by Gecko code by importing the module and then + * using AlarmService.add() and AlarmService.remove(). Only Gecko code running * in the parent process should do this. */ diff --git a/dom/apps/AppsUtils.jsm b/dom/apps/AppsUtils.jsm index 6b94a3a1cd..11d77f6968 100644 --- a/dom/apps/AppsUtils.jsm +++ b/dom/apps/AppsUtils.jsm @@ -585,20 +585,20 @@ this.AppsUtils = { isFirstRun: function isFirstRun(aPrefBranch) { let savedmstone = null; try { - savedmstone = aPrefBranch.getCharPref("goanna.mstone"); + savedmstone = aPrefBranch.getCharPref("gecko.mstone"); } catch (e) {} let mstone = Services.appinfo.platformVersion; let savedBuildID = null; try { - savedBuildID = aPrefBranch.getCharPref("goanna.buildID"); + savedBuildID = aPrefBranch.getCharPref("gecko.buildID"); } catch (e) {} let buildID = Services.appinfo.platformBuildID; - aPrefBranch.setCharPref("goanna.mstone", mstone); - aPrefBranch.setCharPref("goanna.buildID", buildID); + aPrefBranch.setCharPref("gecko.mstone", mstone); + aPrefBranch.setCharPref("gecko.buildID", buildID); return ((mstone != savedmstone) || (buildID != savedBuildID)); }, diff --git a/dom/apps/InterAppComm.cpp b/dom/apps/InterAppComm.cpp index 68f6510b96..77912ac1b7 100644 --- a/dom/apps/InterAppComm.cpp +++ b/dom/apps/InterAppComm.cpp @@ -22,7 +22,7 @@ InterAppComm::EnabledForScope(JSContext* /* unused */, return false; } - // Only expose the constructors to the chrome codes for Goanna internal uses. + // Only expose the constructors to the chrome codes for Gecko internal uses. // The content pages shouldn't be aware of the constructors. return nsContentUtils::ThreadsafeIsCallerChrome(); } diff --git a/dom/audiochannel/nsIAudioChannelAgent.idl b/dom/audiochannel/nsIAudioChannelAgent.idl index 5d17c607b1..e990d3959a 100644 --- a/dom/audiochannel/nsIAudioChannelAgent.idl +++ b/dom/audiochannel/nsIAudioChannelAgent.idl @@ -27,8 +27,8 @@ interface nsIAudioChannelAgentCallback : nsISupports }; /** - * This interface provides an agent for goanna components to participate - * in the audio channel service. Goanna components are responsible for + * This interface provides an agent for gecko components to participate + * in the audio channel service. Gecko components are responsible for * 1. Indicating what channel type they are using (via the init() member * function). * 2. Before playing, checking the playable status of the channel. @@ -36,7 +36,7 @@ interface nsIAudioChannelAgentCallback : nsISupports * 4. Notifying the agent of changes to the visibility of the component using * this channel. * - * The agent will invoke a callback to notify Goanna components of + * The agent will invoke a callback to notify Gecko components of * 1. Changes to the playable status of this channel. */ @@ -72,7 +72,7 @@ interface nsIAudioChannelAgent : nsISupports * Audio Channel Type listed as above * @param callback * 1. Once the playable status changes, agent uses this callback function - * to notify Goanna component. + * to notify Gecko component. * 2. The callback is allowed to be null. Ex: telephony doesn't need to * listen change of the playable status. * 3. The AudioChannelAgent keeps a strong reference to the callback @@ -103,7 +103,7 @@ interface nsIAudioChannelAgent : nsISupports /** * Notify the agent that we want to start playing. - * Note: Goanna component SHOULD call this function first then start to + * Note: Gecko component SHOULD call this function first then start to * play audio stream only when return value is true. * * diff --git a/dom/audiochannel/tests/moz.build b/dom/audiochannel/tests/moz.build index bfd6318a48..b1bf003ce1 100644 --- a/dom/audiochannel/tests/moz.build +++ b/dom/audiochannel/tests/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -GoannaCppUnitTests([ +GeckoCppUnitTests([ 'TestAudioChannelService', ]) diff --git a/dom/base/FragmentOrElement.cpp b/dom/base/FragmentOrElement.cpp index 0ab83df2f7..c70890f324 100644 --- a/dom/base/FragmentOrElement.cpp +++ b/dom/base/FragmentOrElement.cpp @@ -2528,7 +2528,7 @@ ShouldEscape(nsIContent* aParent) // Per the current spec noscript should be escaped in case // scripts are disabled or if document doesn't have // browsing context. However the latter seems to be a spec bug - // and Goanna hasn't traditionally done the former. + // and Gecko hasn't traditionally done the former. nsGkAtoms::noscript }; static mozilla::BloomFilter<12, nsIAtom> sFilter; diff --git a/dom/base/NodeInfo.h b/dom/base/NodeInfo.h index 63f5019bb3..b1291e7777 100644 --- a/dom/base/NodeInfo.h +++ b/dom/base/NodeInfo.h @@ -135,8 +135,8 @@ public: } /** - * Get the owning node info manager. Only to be used inside Goanna, you can't - * really do anything with the pointer outside Goanna anyway. + * Get the owning node info manager. Only to be used inside Gecko, you can't + * really do anything with the pointer outside Gecko anyway. */ nsNodeInfoManager* NodeInfoManager() const { diff --git a/dom/base/ScreenOrientation.h b/dom/base/ScreenOrientation.h index 8a61f59e3b..40c501f444 100644 --- a/dom/base/ScreenOrientation.h +++ b/dom/base/ScreenOrientation.h @@ -11,7 +11,7 @@ namespace mozilla { namespace dom { // Make sure that any change here is also made in -// * mobile/android/base/GoannaScreenOrientationListener.java +// * mobile/android/base/GeckoScreenOrientationListener.java typedef uint32_t ScreenOrientation; static const ScreenOrientation eScreenOrientation_None = 0; diff --git a/dom/base/ScriptSettings.cpp b/dom/base/ScriptSettings.cpp index ce20176b16..a2d66db655 100644 --- a/dom/base/ScriptSettings.cpp +++ b/dom/base/ScriptSettings.cpp @@ -163,7 +163,7 @@ ScriptSettingsStackEntry::~ScriptSettingsStackEntry() // |SpecialPowers.wrap(crossOriginWindow).eval(open())| // // trigger this case. Although both the entry global and the current global -// have normal principals, the use of Goanna-specific System-Principaled JS +// have normal principals, the use of Gecko-specific System-Principaled JS // puts the code from two different origins on the callstack at once, which // doesn't happen normally on the web. static nsIGlobalObject* diff --git a/dom/base/ScriptSettings.h b/dom/base/ScriptSettings.h index 2e5fd5bf74..e8a9704c8c 100644 --- a/dom/base/ScriptSettings.h +++ b/dom/base/ScriptSettings.h @@ -407,7 +407,7 @@ protected: // We need this Init() method because we can't use delegating constructor for // the moment. It is a C++11 feature and we do not require C++11 to be - // supported to be able to compile Goanna. + // supported to be able to compile Gecko. void Init(bool aSafe MOZ_GUARD_OBJECT_NOTIFIER_PARAM); JSContext* mCx; diff --git a/dom/base/WindowNamedPropertiesHandler.cpp b/dom/base/WindowNamedPropertiesHandler.cpp index 3505a0949e..644a36197f 100644 --- a/dom/base/WindowNamedPropertiesHandler.cpp +++ b/dom/base/WindowNamedPropertiesHandler.cpp @@ -62,7 +62,7 @@ ShouldExposeChildWindow(nsString& aNameBeingResolved, nsIDOMWindow *aChild) // "dolske". // // Unfortunately, (c) would require some engineering effort to be performant - // in Goanna, and probably in other UAs as well. So we go with a simpler + // in Gecko, and probably in other UAs as well. So we go with a simpler // approximation of the above. This approximation will only break sites that // rely on their cross-origin subframes setting window.name to a known value, // which is unlikely to be very common. And while it does introduce a diff --git a/dom/base/nsContentCreatorFunctions.h b/dom/base/nsContentCreatorFunctions.h index 474e5c312d..473ed32a43 100644 --- a/dom/base/nsContentCreatorFunctions.h +++ b/dom/base/nsContentCreatorFunctions.h @@ -12,7 +12,7 @@ #include "mozilla/dom/FromParser.h" /** - * Functions to create content, to be used only inside Goanna + * Functions to create content, to be used only inside Gecko * (mozilla/content and mozilla/layout). */ diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 2453e0e5e8..4676a5a524 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -487,7 +487,7 @@ public: /** * Convert aInput (in encoding aEncoding) to UTF16 in aOutput. * - * @param aEncoding the Goanna-canonical name of the encoding or the empty + * @param aEncoding the Gecko-canonical name of the encoding or the empty * string (meaning UTF-8) */ static nsresult ConvertStringFromEncoding(const nsACString& aEncoding, diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index ee79243b26..022d06c066 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -2315,7 +2315,7 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx, } struct InterfaceShimEntry { - const char *goannaName; + const char *geckoName; const char *domName; }; @@ -2379,7 +2379,7 @@ LookupComponentsShim(JSContext *cx, JS::Handle global, for (uint32_t i = 0; i < ArrayLength(kInterfaceShimMap); ++i) { // Grab the names from the table. - const char *goannaName = kInterfaceShimMap[i].goannaName; + const char *geckoName = kInterfaceShimMap[i].geckoName; const char *domName = kInterfaceShimMap[i].domName; // Look up the appopriate interface object on the global. @@ -2392,7 +2392,7 @@ LookupComponentsShim(JSContext *cx, JS::Handle global, } // Define the shim on the interfaces object. - ok = JS_DefineProperty(cx, interfaces, goannaName, v, + ok = JS_DefineProperty(cx, interfaces, geckoName, v, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY, JS_STUBGETTER, JS_STUBSETTER); NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); diff --git a/dom/base/nsDOMMutationObserver.h b/dom/base/nsDOMMutationObserver.h index 2c79913962..251dbf24b5 100644 --- a/dom/base/nsDOMMutationObserver.h +++ b/dom/base/nsDOMMutationObserver.h @@ -279,7 +279,7 @@ protected: nsINode* mTarget; nsDOMMutationObserver* mObserver; nsRefPtr mParent; // Cleared after microtask. - // The node to which Goanna-internal nsIMutationObserver was registered to. + // The node to which Gecko-internal nsIMutationObserver was registered to. // This is different than mTarget when dealing with transient observers. nsINode* mRegisterTarget; nsCOMArray mTransientReceivers; diff --git a/dom/base/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp index 47848c77c5..ac690e3fc9 100644 --- a/dom/base/nsFrameMessageManager.cpp +++ b/dom/base/nsFrameMessageManager.cpp @@ -815,7 +815,7 @@ NS_IMETHODIMP nsFrameMessageManager::Dump(const nsAString& aStr) { #ifdef ANDROID - __android_log_print(ANDROID_LOG_INFO, "Goanna", "%s", NS_ConvertUTF16toUTF8(aStr).get()); + __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", NS_ConvertUTF16toUTF8(aStr).get()); #endif #ifdef XP_WIN if (IsDebuggerPresent()) { diff --git a/dom/base/nsHistory.cpp b/dom/base/nsHistory.cpp index 743a1c62ff..09d54d6068 100644 --- a/dom/base/nsHistory.cpp +++ b/dom/base/nsHistory.cpp @@ -159,7 +159,7 @@ nsHistory::Go(int32_t aDelta, ErrorResult& aRv) // 4.x needed it, but we don't, and it's a horrible experience // for nothing. In stead of reloading the page, just clear // style data and reflow the page since some sites may use this - // trick to work around goanna reflow bugs, and this should have + // trick to work around gecko reflow bugs, and this should have // the same effect. nsCOMPtr doc = window->GetExtantDoc(); diff --git a/dom/base/nsIContentPolicy.idl b/dom/base/nsIContentPolicy.idl index 7995ff98d7..ad2f5b4e20 100644 --- a/dom/base/nsIContentPolicy.idl +++ b/dom/base/nsIContentPolicy.idl @@ -50,12 +50,12 @@ interface nsIContentPolicy : nsIContentPolicyBase * attribute); does not reliably reflect the * actual MIME type of the requested content * - * @param aExtra an OPTIONAL argument, pass-through for non-Goanna + * @param aExtra an OPTIONAL argument, pass-through for non-Gecko * callers to pass extra data to callees. * * @param aRequestPrincipal an OPTIONAL argument, defines the principal that * caused the load. This is optional only for - * non-goanna code: all goanna code should set this + * non-gecko code: all gecko code should set this * argument. For navigation events, this is * the principal of the page that caused this load. * @@ -112,7 +112,7 @@ interface nsIContentPolicy : nsIContentPolicyBase * if available (may be empty if inappropriate for * the type, e.g., TYPE_REFRESH). * - * @param aExtra an OPTIONAL argument, pass-through for non-Goanna + * @param aExtra an OPTIONAL argument, pass-through for non-Gecko * callers to pass extra data to callees. * * @return ACCEPT or REJECT_* diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h index 81fe755ad6..492bda916e 100644 --- a/dom/base/nsIDocument.h +++ b/dom/base/nsIDocument.h @@ -184,7 +184,7 @@ NS_GetContentList(nsINode* aRootNode, //---------------------------------------------------------------------- // Document interface. This is implemented by all document objects in -// Goanna. +// Gecko. class nsIDocument : public nsINode { typedef mozilla::dom::GlobalObject GlobalObject; @@ -866,7 +866,7 @@ public: * front. * * By "built-in" user-agent style sheets we mean the user-agent style sheets - * that goanna itself supplies (such as html.css and svg.css) as opposed to + * that gecko itself supplies (such as html.css and svg.css) as opposed to * user-agent level style sheets inserted by add-ons or the like. * * This function prepends the given style sheet to the document's style set @@ -1268,8 +1268,8 @@ public: } /** - * Only to be used inside Goanna, you can't really do anything with the - * pointer outside Goanna anyway. + * Only to be used inside Gecko, you can't really do anything with the + * pointer outside Gecko anyway. */ nsNodeInfoManager* NodeInfoManager() const { diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp index bda135bd4a..84dbc7e5f6 100644 --- a/dom/base/nsJSUtils.cpp +++ b/dom/base/nsJSUtils.cpp @@ -117,7 +117,7 @@ nsJSUtils::CompileFunction(AutoJSAPI& jsapi, mozilla::DebugOnly ctx = GetScriptContextFromJSContext(cx); MOZ_ASSERT_IF(ctx, ctx->IsContextInitialized()); - // Do the junk Goanna is supposed to do before calling into JSAPI. + // Do the junk Gecko is supposed to do before calling into JSAPI. for (size_t i = 0; i < aScopeChain.length(); ++i) { JS::ExposeObjectToActiveJS(aScopeChain[i]); } diff --git a/dom/base/nsLocation.cpp b/dom/base/nsLocation.cpp index 9d2fe26d7f..2b03d52106 100644 --- a/dom/base/nsLocation.cpp +++ b/dom/base/nsLocation.cpp @@ -948,7 +948,7 @@ nsLocation::Reload(bool aForceget) // resize event. Sites do this since Netscape 4.x needed it, but // we don't, and it's a horrible experience for nothing. In stead // of reloading the page, just clear style data and reflow the - // page since some sites may use this trick to work around goanna + // page since some sites may use this trick to work around gecko // reflow bugs, and this should have the same effect. nsCOMPtr doc = window->GetExtantDoc(); diff --git a/dom/base/nsScriptLoader.cpp b/dom/base/nsScriptLoader.cpp index 0feca4be6d..1c01c6f02a 100644 --- a/dom/base/nsScriptLoader.cpp +++ b/dom/base/nsScriptLoader.cpp @@ -677,7 +677,7 @@ nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement) } if (!aElement->GetParserCreated()) { // Violate the HTML5 spec in order to make LABjs and the "order" plug-in - // for RequireJS work with their Goanna-sniffed code path. See + // for RequireJS work with their Gecko-sniffed code path. See // http://lists.w3.org/Archives/Public/public-html/2010Oct/0088.html mNonAsyncExternalScriptInsertedRequests.AppendElement(request); if (!request->mLoading) { @@ -1234,7 +1234,7 @@ nsScriptLoader::ProcessPendingRequests() !mNonAsyncExternalScriptInsertedRequests[0]->mLoading) { // Violate the HTML5 spec and execute these in the insertion order in // order to make LABjs and the "order" plug-in for RequireJS work with - // their Goanna-sniffed code path. See + // their Gecko-sniffed code path. See // http://lists.w3.org/Archives/Public/public-html/2010Oct/0088.html request.swap(mNonAsyncExternalScriptInsertedRequests[0]); mNonAsyncExternalScriptInsertedRequests.RemoveElementAt(0); diff --git a/dom/base/nsTreeSanitizer.cpp b/dom/base/nsTreeSanitizer.cpp index 24954770c0..feb8362237 100644 --- a/dom/base/nsTreeSanitizer.cpp +++ b/dom/base/nsTreeSanitizer.cpp @@ -1320,7 +1320,7 @@ nsTreeSanitizer::SanitizeURL(mozilla::dom::Element* aElement, } else if (nsGkAtoms::cdgroup_ == aLocalName || nsGkAtoms::altimg_ == aLocalName || nsGkAtoms::definitionURL_ == aLocalName) { - // Goanna doesn't fetch these now and shouldn't in the future, but + // Gecko doesn't fetch these now and shouldn't in the future, but // in case someone goofs with these in the future, let's drop them. rv = NS_ERROR_FAILURE; } else { diff --git a/dom/base/test/moz.build b/dom/base/test/moz.build index 430d6587f7..af81ad2c0a 100644 --- a/dom/base/test/moz.build +++ b/dom/base/test/moz.build @@ -9,7 +9,7 @@ XPCSHELL_TESTS_MANIFESTS += [ 'unit_ipc/xpcshell.ini', ] -GoannaCppUnitTests([ +GeckoCppUnitTests([ 'TestCSPParser', 'TestGetURL', 'TestNativeXMLHttpRequest', diff --git a/dom/base/test/test_bug345339.html b/dom/base/test/test_bug345339.html index e2a83895e5..095696762f 100644 --- a/dom/base/test/test_bug345339.html +++ b/dom/base/test/test_bug345339.html @@ -33,7 +33,7 @@ function afterLoad() { iframeDoc.getElementById("select").selectedIndex = 1; iframeDoc.getElementById("radio2").checked = true; iframeDoc.getElementById("password").value = "123456"; - iframeDoc.getElementById("hidden").value = "goanna"; + iframeDoc.getElementById("hidden").value = "gecko"; SpecialPowers.wrap(iframeDoc).getElementById("file").mozSetFileArray([file]); @@ -55,7 +55,7 @@ function afterReload() { "radio button #2 value preserved"); isnot(iframeDoc.getElementById("password").value, "123456", "password field value forgotten"); - is(iframeDoc.getElementById("hidden").value, "goanna", + is(iframeDoc.getElementById("hidden").value, "gecko", "hidden field value preserved"); // The new file object isn't ===, but it's extensionally equal: diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py index fc97d2e056..36292a73b9 100644 --- a/dom/bindings/Codegen.py +++ b/dom/bindings/Codegen.py @@ -48,10 +48,10 @@ def isTypeCopyConstructible(type): CGUnionStruct.isUnionCopyConstructible(type)) or (type.isDictionary() and CGDictionary.isDictionaryCopyConstructible(type.inner)) or - # Interface types are only copy-constructible if they're Goanna + # Interface types are only copy-constructible if they're Gecko # interfaces. SpiderMonkey interfaces are not copy-constructible # because of rooting issues. - (type.isInterface() and type.isGoannaInterface())) + (type.isInterface() and type.isGeckoInterface())) def idlTypeNeedsCycleCollection(type): @@ -63,7 +63,7 @@ def idlTypeNeedsCycleCollection(type): type.isObject() or type.isSpiderMonkeyInterface()): return False - elif type.isCallback() or type.isGoannaInterface(): + elif type.isCallback() or type.isGeckoInterface(): return True elif type.isUnion(): return any(idlTypeNeedsCycleCollection(t) for t in type.flatMemberTypes) @@ -4720,7 +4720,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, holderArgs=holderArgs, dealWithOptional=isOptional and (not nullable or isOwningUnion)) - if type.isGoannaInterface(): + if type.isGeckoInterface(): assert not isEnforceRange and not isClamp descriptor = descriptorProvider.getDescriptor( @@ -5814,7 +5814,7 @@ def getWrapTemplateForType(type, descriptorProvider, result, successCode, return (code, False) - if type.isGoannaInterface() and not type.isCallbackInterface(): + if type.isGeckoInterface() and not type.isCallbackInterface(): descriptor = descriptorProvider.getDescriptor(type.unroll().inner.identifier.name) if type.nullable(): wrappingCode = ("if (!%s) {\n" % (result) + @@ -6146,7 +6146,7 @@ def getRetvalDeclarationForType(returnType, descriptorProvider, if returnType.nullable(): result = CGTemplatedType("Nullable", result) return result, None, None, None, None - if returnType.isGoannaInterface(): + if returnType.isGeckoInterface(): result = CGGeneric(descriptorProvider.getDescriptor( returnType.unroll().inner.identifier.name).nativeType) conversion = None @@ -6315,7 +6315,7 @@ class CGCallGenerator(CGThing): if needsConst(a): arg = CGWrapper(arg, pre="Constify(", post=")") # And convert NonNull to T& - if (((a.type.isGoannaInterface() or a.type.isCallback()) and not a.type.nullable()) or + if (((a.type.isGeckoInterface() or a.type.isCallback()) and not a.type.nullable()) or a.type.isDOMString()): arg = CGWrapper(arg, pre="NonNullHelper(", post=")") args.append(arg) @@ -6385,7 +6385,7 @@ class CGCallGenerator(CGThing): def getUnionMemberName(type): - if type.isGoannaInterface(): + if type.isGeckoInterface(): return type.inner.identifier.name if type.isEnum(): return type.inner.identifier.name @@ -6515,7 +6515,7 @@ def wrapTypeIntoCurrentCompartment(type, value, isMember=True): return CGList(memberWraps, "else ") if len(memberWraps) != 0 else None if (type.isString() or type.isPrimitive() or type.isEnum() or - type.isGoannaInterface() or type.isCallback() or type.isDate()): + type.isGeckoInterface() or type.isCallback() or type.isDate()): # All of these don't need wrapping return None @@ -6763,7 +6763,7 @@ class CGPerSignatureCall(CGThing): returnsNewObject = memberReturnsNewObject(self.idlNode) if (returnsNewObject and - self.returnType.isGoannaInterface()): + self.returnType.isGeckoInterface()): wrapCode += dedent( """ static_assert(!IsPointer::value, @@ -6937,7 +6937,7 @@ class CGMethodCall(CGThing): def filteredSignatures(signatures, descriptor): def typeExposedInWorkers(type): - return (not type.isGoannaInterface() or + return (not type.isGeckoInterface() or type.inner.isExposedInAnyWorker()) if descriptor.workers: # Filter out the signatures that should not be exposed in a @@ -8346,7 +8346,7 @@ class CGMemberJITInfo(CGThing): return "JSVAL_TYPE_OBJECT" if t.isMozMap(): return "JSVAL_TYPE_OBJECT" - if t.isGoannaInterface(): + if t.isGeckoInterface(): return "JSVAL_TYPE_OBJECT" if t.isString(): return "JSVAL_TYPE_STRING" @@ -8422,7 +8422,7 @@ class CGMemberJITInfo(CGThing): assert False if t.isSequence(): return "JSJitInfo::Object" - if t.isGoannaInterface(): + if t.isGeckoInterface(): return "JSJitInfo::Object" if t.isString(): return "JSJitInfo::String" @@ -8597,7 +8597,7 @@ def getUnionAccessorSignatureType(type, descriptorProvider): # Nested unions are unwrapped automatically into our flatMemberTypes. assert not type.isUnion() - if type.isGoannaInterface(): + if type.isGeckoInterface(): descriptor = descriptorProvider.getDescriptor( type.unroll().inner.identifier.name) typeName = CGGeneric(descriptor.nativeType) @@ -11048,7 +11048,7 @@ class CGDescriptor(CGThing): for m in methods: for sig in m.signatures(): for arg in sig[1]: - if (arg.type.isGoannaInterface() and + if (arg.type.isGeckoInterface() and not arg.type.inner.isExternal()): self._deps.add(arg.type.inner.filename()) @@ -12249,7 +12249,7 @@ class CGForwardDeclarations(CGWrapper): def forwardDeclareForType(t, workerness='both'): t = t.unroll() - if t.isGoannaInterface(): + if t.isGeckoInterface(): name = t.inner.identifier.name # Find and add the non-worker implementation, if any. if workerness != 'workeronly': @@ -12660,7 +12660,7 @@ class CGNativeMember(ClassMethod): else: defaultValue = "%s(0)" % enumName return enumName, defaultValue, "return ${declName};\n" - if type.isGoannaInterface(): + if type.isGeckoInterface(): iface = type.unroll().inner result = CGGeneric(self.descriptorProvider.getDescriptor( iface.identifier.name).prettyNativeType) @@ -12858,7 +12858,7 @@ class CGNativeMember(ClassMethod): # auto-wrapping in Nullable return CGUnionStruct.unionTypeDecl(type, isMember), True, False - if type.isGoannaInterface() and not type.isCallbackInterface(): + if type.isGeckoInterface() and not type.isCallbackInterface(): iface = type.unroll().inner argIsPointer = type.nullable() or iface.isExternal() forceOwningType = iface.isCallback() or isMember @@ -14750,7 +14750,7 @@ class CGEventGetter(CGNativeMember): def getMethodBody(self): type = self.member.type memberName = CGDictionary.makeMemberName(self.member.identifier.name) - if (type.isPrimitive() and type.tag() in builtinNames) or type.isEnum() or type.isGoannaInterface(): + if (type.isPrimitive() and type.tag() in builtinNames) or type.isEnum() or type.isGeckoInterface(): return "return " + memberName + ";\n" if type.isDOMString() or type.isByteString() or type.isUSVString(): return "aRetVal = " + memberName + ";\n" @@ -15150,7 +15150,7 @@ class CGEventClass(CGBindingImplClass): nativeType = CGGeneric("nsString") elif type.isByteString(): nativeType = CGGeneric("nsCString") - elif type.isGoannaInterface(): + elif type.isGeckoInterface(): iface = type.unroll().inner nativeType = self.descriptor.getDescriptor( iface.identifier.name).nativeType @@ -15174,7 +15174,7 @@ class CGEventClass(CGBindingImplClass): innerType = type.inner if (not innerType.isPrimitive() and not innerType.isEnum() and not innerType.isDOMString() and not innerType.isByteString() and - not innerType.isGoannaInterface()): + not innerType.isGeckoInterface()): raise TypeError("Don't know how to properly manage GC/CC for " "event member of type %s" % type) diff --git a/dom/bindings/docs/index.rst b/dom/bindings/docs/index.rst index 7f76eb60b3..16a92b64db 100644 --- a/dom/bindings/docs/index.rst +++ b/dom/bindings/docs/index.rst @@ -13,7 +13,7 @@ Overview ======== ``.webidl`` files throughout the tree define interfaces the browser -implements. Since Goanna/Firefox is implemented in C++, there is a +implements. Since Gecko/Firefox is implemented in C++, there is a mechanism to convert these interfaces and associated metadata to C++ code. That's where the build system comes into play. diff --git a/dom/bindings/parser/WebIDL.py b/dom/bindings/parser/WebIDL.py index 0b9150cb1d..50a8dccfa8 100644 --- a/dom/bindings/parser/WebIDL.py +++ b/dom/bindings/parser/WebIDL.py @@ -1685,9 +1685,9 @@ class IDLType(IDLObject): def isNonCallbackInterface(self): return False - def isGoannaInterface(self): + def isGeckoInterface(self): """ Returns a boolean indicating whether this type is an 'interface' - type that is implemented in Goanna. At the moment, this returns + type that is implemented in Gecko. At the moment, this returns true for all interface types that are not types from the TypedArray spec.""" return self.isInterface() and not self.isSpiderMonkeyInterface() @@ -2527,7 +2527,7 @@ class IDLWrapperType(IDLType): if other.isSpiderMonkeyInterface(): # Just let |other| handle things return other.isDistinguishableFrom(self) - assert self.isGoannaInterface() and other.isGoannaInterface() + assert self.isGeckoInterface() and other.isGeckoInterface() if self.inner.isExternal() or other.unroll().inner.isExternal(): return self != other return (len(self.inner.interfacesBasedOnSelf & diff --git a/dom/bluetooth/BluetoothCommon.h b/dom/bluetooth/BluetoothCommon.h index 8f77b51e3a..2a80e1c214 100644 --- a/dom/bluetooth/BluetoothCommon.h +++ b/dom/bluetooth/BluetoothCommon.h @@ -47,7 +47,7 @@ extern bool gBluetoothDebugFlag; #define BT_LOGD(msg, ...) \ do { \ if (gBluetoothDebugFlag) { \ - __android_log_print(ANDROID_LOG_INFO, "GoannaBluetooth", \ + __android_log_print(ANDROID_LOG_INFO, "GeckoBluetooth", \ "%s: " msg, __FUNCTION__, ##__VA_ARGS__); \ } \ } while(0) @@ -56,7 +56,7 @@ extern bool gBluetoothDebugFlag; * Prints 'R'ELEASE build logs, which show in both RELEASE and DEBUG builds. */ #define BT_LOGR(msg, ...) \ - __android_log_print(ANDROID_LOG_INFO, "GoannaBluetooth", \ + __android_log_print(ANDROID_LOG_INFO, "GeckoBluetooth", \ "%s: " msg, __FUNCTION__, ##__VA_ARGS__) \ /** diff --git a/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp b/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp index 07ea8c94e8..913c5b08c7 100644 --- a/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp +++ b/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp @@ -694,7 +694,7 @@ BluetoothA2dpManager::NotifyConnectionStatusChanged() { MOZ_ASSERT(NS_IsMainThread()); - // Notify Goanna observers + // Notify Gecko observers nsCOMPtr obs = services::GetObserverService(); NS_ENSURE_TRUE_VOID(obs); diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h b/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h index 543b0684ca..81c0d841ff 100644 --- a/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h +++ b/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h @@ -110,9 +110,9 @@ struct BluetoothServiceName { // Conversion // // PDUs can only store primitive data types, such as intergers or -// strings. Goanna often uses more complex data types, such as +// strings. Gecko often uses more complex data types, such as // enumators or stuctures. Conversion functions convert between -// primitive data and internal Goanna's data types during a PDU's +// primitive data and internal Gecko's data types during a PDU's // packing and unpacking. // diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp b/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp index c86e8d484f..a642f10580 100644 --- a/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp +++ b/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp @@ -2035,17 +2035,17 @@ BluetoothDaemonInterface::CreateRandomAddressString( * listen socket. * * (2) Start the Bluetooth daemon: When the daemon starts up it will - * open two socket connections to Goanna and thus create the command - * and notification channels. Goanna already opened the listen socket + * open two socket connections to Gecko and thus create the command + * and notification channels. Gecko already opened the listen socket * in step (1). Step (2) ends with the creation of the command channel. * * (3) Start listening for the notification channel's socket connection: * At the end of step (2), the command channel was opened by the * daemon. In step (3), the daemon immediately tries to open the - * next socket for the notification channel. Goanna will accept the + * next socket for the notification channel. Gecko will accept the * incoming connection request for the notification channel. The * listen socket remained open after step (2), so there's no race - * condition between Goanna and the Bluetooth daemon. + * condition between Gecko and the Bluetooth daemon. * * (4)(5) Register Core and Socket modules: The Core and Socket modules * are always available and have to be registered after opening the diff --git a/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp b/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp index 8305afa067..c48dafe4df 100644 --- a/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp +++ b/dom/bluetooth/bluedroid/BluetoothHALInterface.cpp @@ -365,7 +365,7 @@ struct BluetoothOsCallout void* aData) { // FIXME: need to be implemented in later patches - // HAL wants to manage an wake_alarm but Goanna cannot fulfill it for now. + // HAL wants to manage an wake_alarm but Gecko cannot fulfill it for now. // Simply pass the request until a proper implementation has been added. return true; } @@ -374,7 +374,7 @@ struct BluetoothOsCallout AcquireWakeLock(const char* aLockName) { // FIXME: need to be implemented in later patches - // HAL wants to manage an wake_lock but Goanna cannot fulfill it for now. + // HAL wants to manage an wake_lock but Gecko cannot fulfill it for now. // Simply pass the request until a proper implementation has been added. return BT_STATUS_SUCCESS; } @@ -383,7 +383,7 @@ struct BluetoothOsCallout ReleaseWakeLock(const char* aLockName) { // FIXME: need to be implemented in later patches - // HAL wants to manage an wake_lock but Goanna cannot fulfill it for now. + // HAL wants to manage an wake_lock but Gecko cannot fulfill it for now. // Simply pass the request until a proper implementation has been added. return BT_STATUS_SUCCESS; } diff --git a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp index bffbcac3e8..7ef3edd043 100644 --- a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp @@ -536,7 +536,7 @@ BluetoothHfpManager::NotifyConnectionStateChanged(const nsAString& aType) { MOZ_ASSERT(NS_IsMainThread()); - // Notify Goanna observers + // Notify Gecko observers nsCOMPtr obs = do_GetService("@mozilla.org/observer-service;1"); NS_ENSURE_TRUE_VOID(obs); diff --git a/dom/bluetooth/bluetooth1/tests/marionette/test_dom_BluetoothManager_enabled.js b/dom/bluetooth/bluetooth1/tests/marionette/test_dom_BluetoothManager_enabled.js index 996eac6213..80febbc054 100644 --- a/dom/bluetooth/bluetooth1/tests/marionette/test_dom_BluetoothManager_enabled.js +++ b/dom/bluetooth/bluetooth1/tests/marionette/test_dom_BluetoothManager_enabled.js @@ -18,7 +18,7 @@ function waitEitherEnabledOrDisabled() { // Listen 'adapteradded' rather than 'enabled' since the current API can't // disable BT before the BT adapter is initialized. - // We should listen to 'enabled' when goanna can handle the case I mentioned + // We should listen to 'enabled' when gecko can handle the case I mentioned // above, please refer to the follow-up bug 973482. bluetoothManager.addEventListener("adapteradded", onEnabledDisabled); bluetoothManager.addEventListener("disabled", onEnabledDisabled); diff --git a/dom/bluetooth/bluez/BluetoothA2dpManager.cpp b/dom/bluetooth/bluez/BluetoothA2dpManager.cpp index f0aef6430f..098fe7918e 100644 --- a/dom/bluetooth/bluez/BluetoothA2dpManager.cpp +++ b/dom/bluetooth/bluez/BluetoothA2dpManager.cpp @@ -357,7 +357,7 @@ BluetoothA2dpManager::NotifyConnectionStatusChanged() { MOZ_ASSERT(NS_IsMainThread()); - // Notify Goanna observers + // Notify Gecko observers nsCOMPtr obs = services::GetObserverService(); NS_ENSURE_TRUE_VOID(obs); diff --git a/dom/bluetooth/bluez/BluetoothHfpManager.cpp b/dom/bluetooth/bluez/BluetoothHfpManager.cpp index de8bba9782..a48085ac85 100644 --- a/dom/bluetooth/bluez/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluez/BluetoothHfpManager.cpp @@ -516,7 +516,7 @@ BluetoothHfpManager::NotifyConnectionStatusChanged(const nsAString& aType) { MOZ_ASSERT(NS_IsMainThread()); - // Notify Goanna observers + // Notify Gecko observers nsCOMPtr obs = services::GetObserverService(); NS_ENSURE_TRUE_VOID(obs); diff --git a/dom/bluetooth2/bluedroid/BluetoothA2dpManager.cpp b/dom/bluetooth2/bluedroid/BluetoothA2dpManager.cpp index 4f7d2b2712..b1d6401bd5 100644 --- a/dom/bluetooth2/bluedroid/BluetoothA2dpManager.cpp +++ b/dom/bluetooth2/bluedroid/BluetoothA2dpManager.cpp @@ -706,7 +706,7 @@ BluetoothA2dpManager::NotifyConnectionStatusChanged() { MOZ_ASSERT(NS_IsMainThread()); - // Notify Goanna observers + // Notify Gecko observers nsCOMPtr obs = services::GetObserverService(); NS_ENSURE_TRUE_VOID(obs); diff --git a/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.h b/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.h index f5232c0358..533835caf1 100644 --- a/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.h +++ b/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.h @@ -110,9 +110,9 @@ struct BluetoothServiceName { // Conversion // // PDUs can only store primitive data types, such as integers or -// strings. Goanna often uses more complex data types, such as +// strings. Gecko often uses more complex data types, such as // enumerators or structures. Conversion functions convert between -// primitive data and internal Goanna's data types during a PDU's +// primitive data and internal Gecko's data types during a PDU's // packing and unpacking. // diff --git a/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.cpp b/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.cpp index a9aef2d6e8..aded08ac9b 100644 --- a/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.cpp +++ b/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.cpp @@ -2120,17 +2120,17 @@ BluetoothDaemonInterface::CreateRandomAddressString( * listen socket. * * (2) Start the Bluetooth daemon: When the daemon starts up it will - * open two socket connections to Goanna and thus create the command - * and notification channels. Goanna already opened the listen socket + * open two socket connections to Gecko and thus create the command + * and notification channels. Gecko already opened the listen socket * in step (1). Step (2) ends with the creation of the command channel. * * (3) Start listening for the notification channel's socket connection: * At the end of step (2), the command channel was opened by the * daemon. In step (3), the daemon immediately tries to open the - * next socket for the notification channel. Goanna will accept the + * next socket for the notification channel. Gecko will accept the * incoming connection request for the notification channel. The * listen socket remained open after step (2), so there's no race - * condition between Goanna and the Bluetooth daemon. + * condition between Gecko and the Bluetooth daemon. * * (4)(5) Register Core and Socket modules: The Core and Socket modules * are always available and have to be registered after opening the diff --git a/dom/bluetooth2/bluedroid/hfp/BluetoothHfpManager.cpp b/dom/bluetooth2/bluedroid/hfp/BluetoothHfpManager.cpp index 8e501edf07..7c06c302a1 100644 --- a/dom/bluetooth2/bluedroid/hfp/BluetoothHfpManager.cpp +++ b/dom/bluetooth2/bluedroid/hfp/BluetoothHfpManager.cpp @@ -532,7 +532,7 @@ BluetoothHfpManager::NotifyConnectionStateChanged(const nsAString& aType) { MOZ_ASSERT(NS_IsMainThread()); - // Notify Goanna observers + // Notify Gecko observers nsCOMPtr obs = do_GetService("@mozilla.org/observer-service;1"); NS_ENSURE_TRUE_VOID(obs); diff --git a/dom/bluetooth2/bluez/BluetoothA2dpManager.cpp b/dom/bluetooth2/bluez/BluetoothA2dpManager.cpp index b7a88e8bd1..cbf2abe9fc 100644 --- a/dom/bluetooth2/bluez/BluetoothA2dpManager.cpp +++ b/dom/bluetooth2/bluez/BluetoothA2dpManager.cpp @@ -357,7 +357,7 @@ BluetoothA2dpManager::NotifyConnectionStatusChanged() { MOZ_ASSERT(NS_IsMainThread()); - // Notify Goanna observers + // Notify Gecko observers nsCOMPtr obs = services::GetObserverService(); NS_ENSURE_TRUE_VOID(obs); diff --git a/dom/bluetooth2/bluez/BluetoothHfpManager.cpp b/dom/bluetooth2/bluez/BluetoothHfpManager.cpp index 4b8d1bd43a..ea6a98dbaf 100644 --- a/dom/bluetooth2/bluez/BluetoothHfpManager.cpp +++ b/dom/bluetooth2/bluez/BluetoothHfpManager.cpp @@ -513,7 +513,7 @@ BluetoothHfpManager::NotifyConnectionStatusChanged(const nsAString& aType) { MOZ_ASSERT(NS_IsMainThread()); - // Notify Goanna observers + // Notify Gecko observers nsCOMPtr obs = services::GetObserverService(); NS_ENSURE_TRUE_VOID(obs); diff --git a/dom/browser-element/BrowserElementPanning.js b/dom/browser-element/BrowserElementPanning.js index c83221d468..bb7a59d0d0 100644 --- a/dom/browser-element/BrowserElementPanning.js +++ b/dom/browser-element/BrowserElementPanning.js @@ -236,7 +236,7 @@ const ContentPanning = { } // !isPan() and evt.detail should always give the same answer here - // since they use the same heuristics, but use the native goanna + // since they use the same heuristics, but use the native gecko // computation when possible. // // NB: when we're using touch events, then !KineticPanning.isPan() diff --git a/dom/browser-element/BrowserElementParent.js b/dom/browser-element/BrowserElementParent.js index 795d6f8fe7..701dcd87b1 100644 --- a/dom/browser-element/BrowserElementParent.js +++ b/dom/browser-element/BrowserElementParent.js @@ -409,7 +409,7 @@ BrowserElementParent.prototype = { unblockMsgSent = true; // We don't need to sanitize evt.detail.returnValue (e.g. converting the - // return value of confirm() to a boolean); Goanna does that for us. + // return value of confirm() to a boolean); Gecko does that for us. let data = { windowID: windowID, returnValue: evt.detail.returnValue }; diff --git a/dom/browser-element/BrowserElementPromptService.jsm b/dom/browser-element/BrowserElementPromptService.jsm index d16691be6f..9830dd079e 100644 --- a/dom/browser-element/BrowserElementPromptService.jsm +++ b/dom/browser-element/BrowserElementPromptService.jsm @@ -130,7 +130,7 @@ BrowserElementPrompt.prototype = { defaultButton: -1, buttons: [], // This map is for translating array index to the button number that - // is recognized by Goanna. This shouldn't be exposed to embedder. + // is recognized by Gecko. This shouldn't be exposed to embedder. indexToButtonNumberMap: [] }; diff --git a/dom/camera/GonkCameraHwMgr.cpp b/dom/camera/GonkCameraHwMgr.cpp index 8c634f62dc..c9ad87e995 100644 --- a/dom/camera/GonkCameraHwMgr.cpp +++ b/dom/camera/GonkCameraHwMgr.cpp @@ -178,7 +178,7 @@ GonkCameraHardware::Init() /** * Non-V4L2-based camera driver adds extra offset onto picture orientation - * set by goanna, so we have to adjust it back. + * set by gecko, so we have to adjust it back. */ char propname[PROP_NAME_MAX]; char prop[PROP_VALUE_MAX]; diff --git a/dom/camera/GonkCameraParameters.h b/dom/camera/GonkCameraParameters.h index cd7f20cc68..72ddd0d223 100644 --- a/dom/camera/GonkCameraParameters.h +++ b/dom/camera/GonkCameraParameters.h @@ -287,7 +287,7 @@ protected: nsresult MapIsoFromGonk(const char* aIso, nsAString& aIsoOut); // Call once to initialize local cached values used in translating other - // arguments between Goanna and Gonk. Always returns NS_OK. + // arguments between Gecko and Gonk. Always returns NS_OK. nsresult Initialize(); // Returns true if we're a memory-constrained platform that requires diff --git a/dom/canvas/compiledtest/moz.build b/dom/canvas/compiledtest/moz.build index 1093c70ff0..e0728e373d 100644 --- a/dom/canvas/compiledtest/moz.build +++ b/dom/canvas/compiledtest/moz.build @@ -7,7 +7,7 @@ # http://support.microsoft.com/kb/143208 DEFINES['NOMINMAX'] = True -GoannaCppUnitTests([ +GeckoCppUnitTests([ 'TestWebGLElementArrayCache', ]) diff --git a/dom/datastore/DataStore.cpp b/dom/datastore/DataStore.cpp index b11d253221..6d2964d260 100644 --- a/dom/datastore/DataStore.cpp +++ b/dom/datastore/DataStore.cpp @@ -59,7 +59,7 @@ DataStore::EnabledForScope(JSContext* aCx, JS::Handle aObj) { // Only expose the interface when it is: // 1. enabled by the preference and - // 2. accessed by the chrome codes in Goanna. + // 2. accessed by the chrome codes in Gecko. return (Navigator::HasDataStoreSupport(aCx, aObj) && nsContentUtils::ThreadsafeIsCallerChrome()); } diff --git a/dom/encoding/EncodingUtils.h b/dom/encoding/EncodingUtils.h index 080bf16b71..5bfb254998 100644 --- a/dom/encoding/EncodingUtils.h +++ b/dom/encoding/EncodingUtils.h @@ -88,8 +88,8 @@ public: /** * Instantiates a decoder for an encoding. The input must be a - * Goanna-canonical encoding name. - * @param aEncoding a Goanna-canonical encoding name + * Gecko-canonical encoding name. + * @param aEncoding a Gecko-canonical encoding name * @return a decoder */ static already_AddRefed @@ -101,8 +101,8 @@ public: /** * Instantiates a decoder for an encoding. The input must be a - * Goanna-canonical encoding name - * @param aEncoding a Goanna-canonical encoding name + * Gecko-canonical encoding name + * @param aEncoding a Gecko-canonical encoding name * @return a decoder */ static already_AddRefed @@ -110,8 +110,8 @@ public: /** * Instantiates an encoder for an encoding. The input must be a - * Goanna-canonical encoding name. - * @param aEncoding a Goanna-canonical encoding name + * Gecko-canonical encoding name. + * @param aEncoding a Gecko-canonical encoding name * @return an encoder */ static already_AddRefed @@ -123,15 +123,15 @@ public: /** * Instantiates an encoder for an encoding. The input must be a - * Goanna-canonical encoding name. - * @param aEncoding a Goanna-canonical encoding name + * Gecko-canonical encoding name. + * @param aEncoding a Gecko-canonical encoding name * @return an encoder */ static already_AddRefed EncoderForEncoding(const nsACString& aEncoding); /** - * Finds a Goanna language group string (e.g. x-western) for a Goanna-canonical + * Finds a Gecko language group string (e.g. x-western) for a Gecko-canonical * encoding name. * * @param aEncoding, incoming label describing charset to be decoded. diff --git a/dom/encoding/TextDecoder.h b/dom/encoding/TextDecoder.h index 6afe4c2772..48ddda3a38 100644 --- a/dom/encoding/TextDecoder.h +++ b/dom/encoding/TextDecoder.h @@ -66,10 +66,10 @@ public: void Init(const nsAString& aLabel, const bool aFatal, ErrorResult& aRv); /** - * Performs initialization with a Goanna-canonical encoding name (as opposed + * Performs initialization with a Gecko-canonical encoding name (as opposed * to a label.) * - * @param aEncoding A Goanna-canonical encoding name + * @param aEncoding A Gecko-canonical encoding name * @param aFatal indicates whether to throw an 'EncodingError' * exception or not when decoding. */ diff --git a/dom/encoding/localesfallbacks.properties b/dom/encoding/localesfallbacks.properties index 66be9dbba6..e014034124 100644 --- a/dom/encoding/localesfallbacks.properties +++ b/dom/encoding/localesfallbacks.properties @@ -6,7 +6,7 @@ # that are associated with legacy encoding other than windows-1252 (except # Traditional Chinese, which is handled as a special case elsewhere). # -# The keys are language codes without regions. The values are Goanna-canonical +# The keys are language codes without regions. The values are Gecko-canonical # encoding labels (not necessarily lower case!). # # Rules: diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp index d9766a98a8..31e07dc291 100644 --- a/dom/events/Event.cpp +++ b/dom/events/Event.cpp @@ -1109,7 +1109,7 @@ Event::GetPreventDefault() const doc->WarnOnceAbout(nsIDocument::eGetPreventDefault); } } - // GetPreventDefault() is legacy and Goanna specific method. Although, + // GetPreventDefault() is legacy and Gecko specific method. Although, // the result should be same as defaultPrevented, we don't need to break // backward compatibility of legacy method. Let's behave traditionally. return DefaultPrevented(); diff --git a/dom/events/EventDispatcher.cpp b/dom/events/EventDispatcher.cpp index cb8ddc8ede..b669428f48 100644 --- a/dom/events/EventDispatcher.cpp +++ b/dom/events/EventDispatcher.cpp @@ -33,7 +33,7 @@ #include "mozilla/unused.h" #ifdef MOZ_TASK_TRACER -#include "GoannaTaskTracer.h" +#include "GeckoTaskTracer.h" #include "mozilla/dom/Element.h" using namespace mozilla::tasktracer; #endif diff --git a/dom/events/EventDispatcher.h b/dom/events/EventDispatcher.h index efeda73fb3..4fa9a13ecb 100644 --- a/dom/events/EventDispatcher.h +++ b/dom/events/EventDispatcher.h @@ -228,7 +228,7 @@ public: /** * The generic class for event dispatching. - * Must not be used outside Goanna! + * Must not be used outside Gecko! */ class EventDispatcher { diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h index 420807e810..d5cf69bf68 100644 --- a/dom/events/EventNameList.h +++ b/dom/events/EventNameList.h @@ -449,7 +449,7 @@ EVENT(paste, NS_PASTE, EventNameType_HTMLXUL, eClipboardEventClass) -// Goanna-specific extensions that apply to elements +// Gecko-specific extensions that apply to elements EVENT(beforescriptexecute, NS_BEFORE_SCRIPT_EXECUTE, EventNameType_HTMLXUL, diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index 36fd8a66a2..96f15d3a45 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -651,7 +651,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext, case NS_DRAGDROP_GESTURE: if (Prefs::ClickHoldContextMenu()) { // an external drag gesture event came in, not generated internally - // by Goanna. Make sure we get rid of the click-hold timer. + // by Gecko. Make sure we get rid of the click-hold timer. KillClickHoldTimer(); } break; diff --git a/dom/events/EventStateManager.h b/dom/events/EventStateManager.h index 84ed3a88a2..8e66b9578c 100644 --- a/dom/events/EventStateManager.h +++ b/dom/events/EventStateManager.h @@ -110,7 +110,7 @@ public: /** * DispatchLegacyMouseScrollEvents() dispatches NS_MOUSE_SCROLL event and - * NS_MOUSE_PIXEL_SCROLL event for compatiblity with old Goanna. + * NS_MOUSE_PIXEL_SCROLL event for compatiblity with old Gecko. */ void DispatchLegacyMouseScrollEvents(nsIFrame* aTargetFrame, WidgetWheelEvent* aEvent, diff --git a/dom/events/EventStates.h b/dom/events/EventStates.h index c936b7ca05..f869919db4 100644 --- a/dom/events/EventStates.h +++ b/dom/events/EventStates.h @@ -220,7 +220,7 @@ private: // Content is still loading such that there is nothing to show the // user (eg an image which hasn't started coming in yet). #define NS_EVENT_STATE_LOADING NS_DEFINE_EVENT_STATE_MACRO(22) -// Content is of a type that goanna can't handle. +// Content is of a type that gecko can't handle. #define NS_EVENT_STATE_TYPE_UNSUPPORTED NS_DEFINE_EVENT_STATE_MACRO(23) #define NS_EVENT_STATE_INCREMENT_SCRIPT_LEVEL NS_DEFINE_EVENT_STATE_MACRO(24) // Handler for the content has been blocked. diff --git a/dom/fetch/Headers.h b/dom/fetch/Headers.h index b8cab7c0ce..80ab86e503 100644 --- a/dom/fetch/Headers.h +++ b/dom/fetch/Headers.h @@ -26,7 +26,7 @@ class OwningHeadersOrByteStringSequenceSequenceOrByteStringMozMap; /** * This Headers class is only used to represent the content facing Headers - * object. It is actually backed by an InternalHeaders implementation. Goanna + * object. It is actually backed by an InternalHeaders implementation. Gecko * code should NEVER use this, except in the Request and Response * implementations, where they must always be created from the backing * InternalHeaders object. diff --git a/dom/fetch/InternalRequest.cpp b/dom/fetch/InternalRequest.cpp index 87095f74a4..9d51f3a31b 100644 --- a/dom/fetch/InternalRequest.cpp +++ b/dom/fetch/InternalRequest.cpp @@ -32,7 +32,7 @@ InternalRequest::GetRequestConstructorCopy(nsIGlobalObject* aGlobal, ErrorResult copy->mBodyStream = mBodyStream; copy->mForceOriginHeader = true; // The "client" is not stored in our implementation. Fetch API users should - // use the appropriate window/document/principal and other Goanna security + // use the appropriate window/document/principal and other Gecko security // mechanisms as appropriate. copy->mSameOriginDataURL = true; copy->mPreserveContentCodings = true; diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp index 805a1b50d6..6579131082 100644 --- a/dom/html/nsHTMLDocument.cpp +++ b/dom/html/nsHTMLDocument.cpp @@ -468,7 +468,7 @@ nsHTMLDocument::TryTLD(int32_t& aCharsetSource, nsACString& aCharset) } int32_t index = host.RFindChar('.'); if (index == kNotFound) { - // We have an intranet host, Goanna-internal URL or an IPv6 address. + // We have an intranet host, Gecko-internal URL or an IPv6 address. return; } // Since the string didn't end with a dot and we found a dot, diff --git a/dom/html/test/file_iframe_sandbox_d_if13.html b/dom/html/test/file_iframe_sandbox_d_if13.html index 129ab27eff..275490f874 100644 --- a/dom/html/test/file_iframe_sandbox_d_if13.html +++ b/dom/html/test/file_iframe_sandbox_d_if13.html @@ -25,7 +25,7 @@ function ok_wrapper(result, msg) { function doIf11TestPart2() { var if_11 = document.getElementById('if_11'); if_11.sandbox = 'allow-scripts allow-same-origin'; - // window.history is no longer cross-origin accessible in goanna. + // window.history is no longer cross-origin accessible in gecko. SpecialPowers.wrap(if_11).contentWindow.history.back(); } diff --git a/dom/html/test/test_bug607145.html b/dom/html/test/test_bug607145.html index 150d661667..f32fff18fd 100644 --- a/dom/html/test/test_bug607145.html +++ b/dom/html/test/test_bug607145.html @@ -18,7 +18,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=607145 /** * This is not really reflecting an URL as the HTML5 specs want to. - * It's how .action is reflected in Goanna (might change later). + * It's how .action is reflected in Gecko (might change later). * * If this changes, add reflectURL for "formAction" in * dom/html/test/forms/test_input_attributes_reflection.html and diff --git a/dom/imptests/editing/conformancetest/test_event.html b/dom/imptests/editing/conformancetest/test_event.html index 252a255884..7fdeb115ca 100644 --- a/dom/imptests/editing/conformancetest/test_event.html +++ b/dom/imptests/editing/conformancetest/test_event.html @@ -285,6 +285,6 @@ tests.forEach(function(obj) { }); }); -// Thanks, Goanna. +// Thanks, Gecko. document.body.bgColor = ""; diff --git a/dom/imptests/editing/css/reset.css b/dom/imptests/editing/css/reset.css index 7e187851a1..b711d724c3 100644 --- a/dom/imptests/editing/css/reset.css +++ b/dom/imptests/editing/css/reset.css @@ -17,7 +17,7 @@ dfn { font-style: italic } blockquote { margin: 1em 40px } /* Some tests assume links are blue, for the sake of argument, but they aren't * blue in any browser. And :visited definitely isn't blue, except in engines - * like Goanna that lie. + * like Gecko that lie. * * This should really be #00e, probably. See: * http://www.w3.org/Bugs/Public/show_bug.cgi?id=13330 */ diff --git a/dom/imptests/editing/selecttest/common.js b/dom/imptests/editing/selecttest/common.js index 02f5ebedf3..bea5594eda 100644 --- a/dom/imptests/editing/selecttest/common.js +++ b/dom/imptests/editing/selecttest/common.js @@ -891,7 +891,7 @@ function getDomExceptionName(e) { if (typeof e.name == "string" && /^[A-Z_]+_ERR$/.test(e.name)) { // Either following the standard, or prefixing NS_ERROR_DOM (I'm - // looking at you, Goanna). + // looking at you, Gecko). return e.name.replace(/^NS_ERROR_DOM_/, ""); } diff --git a/dom/imptests/editing/selecttest/test_addRange.html b/dom/imptests/editing/selecttest/test_addRange.html index 59a8c038fd..e31a0899e2 100644 --- a/dom/imptests/editing/selecttest/test_addRange.html +++ b/dom/imptests/editing/selecttest/test_addRange.html @@ -30,7 +30,7 @@ function testAddRange(exception, range, endpoints, qualifier, testName) { }, testName + ": " + qualifier + " addRange() must result in rangeCount being 1"); // From here on out we check selection.getRangeAt(selection.rangeCount - 1) - // so as not to double-fail Goanna. + // so as not to double-fail Gecko. test(function() { assert_equals(exception, null, "Test setup must not throw exceptions"); diff --git a/dom/imptests/editing/tests.js b/dom/imptests/editing/tests.js index a6bfbf0437..e0c9394b9c 100644 --- a/dom/imptests/editing/tests.js +++ b/dom/imptests/editing/tests.js @@ -52,7 +52,7 @@ if (typeof testsJsLibraryOnly == "undefined" || !testsJsLibraryOnly) { updateAlertRowStyle(); // Feature-test whether the browser wraps at or not, and set word-wrap: - // break-word where necessary if not. (IE and Opera don't wrap, Goanna and + // break-word where necessary if not. (IE and Opera don't wrap, Gecko and // WebKit do.) word-wrap: break-word will break anywhere at all, so it looks // significantly uglier. //@{ @@ -1705,7 +1705,7 @@ var tests = { indent: [ //@{ // All these have a trailing unselected paragraph, because otherwise - // Goanna is unhappy: it throws exceptions in non-CSS mode, and in CSS + // Gecko is unhappy: it throws exceptions in non-CSS mode, and in CSS // mode it adds the indentation invisibly to the wrapper div in many // cases. 'foo[]bar

extra', @@ -1746,7 +1746,7 @@ var tests = { '

foo

[bar]

baz

extra', // These mimic existing indentation in various browsers, to see how - // they cope with indenting twice. This is spec, Goanna non-CSS, and + // they cope with indenting twice. This is spec, Gecko non-CSS, and // Opera: '

foo[bar]

baz

extra', '

foo[bar

b]az

extra', @@ -3403,7 +3403,7 @@ var tests = { outdent: [ //@{ // These mimic existing indentation in various browsers, to see how - // they cope with outdenting various things. This is spec, Goanna + // they cope with outdenting various things. This is spec, Gecko // non-CSS, and Opera: '

foo[bar]

baz

extra', '

foo[bar

b]az

extra', @@ -5519,11 +5519,11 @@ function normalizeSerializedStyle(wrapper) { // Random spacing differences .replace(/; ?$/, "") .replace(/: /g, ":") - // Goanna likes "transparent" + // Gecko likes "transparent" .replace(/transparent/g, "rgba(0, 0, 0, 0)") // WebKit likes to look overly precise .replace(/, 0.496094\)/g, ", 0.5)") - // Goanna converts anything with full alpha to "transparent" which + // Gecko converts anything with full alpha to "transparent" which // then becomes "rgba(0, 0, 0, 0)", so we have to make other // browsers match .replace(/rgba\([0-9]+, [0-9]+, [0-9]+, 0\)/g, "rgba(0, 0, 0, 0)") diff --git a/dom/imptests/testharness.js b/dom/imptests/testharness.js index e6c929a3fe..a133672f8d 100644 --- a/dom/imptests/testharness.js +++ b/dom/imptests/testharness.js @@ -1217,7 +1217,7 @@ policies and contribution forms [3]. var message = (typeof e === "object" && e !== null) ? e.message : e; if (typeof e.stack != "undefined" && typeof e.message == "string") { //Try to make it more informative for some exceptions, at least - //in Goanna and WebKit. This results in a stack dump instead of + //in Gecko and WebKit. This results in a stack dump instead of //just errors like "Cannot read property 'parentNode' of null" //or "root is null". Makes it a lot longer, of course. message += "(stack: " + e.stack + ")"; diff --git a/dom/inputmethod/forms.js b/dom/inputmethod/forms.js index e7486bc7fa..f66ba2a3b9 100644 --- a/dom/inputmethod/forms.js +++ b/dom/inputmethod/forms.js @@ -737,7 +737,7 @@ let FormAssistant = { sendInputState: function(element) { // FIXME/bug 729623: work around apparent bug in the IME manager - // in goanna. + // in gecko. let readonly = element.getAttribute("readonly"); if (readonly) { return false; @@ -857,7 +857,7 @@ function getJSON(element, focusCounter) { } } - // Goanna has some support for @inputmode but behind a preference and + // Gecko has some support for @inputmode but behind a preference and // it is disabled by default. // Gaia is then using @x-inputmode has its proprietary way to set // inputmode for fields. This shouldn't be used outside of pre-installed diff --git a/dom/inputmethod/mochitest/test_bug944397.html b/dom/inputmethod/mochitest/test_bug944397.html index e8a01e45a1..faf0167967 100644 --- a/dom/inputmethod/mochitest/test_bug944397.html +++ b/dom/inputmethod/mochitest/test_bug944397.html @@ -78,7 +78,7 @@ function runTest() { allow: true, context: imeUrl }], function() { - // STEP 2c: Tell Goanna to use this iframe as its keyboard app + // STEP 2c: Tell Gecko to use this iframe as its keyboard app let req = keyboard.setInputMethodActive(true); req.onsuccess = function() { diff --git a/dom/interfaces/apps/mozIApplication.idl b/dom/interfaces/apps/mozIApplication.idl index 38d2c4a8b8..0056df3d31 100644 --- a/dom/interfaces/apps/mozIApplication.idl +++ b/dom/interfaces/apps/mozIApplication.idl @@ -8,7 +8,7 @@ #include "domstubs.idl" /** - * We expose Goanna-internal helpers related to "web apps" through this + * We expose Gecko-internal helpers related to "web apps" through this * sub-interface. */ [scriptable, uuid(1d856b11-ac29-47d3-bd52-a86e3d45fcf5)] diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl index 232d7b9538..7d72acc380 100644 --- a/dom/interfaces/base/nsIDOMWindowUtils.idl +++ b/dom/interfaces/base/nsIDOMWindowUtils.idl @@ -1011,7 +1011,7 @@ interface nsIDOMWindowUtils : nsISupports { /** * Get the current zoom factor. * This is _approximately_ the same as nsIContentViewer.fullZoom, - * but takes into account Goanna's quantization of the zoom factor, which is + * but takes into account Gecko's quantization of the zoom factor, which is * implemented by adjusting the (integer) number of appUnits per devPixel. */ readonly attribute float fullZoom; diff --git a/dom/interfaces/base/nsITextInputProcessor.idl b/dom/interfaces/base/nsITextInputProcessor.idl index 8c597125d7..bd763b790e 100644 --- a/dom/interfaces/base/nsITextInputProcessor.idl +++ b/dom/interfaces/base/nsITextInputProcessor.idl @@ -503,7 +503,7 @@ interface nsITextInputProcessor : nsISupports * non-printable key. However, if you try to emulate physical keyboard of * desktop platform, you need to specify proper value explicitly because * the mapping table of this API isn't enough to emulate the behavior of - * Goanna for desktop platforms. + * Gecko for desktop platforms. * * NOTE: Even if this has composition, JS-Keyboard should call keydown() and * keyup(). Although, with the default preferences and normal diff --git a/dom/interfaces/base/nsITextInputProcessorCallback.idl b/dom/interfaces/base/nsITextInputProcessorCallback.idl index d7b20e436f..61b6d50edf 100644 --- a/dom/interfaces/base/nsITextInputProcessorCallback.idl +++ b/dom/interfaces/base/nsITextInputProcessorCallback.idl @@ -20,12 +20,12 @@ interface nsITextInputProcessorNotification : nsISupports * one of following values: * * "request-to-commit" (required to be handled) - * This is requested when Goanna believes that active composition should be + * This is requested when Gecko believes that active composition should be * committed. nsITextInputProcessorCallback::onNotify() has to handle this * notification. * * "request-to-cancel" (required to be handled) - * This is requested when Goanna believes that active composition should be + * This is requested when Gecko believes that active composition should be * canceled. I.e., composition should be committed with empty string. * nsITextInputProcessorCallback::onNotify() has to handle this * notification. @@ -37,12 +37,12 @@ interface nsITextInputProcessorNotification : nsISupports * input. * * "notify-focus" (optional) - * This is notified when an editable editor gets focus and Goanna starts + * This is notified when an editable editor gets focus and Gecko starts * to observe changes in the content. E.g., selection changes. * IME shouldn't change DOM tree, focus nor something when this is notified. * * "notify-blur" (optional) - * This is notified when an editable editor loses focus and Goanna stops + * This is notified when an editable editor loses focus and Gecko stops * observing the changes in the content. */ readonly attribute ACString type; @@ -63,7 +63,7 @@ interface nsITextInputProcessorNotification : nsISupports interface nsITextInputProcessorCallback : nsISupports { /** - * When Goanna notifies IME of something or requests something to IME, + * When Gecko notifies IME of something or requests something to IME, * this is called. * * @param aTextInputProcessor Reference to the nsITextInputProcessor service diff --git a/dom/interfaces/core/nsIDOMDocument.idl b/dom/interfaces/core/nsIDOMDocument.idl index 6fceaaf126..d4e258a60e 100644 --- a/dom/interfaces/core/nsIDOMDocument.idl +++ b/dom/interfaces/core/nsIDOMDocument.idl @@ -337,7 +337,7 @@ interface nsIDOMDocument : nsIDOMNode * Element which is currently the full-screen element as per the DOM * full-screen api. * - * @see + * @see */ readonly attribute nsIDOMElement mozFullScreenElement; @@ -345,7 +345,7 @@ interface nsIDOMDocument : nsIDOMNode * Causes the document to leave DOM full-screen mode, if it's in * full-screen mode, as per the DOM full-screen api. * - * @see + * @see */ void mozCancelFullScreen(); @@ -353,7 +353,7 @@ interface nsIDOMDocument : nsIDOMNode * Denotes whether this document is in DOM full-screen mode, as per the DOM * full-screen api. * - * @see + * @see */ readonly attribute boolean mozFullScreen; @@ -362,7 +362,7 @@ interface nsIDOMDocument : nsIDOMNode * plugins are present, and all ancestor documents have the * allowfullscreen attribute set. * - * @see + * @see */ readonly attribute boolean mozFullScreenEnabled; diff --git a/dom/interfaces/core/nsIDOMElement.idl b/dom/interfaces/core/nsIDOMElement.idl index 8bdb68c412..4036613942 100644 --- a/dom/interfaces/core/nsIDOMElement.idl +++ b/dom/interfaces/core/nsIDOMElement.idl @@ -207,7 +207,7 @@ interface nsIDOMElement : nsIDOMNode * Requests that this element be made the full-screen element, as per the DOM * full-screen api. * - * @see + * @see */ void mozRequestFullScreen(); diff --git a/dom/interfaces/events/nsIDOMEventTarget.idl b/dom/interfaces/events/nsIDOMEventTarget.idl index 8871473b0a..0daafed8d4 100644 --- a/dom/interfaces/events/nsIDOMEventTarget.idl +++ b/dom/interfaces/events/nsIDOMEventTarget.idl @@ -258,7 +258,7 @@ interface nsIDOMEventTarget : nsISupports * If aDOMEvent is not nullptr (in which case aEvent can be nullptr) it is used * for dispatching, otherwise aEvent is used. * - * @deprecated This method is here just until all the callers outside Goanna + * @deprecated This method is here just until all the callers outside Gecko * have been converted to use nsIDOMEventTarget::dispatchEvent. */ [noscript, nostdcall] diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 9b1e8d232c..056ee854c5 100755 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -2238,7 +2238,7 @@ ContentParent::ContentParent(ContentParent* aTemplate, const FileDescriptor* fd = FindFdProtocolFdMapping(aFds, GetProtocolId()); NS_ASSERTION(fd != nullptr, "IPC Channel for PContent is necessary!"); - mSubprocess = new GoannaExistingProcessHost(GeckoProcessType_Content, + mSubprocess = new GeckoExistingProcessHost(GeckoProcessType_Content, aPid, *fd); diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl index 0a8a26587d..625727b2e5 100644 --- a/dom/ipc/PBrowser.ipdl +++ b/dom/ipc/PBrowser.ipdl @@ -427,7 +427,7 @@ parent: ContentReceivedInputBlock(ScrollableLayerGuid aGuid, uint64_t aInputBlockId, bool aPreventDefault); /** - * Notifies the APZ code of the results of the goanna hit-test for a + * Notifies the APZ code of the results of the gecko hit-test for a * particular input block. Each target corresponds to one touch point in the * touch event. */ diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl index 491585e157..52128206dd 100644 --- a/dom/ipc/PContent.ipdl +++ b/dom/ipc/PContent.ipdl @@ -606,7 +606,7 @@ child: async LoadPluginResult(uint32_t aPluginId, bool aResult); /** - * Control the Goanna Profiler in the child process. + * Control the Gecko Profiler in the child process. */ async StartProfiler(uint32_t aEntries, double aInterval, nsCString[] aFeatures, nsCString[] aThreadNameFilters); diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 64b090116f..da9e591e7c 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -198,7 +198,7 @@ TabChildBase::InitializeRootMetrics() mLastRootMetrics.SetZoom(CSSToParentLayerScale2D(mLastRootMetrics.CalculateIntrinsicScale())); mLastRootMetrics.SetDevPixelsPerCSSPixel(WebWidget()->GetDefaultScale()); // We use ParentLayerToLayerScale(1) below in order to turn the - // async zoom amount into the goanna zoom amount. + // async zoom amount into the gecko zoom amount. mLastRootMetrics.SetCumulativeResolution(mLastRootMetrics.GetZoom() / mLastRootMetrics.GetDevPixelsPerCSSPixel() * ParentLayerToLayerScale(1)); // This is the root layer, so the cumulative resolution is the same // as the resolution. diff --git a/dom/ipc/nsIHangReport.idl b/dom/ipc/nsIHangReport.idl index 05651fb25d..d8ac125052 100644 --- a/dom/ipc/nsIHangReport.idl +++ b/dom/ipc/nsIHangReport.idl @@ -10,7 +10,7 @@ interface nsIDOMElement; interface nsIFrameLoader; /** - * When a content process hangs, Goanna notifies "process-hang-report" observers + * When a content process hangs, Gecko notifies "process-hang-report" observers * and passes an nsIHangReport for the subject parameter. There is at most one * nsIHangReport associated with a given content process. As long as the content * process stays stuck, the "process-hang-report" observer will continue to be diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp index c9b59b4281..3cbc1cc650 100644 --- a/dom/media/GraphDriver.cpp +++ b/dom/media/GraphDriver.cpp @@ -19,7 +19,7 @@ extern PRLogModuleInfo* gMediaStreamGraphLog; #ifdef ENABLE_LIFECYCLE_LOG #ifdef ANDROID #include "android/log.h" -#define LIFECYCLE_LOG(...) __android_log_print(ANDROID_LOG_INFO, "Goanna - MSG" , __VA_ARGS__); printf(__VA_ARGS__);printf("\n"); +#define LIFECYCLE_LOG(...) __android_log_print(ANDROID_LOG_INFO, "Gecko - MSG" , __VA_ARGS__); printf(__VA_ARGS__);printf("\n"); #else #define LIFECYCLE_LOG(...) printf(__VA_ARGS__);printf("\n"); #endif diff --git a/dom/media/MediaDecoder.h b/dom/media/MediaDecoder.h index 2ff3acfd54..4f08aaf4d9 100644 --- a/dom/media/MediaDecoder.h +++ b/dom/media/MediaDecoder.h @@ -717,7 +717,7 @@ public: // Estimate of the current playback rate (bytes/second). double mPlaybackRate; // Estimate of the current download rate (bytes/second). This - // ignores time that the channel was paused by Goanna. + // ignores time that the channel was paused by Gecko. double mDownloadRate; // Total length of media stream in bytes; -1 if not known int64_t mTotalBytes; diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp index fc6ca555b9..0de96deb5f 100644 --- a/dom/media/MediaRecorder.cpp +++ b/dom/media/MediaRecorder.cpp @@ -159,7 +159,7 @@ NS_IMPL_RELEASE_INHERITED(MediaRecorder, DOMEventTargetHelper) * 1) MediaRecorder creates a Session in MediaRecorder::Start function and holds * a reference to Session. Then the Session registers itself to * ShutdownObserver and also holds a reference to MediaRecorder. - * Therefore, the reference dependency in goanna is: + * Therefore, the reference dependency in gecko is: * ShutdownObserver -> Session <-> MediaRecorder, note that there is a cycle * reference between Session and MediaRecorder. * 2) A Session is destroyed in DestroyRunnable after MediaRecorder::Stop being called diff --git a/dom/media/MediaResource.h b/dom/media/MediaResource.h index ab2cba2d76..e4e00617d8 100644 --- a/dom/media/MediaResource.h +++ b/dom/media/MediaResource.h @@ -331,7 +331,7 @@ public: virtual void Pin() = 0; virtual void Unpin() = 0; // Get the estimated download rate in bytes per second (assuming no - // pausing of the channel is requested by Goanna). + // pausing of the channel is requested by Gecko). // *aIsReliable is set to true if we think the estimate is useful. virtual double GetDownloadRate(bool* aIsReliable) = 0; // Get the length of the stream in bytes. Returns -1 if not known. diff --git a/dom/media/MediaShutdownManager.h b/dom/media/MediaShutdownManager.h index 5e453f0654..aa2e2ff1f0 100644 --- a/dom/media/MediaShutdownManager.h +++ b/dom/media/MediaShutdownManager.h @@ -22,7 +22,7 @@ class MediaDecoder; // The MediaShutdownManager manages shutting down the MediaDecoder // infrastructure in response to an xpcom-shutdown notification. This happens -// when Goanna is shutting down in the middle of operation. This is tricky, as +// when Gecko is shutting down in the middle of operation. This is tricky, as // there are a number of moving parts that must be shutdown in a particular // order. Additionally the xpcom-shutdown observer *must* block until all // threads are shutdown, which is tricky since we have a number of threads diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp index d4b70adb52..f4f8cda2ed 100644 --- a/dom/media/MediaStreamGraph.cpp +++ b/dom/media/MediaStreamGraph.cpp @@ -51,7 +51,7 @@ PRLogModuleInfo* gMediaStreamGraphLog; #ifdef ENABLE_LIFECYCLE_LOG # ifdef ANDROID # include "android/log.h" -# define LIFECYCLE_LOG(...) __android_log_print(ANDROID_LOG_INFO, "Goanna - MSG", ## __VA_ARGS__); printf(__VA_ARGS__);printf("\n"); +# define LIFECYCLE_LOG(...) __android_log_print(ANDROID_LOG_INFO, "Gecko - MSG", ## __VA_ARGS__); printf(__VA_ARGS__);printf("\n"); # else # define LIFECYCLE_LOG(...) printf(__VA_ARGS__);printf("\n"); # endif diff --git a/dom/media/android/AndroidMediaResourceServer.h b/dom/media/android/AndroidMediaResourceServer.h index d753d1b815..adbefbee6a 100644 --- a/dom/media/android/AndroidMediaResourceServer.h +++ b/dom/media/android/AndroidMediaResourceServer.h @@ -29,7 +29,7 @@ class MediaResource; The intent of this class is to be used in Media backends that have a system component that does its own network requests. These requests are made against this server which then uses standard - Goanna network requests and media cache usage. + Gecko network requests and media cache usage. The AndroidMediaResourceServer can be instantiated on any thread and its methods are threadsafe - they can be called on any thread. diff --git a/dom/media/android/MPAPI.h b/dom/media/android/MPAPI.h index 77f0d969af..9b289ca09c 100644 --- a/dom/media/android/MPAPI.h +++ b/dom/media/android/MPAPI.h @@ -16,7 +16,7 @@ enum ColorFormat { }; /* - * A callback for the plugin to use to request a buffer owned by goanna. This can + * A callback for the plugin to use to request a buffer owned by gecko. This can * save us a copy or two down the line. */ class BufferCallback { diff --git a/dom/media/compiledtest/moz.build b/dom/media/compiledtest/moz.build index 268c69cec1..085afcdd5e 100644 --- a/dom/media/compiledtest/moz.build +++ b/dom/media/compiledtest/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -GoannaCppUnitTests([ +GeckoCppUnitTests([ 'TestAudioBuffers', 'TestAudioMixer' ]) diff --git a/dom/media/directshow/SourceFilter.cpp b/dom/media/directshow/SourceFilter.cpp index bd48511bb4..9cfaab4e40 100644 --- a/dom/media/directshow/SourceFilter.cpp +++ b/dom/media/directshow/SourceFilter.cpp @@ -352,7 +352,7 @@ OutputPin::RequestAllocator(IMemAllocator* aPreferred, // Limit allocator's number of buffers. We know that the media will most // likely be bound by network speed, not by decoding speed. We also - // store the incoming data in a Goanna stream, if we don't limit buffers + // store the incoming data in a Gecko stream, if we don't limit buffers // here we'll end up duplicating a lot of storage. We must have enough // space for audio key frames to fit in the first batch of buffers however, // else pausing may fail for some downstream decoders. diff --git a/dom/media/gmp-plugin-openh264/moz.build b/dom/media/gmp-plugin-openh264/moz.build index 1d02fb1a77..278e916c18 100644 --- a/dom/media/gmp-plugin-openh264/moz.build +++ b/dom/media/gmp-plugin-openh264/moz.build @@ -20,7 +20,7 @@ if CONFIG['OS_ARCH'] == 'WINNT': USE_STATIC_LIBS = True NO_VISIBILITY_FLAGS = True -# Don't use STL wrappers; this isn't Goanna code +# Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True FAIL_ON_WARNINGS = True diff --git a/dom/media/gmp-plugin/gmp-test-decryptor.cpp b/dom/media/gmp-plugin/gmp-test-decryptor.cpp index 38894a86dd..0352c881c8 100644 --- a/dom/media/gmp-plugin/gmp-test-decryptor.cpp +++ b/dom/media/gmp-plugin/gmp-test-decryptor.cpp @@ -590,7 +590,7 @@ TestAsyncShutdown::BeginShutdown() { mHost->ShutdownComplete(); break; case ShutdownTimeout: - // Don't do anything; wait for timeout, Goanna should kill + // Don't do anything; wait for timeout, Gecko should kill // the plugin and recover. break; case ShutdownStoreToken: diff --git a/dom/media/gmp-plugin/moz.build b/dom/media/gmp-plugin/moz.build index b089c45a3c..96c5661db4 100644 --- a/dom/media/gmp-plugin/moz.build +++ b/dom/media/gmp-plugin/moz.build @@ -22,7 +22,7 @@ if CONFIG['OS_ARCH'] == 'WINNT': USE_STATIC_LIBS = True NO_VISIBILITY_FLAGS = True -# Don't use STL wrappers; this isn't Goanna code +# Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True FAIL_ON_WARNINGS = True diff --git a/dom/media/gmp/GMPLoader.h b/dom/media/gmp/GMPLoader.h index fb51e75626..934ffa4000 100644 --- a/dom/media/gmp/GMPLoader.h +++ b/dom/media/gmp/GMPLoader.h @@ -26,11 +26,11 @@ public: // Encapsulates generating the device-bound node id, activating the sandbox, // loading the GMP, and passing the node id to the GMP (in that order). // -// In Desktop Goanna, the implementation of this lives in plugin-container, +// In Desktop Gecko, the implementation of this lives in plugin-container, // and is passed into XUL code from on startup. The GMP IPC child protocol actor // uses this interface to load and retrieve interfaces from the GMPs. // -// In Desktop Goanna the implementation lives in the plugin-container so that +// In Desktop Gecko the implementation lives in the plugin-container so that // it can be covered by DRM vendor's voucher. // // On Android the GMPLoader implementation lives in libxul (because for the time diff --git a/dom/media/gmp/GMPVideoDecoderProxy.h b/dom/media/gmp/GMPVideoDecoderProxy.h index 6a90f9d776..b6770c06bf 100644 --- a/dom/media/gmp/GMPVideoDecoderProxy.h +++ b/dom/media/gmp/GMPVideoDecoderProxy.h @@ -25,7 +25,7 @@ public: // A proxy to GMPVideoDecoder in the child process. // GMPVideoDecoderParent exposes this to users the GMP. -// This enables Goanna to pass nsTArrays to the child GMP and avoid +// This enables Gecko to pass nsTArrays to the child GMP and avoid // an extra copy when doing so. // The consumer must call Close() when done with the codec, or when diff --git a/dom/media/gmp/GMPVideoEncoderProxy.h b/dom/media/gmp/GMPVideoEncoderProxy.h index 3faea4065f..3e76e5358f 100644 --- a/dom/media/gmp/GMPVideoEncoderProxy.h +++ b/dom/media/gmp/GMPVideoEncoderProxy.h @@ -24,7 +24,7 @@ public: // A proxy to GMPVideoEncoder in the child process. // GMPVideoEncoderParent exposes this to users the GMP. -// This enables Goanna to pass nsTArrays to the child GMP and avoid +// This enables Gecko to pass nsTArrays to the child GMP and avoid // an extra copy when doing so. // The consumer must call Close() when done with the codec, or when diff --git a/dom/media/gmp/README.txt b/dom/media/gmp/README.txt index 32f8b601c6..189cf3b302 100644 --- a/dom/media/gmp/README.txt +++ b/dom/media/gmp/README.txt @@ -1 +1 @@ -This directory contains code supporting Goanna Media Plugins (GMPs). The GMP API is not the same thing as the Media Plugin API (MPAPI). +This directory contains code supporting Gecko Media Plugins (GMPs). The GMP API is not the same thing as the Media Plugin API (MPAPI). diff --git a/dom/media/gmp/gmp-api/gmp-audio-decode.h b/dom/media/gmp/gmp-api/gmp-audio-decode.h index 5828e98f3b..8b017c0afc 100644 --- a/dom/media/gmp/gmp-api/gmp-audio-decode.h +++ b/dom/media/gmp/gmp-api/gmp-audio-decode.h @@ -37,7 +37,7 @@ public: virtual void ResetComplete() = 0; // Called when the decoder encounters a catestrophic error and cannot - // continue. Goanna will not send any more input for decoding. + // continue. Gecko will not send any more input for decoding. virtual void Error(GMPErr aError) = 0; }; diff --git a/dom/media/gmp/gmp-api/gmp-decryption.h b/dom/media/gmp/gmp-api/gmp-decryption.h index cb4800d84f..d76c39315c 100644 --- a/dom/media/gmp/gmp-api/gmp-decryption.h +++ b/dom/media/gmp/gmp-api/gmp-decryption.h @@ -104,24 +104,24 @@ enum GMPMediaKeyStatus { typedef int64_t GMPTimestamp; // Capability definitions. The capabilities of the EME GMP are reported -// to Goanna by calling the GMPDecryptorCallback::SetCapabilities() +// to Gecko by calling the GMPDecryptorCallback::SetCapabilities() // callback and specifying the logical OR of the GMP_EME_CAP_* flags below. // // Note the DECRYPT and the DECRYPT_AND_DECODE are mutually exclusive; // only one mode should be reported for each stream type, but different // modes can be reported for different stream types. // -// Note: Goanna does not currently support the caps changing at runtime. +// Note: Gecko does not currently support the caps changing at runtime. // Set them once per plugin initialization, during the startup of // the GMPDecryptor. // Capability; CDM can decrypt encrypted buffers and return still -// compressed buffers back to Goanna for decompression there. +// compressed buffers back to Gecko for decompression there. #define GMP_EME_CAP_DECRYPT_AUDIO (uint64_t(1) << 0) #define GMP_EME_CAP_DECRYPT_VIDEO (uint64_t(1) << 1) // Capability; CDM can decrypt and then decode encrypted buffers, -// and return decompressed samples to Goanna for playback. +// and return decompressed samples to Gecko for playback. #define GMP_EME_CAP_DECRYPT_AND_DECODE_AUDIO (uint64_t(1) << 2) #define GMP_EME_CAP_DECRYPT_AND_DECODE_VIDEO (uint64_t(1) << 3) @@ -197,7 +197,7 @@ public: const char* aMessage, uint32_t aMessageLength) = 0; - // Notifies the status of a key. Goanna will not call into the CDM to decrypt + // Notifies the status of a key. Gecko will not call into the CDM to decrypt // or decode content encrypted with a key unless the CDM has marked it // usable first. So a CDM *MUST* mark its usable keys as usable! virtual void KeyStatusChanged(const char* aSessionId, @@ -209,12 +209,12 @@ public: // The CDM must report its capabilites of this CDM. aCaps should be a // logical OR of the GMP_EME_CAP_* flags. The CDM *MUST* call this // function and report whether it can decrypt and/or decode. Without - // this, Goanna does not know how to use the CDM and will not send + // this, Gecko does not know how to use the CDM and will not send // samples to the CDM to decrypt or decrypt-and-decode mode. Note a // CDM cannot change modes once playback has begun. virtual void SetCapabilities(uint64_t aCaps) = 0; - // Returns decrypted buffer to Goanna, or reports failure. + // Returns decrypted buffer to Gecko, or reports failure. virtual void Decrypted(GMPBuffer* aBuffer, GMPErr aResult) = 0; virtual ~GMPDecryptorCallback() {} @@ -252,14 +252,14 @@ class GMPDecryptor { public: // Sets the callback to use with the decryptor to return results - // to Goanna. + // to Gecko. // // The CDM must also call GMPDecryptorCallback::SetCapabilities() - // exactly once during start up, to inform Goanna whether to use the CDM + // exactly once during start up, to inform Gecko whether to use the CDM // in decrypt or decrypt-and-decode mode. // // Note: GMPDecryptorCallback::SetCapabilities() must be called before - // Goanna will send any samples for decryption to the GMP. + // Gecko will send any samples for decryption to the GMP. virtual void Init(GMPDecryptorCallback* aCallback) = 0; // Initiates the creation of a session given |aType| and |aInitData|, and @@ -342,7 +342,7 @@ public: // Asynchronously decrypts aBuffer in place. When the decryption is // complete, GMPDecryptor should write the decrypted data back into the - // same GMPBuffer object and return it to Goanna by calling Decrypted(), + // same GMPBuffer object and return it to Gecko by calling Decrypted(), // with the GMPNoErr successcode. If decryption fails, call Decrypted() // with a failure code, and an error event will fire on the media element. // Note: When Decrypted() is called and aBuffer is passed back, aBuffer diff --git a/dom/media/gmp/gmp-api/gmp-entrypoints.h b/dom/media/gmp/gmp-api/gmp-entrypoints.h index 51a966804a..214c9dbfc0 100644 --- a/dom/media/gmp/gmp-api/gmp-entrypoints.h +++ b/dom/media/gmp/gmp-api/gmp-entrypoints.h @@ -37,7 +37,7 @@ #include "gmp-errors.h" #include "gmp-platform.h" -/* C functions exposed by Goanna Media Plugin shared library. */ +/* C functions exposed by Gecko Media Plugin shared library. */ // GMPInit // - Called once after plugin library is loaded, before GMPGetAPI or GMPShutdown are called. diff --git a/dom/media/gmp/gmp-api/gmp-video-decode.h b/dom/media/gmp/gmp-api/gmp-video-decode.h index 9e9ab7e837..e07a7525e9 100644 --- a/dom/media/gmp/gmp-api/gmp-video-decode.h +++ b/dom/media/gmp/gmp-api/gmp-video-decode.h @@ -59,7 +59,7 @@ public: virtual void ResetComplete() = 0; // Called when the decoder encounters a catestrophic error and cannot - // continue. Goanna will not send any more input for decoding. + // continue. Gecko will not send any more input for decoding. virtual void Error(GMPErr aError) = 0; }; diff --git a/dom/media/gmp/gmp-api/gmp-video-encode.h b/dom/media/gmp/gmp-api/gmp-video-encode.h index bb5a908515..5c9cde39cd 100644 --- a/dom/media/gmp/gmp-api/gmp-video-encode.h +++ b/dom/media/gmp/gmp-api/gmp-video-encode.h @@ -53,7 +53,7 @@ public: uint32_t aCodecSpecificInfoLength) = 0; // Called when the encoder encounters a catestrophic error and cannot - // continue. Goanna will not send any more input for encoding. + // continue. Gecko will not send any more input for encoding. virtual void Error(GMPErr aError) = 0; }; diff --git a/dom/media/imagecapture/ImageCapture.cpp b/dom/media/imagecapture/ImageCapture.cpp index 6dd1829b05..ca38e201a6 100644 --- a/dom/media/imagecapture/ImageCapture.cpp +++ b/dom/media/imagecapture/ImageCapture.cpp @@ -142,7 +142,7 @@ void ImageCapture::TakePhoto(ErrorResult& aResult) { // According to spec, VideoStreamTrack.readyState must be "live"; however - // goanna doesn't implement it yet (bug 910249). Instead of readyState, we + // gecko doesn't implement it yet (bug 910249). Instead of readyState, we // check VideoStreamTrack.enable before bug 910249 is fixed. // The error code should be INVALID_TRACK, but spec doesn't define it in // ImageCaptureError. So it returns PHOTO_ERROR here before spec updates. diff --git a/dom/media/test/test_texttrackcue.html b/dom/media/test/test_texttrackcue.html index 22ac8f1633..709ca13e25 100644 --- a/dom/media/test/test_texttrackcue.html +++ b/dom/media/test/test_texttrackcue.html @@ -44,7 +44,7 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.regions.enabled", true]]}, var cueList = trackElement.track.cues; is(cueList.length, 6, "Cue list length should be 6."); - // Check that the typedef of TextTrackCue works in Goanna. + // Check that the typedef of TextTrackCue works in Gecko. is(window.TextTrackCue, undefined, "TextTrackCue should be undefined."); isnot(window.VTTCue, undefined, "VTTCue should be defined."); diff --git a/dom/media/webaudio/compiledtest/moz.build b/dom/media/webaudio/compiledtest/moz.build index 4648c4da57..1f06b9edc2 100644 --- a/dom/media/webaudio/compiledtest/moz.build +++ b/dom/media/webaudio/compiledtest/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -GoannaCppUnitTests([ +GeckoCppUnitTests([ 'TestAudioEventTimeline', ]) diff --git a/dom/media/webaudio/test/test_mediaElementAudioSourceNodeCrossOrigin.html b/dom/media/webaudio/test/test_mediaElementAudioSourceNodeCrossOrigin.html index 3a7bc9c833..3ffef389e1 100644 --- a/dom/media/webaudio/test/test_mediaElementAudioSourceNodeCrossOrigin.html +++ b/dom/media/webaudio/test/test_mediaElementAudioSourceNodeCrossOrigin.html @@ -72,7 +72,7 @@ tests.forEach(function(e) { } } // It is acceptable to find a full buffer of silence here, even if we expect - // sound, because Goanna's looping on media elements is not seamless and we + // sound, because Gecko's looping on media elements is not seamless and we // can underrun. We are looking for at least one buffer of non-silent data. e.target.seenSound = !silent || e.target.seenSound; checkFinished(e.target); diff --git a/dom/media/webspeech/synth/pico/nsPicoService.cpp b/dom/media/webspeech/synth/pico/nsPicoService.cpp index a176652ac5..504d5a47fb 100644 --- a/dom/media/webspeech/synth/pico/nsPicoService.cpp +++ b/dom/media/webspeech/synth/pico/nsPicoService.cpp @@ -715,7 +715,7 @@ nsPicoService::GetInstance() { MOZ_ASSERT(NS_IsMainThread()); if (XRE_GetProcessType() != GeckoProcessType_Default) { - MOZ_ASSERT(false, "nsPicoService can only be started on main goanna process"); + MOZ_ASSERT(false, "nsPicoService can only be started on main gecko process"); return nullptr; } diff --git a/dom/mobileconnection/tests/marionette/test_mobile_call_forwarding.js b/dom/mobileconnection/tests/marionette/test_mobile_call_forwarding.js index 78fcb8f93c..0a35a01fe1 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_call_forwarding.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_call_forwarding.js @@ -10,14 +10,14 @@ const TEST_DATA = [ reason: MozMobileConnection.CALL_FORWARD_REASON_MOBILE_BUSY, number: "0912345678", timeSeconds: 5, - // Currently goanna only support ICC_SERVICE_CLASS_VOICE. + // Currently gecko only support ICC_SERVICE_CLASS_VOICE. serviceClass: MozMobileConnection.ICC_SERVICE_CLASS_VOICE }, { action: MozMobileConnection.CALL_FORWARD_ACTION_ENABLE, reason: MozMobileConnection.CALL_FORWARD_REASON_NO_REPLY, number: "+886912345678", timeSeconds: 20, - // Currently goanna only support ICC_SERVICE_CLASS_VOICE. + // Currently gecko only support ICC_SERVICE_CLASS_VOICE. serviceClass: MozMobileConnection.ICC_SERVICE_CLASS_VOICE } ]; diff --git a/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js b/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js index e227eae4e9..093244e581 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js @@ -50,7 +50,7 @@ function testRegisterDataWhileDataEnabled() { log("Set data registration home while data enabled."); // When data registration is registered, data call will be (re)activated by - // goanna if ril.data.enabled is set to true. + // gecko if ril.data.enabled is set to true. return setEmulatorVoiceDataStateAndWait("data", "home") .then(() => checkOrWaitForDataState(true)); } diff --git a/dom/mobilemessage/Types.h b/dom/mobilemessage/Types.h index b50d75df3e..e629a500fc 100644 --- a/dom/mobilemessage/Types.h +++ b/dom/mobilemessage/Types.h @@ -15,7 +15,7 @@ namespace mobilemessage { // For MmsMessageData.state and SmsMessageData.deliveryState // Please keep the following files in sync with enum below: -// mobile/android/base/GoannaSmsManager.java +// mobile/android/base/GeckoSmsManager.java enum DeliveryState { eDeliveryState_Sent = 0, eDeliveryState_Received, diff --git a/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl b/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl index 9164369e9e..b7651e5660 100644 --- a/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl +++ b/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl @@ -10,7 +10,7 @@ interface nsIMobileMessageCallback : nsISupports /** * All SMS related errors. * Make sure to keep this list in sync with the list in: - * embedding/android/GoannaSmsManager.java + * embedding/android/GeckoSmsManager.java */ const unsigned short SUCCESS_NO_ERROR = 0; const unsigned short NO_SIGNAL_ERROR = 1; diff --git a/dom/nfc/gonk/nfc_consts.js b/dom/nfc/gonk/nfc_consts.js index e95fd6246c..65698cd750 100644 --- a/dom/nfc/gonk/nfc_consts.js +++ b/dom/nfc/gonk/nfc_consts.js @@ -22,7 +22,7 @@ this.DEBUG_ALL = false; this.DEBUG_CONTENT_HELPER = DEBUG_ALL || false; this.DEBUG_NFC = DEBUG_ALL || false; -// Goanna specific error codes +// Gecko specific error codes this.NFC_GECKO_ERROR_P2P_REG_INVALID = 1; this.NFC_GECKO_ERROR_SEND_FILE_FAILED = 2; diff --git a/dom/plugins/base/PluginPRLibrary.cpp b/dom/plugins/base/PluginPRLibrary.cpp index 5d7134c380..00c756f518 100644 --- a/dom/plugins/base/PluginPRLibrary.cpp +++ b/dom/plugins/base/PluginPRLibrary.cpp @@ -26,7 +26,7 @@ static int gNotOptimized; #include "android_npapi.h" #include #undef ALOG -#define ALOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaJavaEnv", ## args) +#define ALOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoJavaEnv", ## args) #endif using namespace mozilla::layers; diff --git a/dom/plugins/base/android/ANPAudio.cpp b/dom/plugins/base/android/ANPAudio.cpp index 94214ee209..b02e628983 100644 --- a/dom/plugins/base/android/ANPAudio.cpp +++ b/dom/plugins/base/android/ANPAudio.cpp @@ -16,7 +16,7 @@ #include "nsThreadUtils.h" #include "mozilla/Mutex.h" -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPluginsAudio" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPluginsAudio" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_audio_##name /* android.media.AudioTrack */ diff --git a/dom/plugins/base/android/ANPBase.h b/dom/plugins/base/android/ANPBase.h index b1660e000e..22860ce005 100644 --- a/dom/plugins/base/android/ANPBase.h +++ b/dom/plugins/base/android/ANPBase.h @@ -9,14 +9,14 @@ #include "nsISupportsImpl.h" #define NOT_IMPLEMENTED_FATAL() do { \ - __android_log_print(ANDROID_LOG_ERROR, "GoannaPlugins", \ + __android_log_print(ANDROID_LOG_ERROR, "GeckoPlugins", \ "%s not implemented %s, %d", \ __PRETTY_FUNCTION__, __FILE__, __LINE__); \ abort(); \ } while(0) #define NOT_IMPLEMENTED() \ - __android_log_print(ANDROID_LOG_ERROR, "GoannaPlugins", \ + __android_log_print(ANDROID_LOG_ERROR, "GeckoPlugins", \ "!!!!!!!!!!!!!! %s not implemented %s, %d", \ __PRETTY_FUNCTION__, __FILE__, __LINE__); \ diff --git a/dom/plugins/base/android/ANPBitmap.cpp b/dom/plugins/base/android/ANPBitmap.cpp index 5ed8e026aa..c655499456 100644 --- a/dom/plugins/base/android/ANPBitmap.cpp +++ b/dom/plugins/base/android/ANPBitmap.cpp @@ -7,7 +7,7 @@ #include "ANPBase.h" #include -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_bitmap_##name diff --git a/dom/plugins/base/android/ANPEvent.cpp b/dom/plugins/base/android/ANPEvent.cpp index 2f4e21c1eb..fc25e3fab1 100644 --- a/dom/plugins/base/android/ANPEvent.cpp +++ b/dom/plugins/base/android/ANPEvent.cpp @@ -11,7 +11,7 @@ #include "AndroidBridge.h" #include "nsNPAPIPlugin.h" -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_event_##name void diff --git a/dom/plugins/base/android/ANPLog.cpp b/dom/plugins/base/android/ANPLog.cpp index c2a62982fc..7ce13107b1 100644 --- a/dom/plugins/base/android/ANPLog.cpp +++ b/dom/plugins/base/android/ANPLog.cpp @@ -7,7 +7,7 @@ #include "ANPBase.h" #include -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_log_##name void @@ -16,7 +16,7 @@ anp_log_log(ANPLogType type, const char format[], ...) { va_list argp; va_start(argp,format); __android_log_vprint(type == kError_ANPLogType ? ANDROID_LOG_ERROR : type == kWarning_ANPLogType ? - ANDROID_LOG_WARN : ANDROID_LOG_INFO, "GoannaPluginLog", format, argp); + ANDROID_LOG_WARN : ANDROID_LOG_INFO, "GeckoPluginLog", format, argp); va_end(argp); } diff --git a/dom/plugins/base/android/ANPMatrix.cpp b/dom/plugins/base/android/ANPMatrix.cpp index b70efbd588..30da002ea7 100644 --- a/dom/plugins/base/android/ANPMatrix.cpp +++ b/dom/plugins/base/android/ANPMatrix.cpp @@ -7,7 +7,7 @@ #include "ANPBase.h" #include -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_matrix_##name /** Return a new identity matrix diff --git a/dom/plugins/base/android/ANPNativeWindow.cpp b/dom/plugins/base/android/ANPNativeWindow.cpp index 48d08512db..0de5518c72 100644 --- a/dom/plugins/base/android/ANPNativeWindow.cpp +++ b/dom/plugins/base/android/ANPNativeWindow.cpp @@ -14,7 +14,7 @@ using namespace mozilla; -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_native_window_##name static ANPNativeWindow anp_native_window_acquireNativeWindow(NPP instance) { diff --git a/dom/plugins/base/android/ANPOpenGL.cpp b/dom/plugins/base/android/ANPOpenGL.cpp index 27e1d6ab99..60c5325055 100644 --- a/dom/plugins/base/android/ANPOpenGL.cpp +++ b/dom/plugins/base/android/ANPOpenGL.cpp @@ -12,7 +12,7 @@ #include "GLContextProvider.h" #include "GLContextEGL.h" -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_opengl_##name using namespace mozilla; diff --git a/dom/plugins/base/android/ANPSurface.cpp b/dom/plugins/base/android/ANPSurface.cpp index 4d7de66378..b6a699f285 100644 --- a/dom/plugins/base/android/ANPSurface.cpp +++ b/dom/plugins/base/android/ANPSurface.cpp @@ -7,7 +7,7 @@ #include #include "ANPBase.h" -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_surface_##name #define CLEAR_EXCEPTION(env) if (env->ExceptionOccurred()) env->ExceptionClear(); diff --git a/dom/plugins/base/android/ANPSystem.cpp b/dom/plugins/base/android/ANPSystem.cpp index 86cc46428a..19c54f61d1 100644 --- a/dom/plugins/base/android/ANPSystem.cpp +++ b/dom/plugins/base/android/ANPSystem.cpp @@ -13,7 +13,7 @@ #include "nsNPAPIPlugin.h" #include "PluginPRLibrary.h" -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_system_##name const char* diff --git a/dom/plugins/base/android/ANPVideo.cpp b/dom/plugins/base/android/ANPVideo.cpp index da8fbe15c8..584ad25607 100644 --- a/dom/plugins/base/android/ANPVideo.cpp +++ b/dom/plugins/base/android/ANPVideo.cpp @@ -10,7 +10,7 @@ #include "nsNPAPIPluginInstance.h" #include "gfxRect.h" -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_video_##name using namespace mozilla; diff --git a/dom/plugins/base/android/ANPWindow.cpp b/dom/plugins/base/android/ANPWindow.cpp index 8598322e78..199c8ab1d5 100644 --- a/dom/plugins/base/android/ANPWindow.cpp +++ b/dom/plugins/base/android/ANPWindow.cpp @@ -14,7 +14,7 @@ #include "mozilla/dom/ScreenOrientation.h" #undef LOG -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #define ASSIGN(obj, name) (obj)->name = anp_window_##name using namespace mozilla; diff --git a/dom/plugins/base/nsNPAPIPlugin.cpp b/dom/plugins/base/nsNPAPIPlugin.cpp index d9594f945a..586b7d6ad4 100644 --- a/dom/plugins/base/nsNPAPIPlugin.cpp +++ b/dom/plugins/base/nsNPAPIPlugin.cpp @@ -102,7 +102,7 @@ using mozilla::plugins::PluginModuleContentParent; #include "ANPBase.h" #include "AndroidBridge.h" #undef LOG -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #endif using namespace mozilla; diff --git a/dom/plugins/base/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp index 4b0c779cd6..e3e4242a1f 100644 --- a/dom/plugins/base/nsNPAPIPluginInstance.cpp +++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp @@ -652,7 +652,7 @@ nsresult nsNPAPIPluginInstance::Print(NPPrint* platformPrint) } nsresult nsNPAPIPluginInstance::HandleEvent(void* event, int16_t* result, - NSPluginCallReentry aSafeToReenterGoanna) + NSPluginCallReentry aSafeToReenterGecko) { if (RUNNING != mRunning) return NS_OK; @@ -675,7 +675,7 @@ nsresult nsNPAPIPluginInstance::HandleEvent(void* event, int16_t* result, #endif #if defined(XP_WIN) NS_TRY_SAFE_CALL_RETURN(tmpResult, (*pluginFunctions->event)(&mNPP, event), this, - aSafeToReenterGoanna); + aSafeToReenterGecko); #else MAIN_THREAD_JNI_REF_GUARD; tmpResult = (*pluginFunctions->event)(&mNPP, event); diff --git a/dom/plugins/base/nsNPAPIPluginInstance.h b/dom/plugins/base/nsNPAPIPluginInstance.h index 6899dc733d..636039eb5a 100644 --- a/dom/plugins/base/nsNPAPIPluginInstance.h +++ b/dom/plugins/base/nsNPAPIPluginInstance.h @@ -53,10 +53,10 @@ const NPDrawingModel kDefaultDrawingModel = static_cast(0); #endif /** - * Used to indicate whether it's OK to reenter Goanna and repaint, flush frames, + * Used to indicate whether it's OK to reenter Gecko and repaint, flush frames, * run scripts, etc, during this plugin call. * When NS_PLUGIN_CALL_UNSAFE_TO_REENTER_GECKO is set, we try to avoid dangerous - * Goanna activities when the plugin spins a nested event loop, on a best-effort + * Gecko activities when the plugin spins a nested event loop, on a best-effort * basis. */ enum NSPluginCallReentry { @@ -90,7 +90,7 @@ public: nsresult NewStreamFromPlugin(const char* type, const char* target, nsIOutputStream* *result); nsresult Print(NPPrint* platformPrint); nsresult HandleEvent(void* event, int16_t* result, - NSPluginCallReentry aSafeToReenterGoanna = NS_PLUGIN_CALL_UNSAFE_TO_REENTER_GECKO); + NSPluginCallReentry aSafeToReenterGecko = NS_PLUGIN_CALL_UNSAFE_TO_REENTER_GECKO); nsresult GetValueFromPlugin(NPPVariable variable, void* value); nsresult GetDrawingModel(int32_t* aModel); nsresult IsRemoteDrawingCoreAnimation(bool* aDrawing); diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp index 5878f6c199..240600893f 100644 --- a/dom/plugins/base/nsPluginInstanceOwner.cpp +++ b/dom/plugins/base/nsPluginInstanceOwner.cpp @@ -91,7 +91,7 @@ static nsPluginInstanceOwner* sFullScreenInstance = nullptr; using namespace mozilla::dom; #include -#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GoannaPlugins" , ## args) +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoPlugins" , ## args) #endif using namespace mozilla; @@ -222,7 +222,7 @@ nsPluginInstanceOwner::GetImageContainer() nsRefPtr container; #if MOZ_WIDGET_ANDROID - // Right now we only draw with Goanna layers on Honeycomb and higher. See Paint() + // Right now we only draw with Gecko layers on Honeycomb and higher. See Paint() // for what we do on other versions. if (AndroidBridge::Bridge()->GetAPIVersion() < 11) return nullptr; @@ -909,27 +909,27 @@ NPBool nsPluginInstanceOwner::ConvertPointNoPuppet(nsIWidget *widget, nsIntRect pluginScreenRect = pluginFrame->GetScreenRect(); - double screenXGoanna, screenYGoanna; + double screenXGecko, screenYGecko; switch (sourceSpace) { case NPCoordinateSpacePlugin: - screenXGoanna = pluginScreenRect.x + sourceX; - screenYGoanna = pluginScreenRect.y + sourceY; + screenXGecko = pluginScreenRect.x + sourceX; + screenYGecko = pluginScreenRect.y + sourceY; break; case NPCoordinateSpaceWindow: - screenXGoanna = windowX + sourceX; - screenYGoanna = windowY + (windowHeight - sourceY); + screenXGecko = windowX + sourceX; + screenYGecko = windowY + (windowHeight - sourceY); break; case NPCoordinateSpaceFlippedWindow: - screenXGoanna = windowX + sourceX; - screenYGoanna = windowY + sourceY; + screenXGecko = windowX + sourceX; + screenYGecko = windowY + sourceY; break; case NPCoordinateSpaceScreen: - screenXGoanna = sourceX; - screenYGoanna = screenHeight - sourceY; + screenXGecko = sourceX; + screenYGecko = screenHeight - sourceY; break; case NPCoordinateSpaceFlippedScreen: - screenXGoanna = sourceX; - screenYGoanna = sourceY; + screenXGecko = sourceX; + screenYGecko = sourceY; break; default: return false; @@ -938,24 +938,24 @@ NPBool nsPluginInstanceOwner::ConvertPointNoPuppet(nsIWidget *widget, double destXCocoa, destYCocoa; switch (destSpace) { case NPCoordinateSpacePlugin: - destXCocoa = screenXGoanna - pluginScreenRect.x; - destYCocoa = screenYGoanna - pluginScreenRect.y; + destXCocoa = screenXGecko - pluginScreenRect.x; + destYCocoa = screenYGecko - pluginScreenRect.y; break; case NPCoordinateSpaceWindow: - destXCocoa = screenXGoanna - windowX; - destYCocoa = windowHeight - (screenYGoanna - windowY); + destXCocoa = screenXGecko - windowX; + destYCocoa = windowHeight - (screenYGecko - windowY); break; case NPCoordinateSpaceFlippedWindow: - destXCocoa = screenXGoanna - windowX; - destYCocoa = screenYGoanna - windowY; + destXCocoa = screenXGecko - windowX; + destYCocoa = screenYGecko - windowY; break; case NPCoordinateSpaceScreen: - destXCocoa = screenXGoanna; - destYCocoa = screenHeight - screenYGoanna; + destXCocoa = screenXGecko; + destYCocoa = screenHeight - screenYGecko; break; case NPCoordinateSpaceFlippedScreen: - destXCocoa = screenXGoanna; - destYCocoa = screenYGoanna; + destXCocoa = screenXGecko; + destYCocoa = screenYGecko; break; default: return false; diff --git a/dom/plugins/ipc/PPluginInstance.ipdl b/dom/plugins/ipc/PPluginInstance.ipdl index 9ece419a84..cd608eca20 100644 --- a/dom/plugins/ipc/PPluginInstance.ipdl +++ b/dom/plugins/ipc/PPluginInstance.ipdl @@ -102,7 +102,7 @@ child: async ContentsScaleFactorChanged(double aContentsScaleFactor); // ********************** Async plugins rendering - // see https://wiki.mozilla.org/Goanna:AsyncPluginPainting + // see https://wiki.mozilla.org/Gecko:AsyncPluginPainting // ********************** // Async version of SetWindow call diff --git a/dom/plugins/ipc/PPluginModule.ipdl b/dom/plugins/ipc/PPluginModule.ipdl index c09bba8f8c..94d093d52d 100644 --- a/dom/plugins/ipc/PPluginModule.ipdl +++ b/dom/plugins/ipc/PPluginModule.ipdl @@ -87,7 +87,7 @@ child: async SetParentHangTimeout(uint32_t seconds); /** - * Control the Goanna Profiler in the plugin process. + * Control the Gecko Profiler in the plugin process. */ async StartProfiler(uint32_t aEntries, double aInterval, nsCString[] aFeatures, nsCString[] aThreadNameFilters); diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp index bcaee16328..4f40302fda 100644 --- a/dom/plugins/ipc/PluginInstanceChild.cpp +++ b/dom/plugins/ipc/PluginInstanceChild.cpp @@ -1321,7 +1321,7 @@ PluginInstanceChild::Initialize() #if defined(OS_WIN) -static const TCHAR kWindowClassName[] = TEXT("GoannaPluginWindow"); +static const TCHAR kWindowClassName[] = TEXT("GeckoPluginWindow"); static const TCHAR kPluginInstanceChildProperty[] = TEXT("PluginInstanceChildProperty"); static const TCHAR kFlashThrottleProperty[] = TEXT("MozillaFlashThrottleProperty"); @@ -1474,7 +1474,7 @@ PluginInstanceChild::PluginWindowProcInternal(HWND hWnd, // Adobe's shockwave positions the plugin window relative to the browser // frame when it initializes. With oopp disabled, this wouldn't have an - // effect. With oopp, GoannaPluginWindow is a child of the parent plugin + // effect. With oopp, GeckoPluginWindow is a child of the parent plugin // window, so the move offsets the child within the parent. Generally // we don't want plugins moving or sizing our window, so we prevent these // changes here. diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp index 7f37a960e5..6b746c0871 100755 --- a/dom/plugins/ipc/PluginModuleParent.cpp +++ b/dom/plugins/ipc/PluginModuleParent.cpp @@ -1278,7 +1278,7 @@ PluginModuleParent::SetPluginFuncs(NPPluginFuncs* aFuncs) aFuncs->version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR; aFuncs->javaClass = nullptr; - // Goanna should always call these functions through a PluginLibrary object. + // Gecko should always call these functions through a PluginLibrary object. aFuncs->newp = nullptr; aFuncs->clearsitedata = nullptr; aFuncs->getsiteswithdata = nullptr; diff --git a/dom/plugins/ipc/PluginModuleParent.h b/dom/plugins/ipc/PluginModuleParent.h index f641798319..482ad1925d 100644 --- a/dom/plugins/ipc/PluginModuleParent.h +++ b/dom/plugins/ipc/PluginModuleParent.h @@ -48,11 +48,11 @@ class FinishInjectorInitTask; * PluginModuleParent * * This class implements the NPP API from the perspective of the rest - * of Goanna, forwarding NPP calls along to the child process that is + * of Gecko, forwarding NPP calls along to the child process that is * actually running the plugin. * * This class /also/ implements a version of the NPN API, because the - * child process needs to make these calls back into Goanna proper. + * child process needs to make these calls back into Gecko proper. * This class is responsible for "actually" making those function calls. * * If a plugin is running, there will always be one PluginModuleParent for it in @@ -176,7 +176,7 @@ protected: InfallibleTArray& values, NPSavedData* saved, NPError* error); - // NPP-like API that Goanna calls are trampolined into. These + // NPP-like API that Gecko calls are trampolined into. These // messages then get forwarded along to the plugin instance, // and then eventually the child process. diff --git a/dom/plugins/test/testplugin/README b/dom/plugins/test/testplugin/README index 4d7f731c81..e31f11cd36 100644 --- a/dom/plugins/test/testplugin/README +++ b/dom/plugins/test/testplugin/README @@ -210,7 +210,7 @@ window. non-client area. -- On GTK2, they're relative to the top-left corner of the toplevel window's window manager frame. -This means they can be added to Goanna's window.screenX/screenY (if DPI is set +This means they can be added to Gecko's window.screenX/screenY (if DPI is set to 96) to get screen coordinates. On the platforms that support window-mode plugins (Windows/GTK2), this only works for window-mode plugins. It will throw an error for windowless plugins. diff --git a/dom/plugins/test/testplugin/nptest_macosx.mm b/dom/plugins/test/testplugin/nptest_macosx.mm index 78e8275f75..d4a65ccfdd 100644 --- a/dom/plugins/test/testplugin/nptest_macosx.mm +++ b/dom/plugins/test/testplugin/nptest_macosx.mm @@ -92,7 +92,7 @@ RectEquals(const NPRect& r1, const NPRect& r2) void pluginDoSetWindow(InstanceData* instanceData, NPWindow* newWindow) { - // Ugh. Due to a terrible Goanna bug, we have to ignore position changes + // Ugh. Due to a terrible Gecko bug, we have to ignore position changes // when the clip rect doesn't change; the position can be wrong // when set by a path other than nsPluginFrame::FixUpPluginWindow. int32_t oldX = instanceData->window.x; diff --git a/dom/plugins/test/testplugin/testplugin.mozbuild b/dom/plugins/test/testplugin/testplugin.mozbuild index c99fc6d0a6..68e70522eb 100644 --- a/dom/plugins/test/testplugin/testplugin.mozbuild +++ b/dom/plugins/test/testplugin/testplugin.mozbuild @@ -40,10 +40,10 @@ elif toolkit == 'windows': 'msimg32', ] -# must link statically with the CRT; nptest isn't Goanna code +# must link statically with the CRT; nptest isn't Gecko code USE_STATIC_LIBS = True -# Don't use STL wrappers; nptest isn't Goanna code +# Don't use STL wrappers; nptest isn't Gecko code DISABLE_STL_WRAPPING = True if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': diff --git a/dom/power/PowerManagerService.cpp b/dom/power/PowerManagerService.cpp index daec399ae9..21dfea0bf4 100644 --- a/dom/power/PowerManagerService.cpp +++ b/dom/power/PowerManagerService.cpp @@ -160,7 +160,7 @@ PowerManagerService::Restart() LOG_FUNCTION_AND_JS_STACK() // bug 839452 // FIXME/bug 796826 this implementation is currently gonk-specific, - // because it relies on the Gonk to initialize the Goanna processes to + // because it relies on the Gonk to initialize the Gecko processes to // restart B2G. It's better to do it here to have a real "restart". StartForceQuitWatchdog(eHalShutdownMode_Restart, mWatchdogTimeoutSecs); // Ensure all content processes are dead before we continue diff --git a/dom/power/nsIPowerManagerService.idl b/dom/power/nsIPowerManagerService.idl index b1fc2bb0b5..9ff4da4a8c 100644 --- a/dom/power/nsIPowerManagerService.idl +++ b/dom/power/nsIPowerManagerService.idl @@ -30,7 +30,7 @@ interface nsIPowerManagerService : nsISupports void reboot(); /** - * This API will restart the Goanna processes without powering off the machine. + * This API will restart the Gecko processes without powering off the machine. */ void restart(); diff --git a/dom/secureelement/gonk/UiccConnector.js b/dom/secureelement/gonk/UiccConnector.js index 80da941426..059e63da02 100644 --- a/dom/secureelement/gonk/UiccConnector.js +++ b/dom/secureelement/gonk/UiccConnector.js @@ -221,7 +221,7 @@ UiccConnector.prototype = { // TODO: Bug 1118106: Handle Resource management / leaks by persisting // the newly opened channel in some persistent storage so that when this // module gets restarted (say after opening a channel) in the event of - // some erroneous conditions such as goanna restart /, crash it can read + // some erroneous conditions such as gecko restart /, crash it can read // the persistent storage to check if there are any held resources // (opened channels) and close them. iccProvider.iccOpenChannel(PREFERRED_UICC_CLIENTID, aid, { diff --git a/dom/smil/nsSMILCSSProperty.cpp b/dom/smil/nsSMILCSSProperty.cpp index d1ac2630ff..5d42c8bf5d 100644 --- a/dom/smil/nsSMILCSSProperty.cpp +++ b/dom/smil/nsSMILCSSProperty.cpp @@ -186,7 +186,7 @@ nsSMILCSSProperty::ClearAnimValue() bool nsSMILCSSProperty::IsPropertyAnimatable(nsCSSProperty aPropID) { - // NOTE: Right now, Goanna doesn't recognize the following properties from + // NOTE: Right now, Gecko doesn't recognize the following properties from // the SVG Property Index: // alignment-baseline // baseline-shift @@ -256,7 +256,7 @@ nsSMILCSSProperty::IsPropertyAnimatable(nsCSSProperty aPropID) return true; // EXPLICITLY NON-ANIMATABLE PROPERTIES: - // (Some of these aren't supported at all in Goanna -- I've commented those + // (Some of these aren't supported at all in Gecko -- I've commented those // ones out. If/when we add support for them, uncomment their line here) // ---------------------------------------------------------------------- // case eCSSProperty_enable_background: diff --git a/dom/storage/DOMStorageDBThread.cpp b/dom/storage/DOMStorageDBThread.cpp index 3c815aff7d..f6a40a7bb4 100644 --- a/dom/storage/DOMStorageDBThread.cpp +++ b/dom/storage/DOMStorageDBThread.cpp @@ -476,7 +476,7 @@ DOMStorageDBThread::InitDatabase() mozStorageTransaction transaction(mWorkerConnection, false); - // Ensure Goanna 1.9.1 storage table + // Ensure Gecko 1.9.1 storage table rv = mWorkerConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( "CREATE TABLE IF NOT EXISTS webappsstore2 (" "scope TEXT, " @@ -499,7 +499,7 @@ DOMStorageDBThread::InitDatabase() bool exists; - // Check if there is storage of Goanna 1.9.0 and if so, upgrade that storage + // Check if there is storage of Gecko 1.9.0 and if so, upgrade that storage // to actual webappsstore2 table and drop the obsolete table. First process // this newer table upgrade to priority potential duplicates from older // storage table. @@ -520,7 +520,7 @@ DOMStorageDBThread::InitDatabase() NS_ENSURE_SUCCESS(rv, rv); } - // Check if there is storage of Goanna 1.8 and if so, upgrade that storage + // Check if there is storage of Gecko 1.8 and if so, upgrade that storage // to actual webappsstore2 table and drop the obsolete table. Potential // duplicates will be ignored. rv = mWorkerConnection->TableExists(NS_LITERAL_CSTRING("moz_webappsstore"), diff --git a/dom/svg/test/object-delayed-intrinsic-size.sjs b/dom/svg/test/object-delayed-intrinsic-size.sjs index 2a347843eb..0f98c4dc1e 100644 --- a/dom/svg/test/object-delayed-intrinsic-size.sjs +++ b/dom/svg/test/object-delayed-intrinsic-size.sjs @@ -8,7 +8,7 @@ function handleRequest(request, response) response.setStatusLine(null, 200, "OK"); response.setHeader("Content-Type", "image/svg+xml", false); - // We need some body output or else goanna will not do an initial reflow + // We need some body output or else gecko will not do an initial reflow // while waiting for the rest of the document to load: response.bodyOutputStream.write("\n", 1); diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp index 758a215dd3..3c55db25ae 100644 --- a/dom/system/OSFileConstants.cpp +++ b/dom/system/OSFileConstants.cpp @@ -298,7 +298,7 @@ nsresult InitOSFileConstants() } // For other directories, ignore errors (they may be undefined on - // some platforms or in non-Firefox embeddings of Goanna). + // some platforms or in non-Firefox embeddings of Gecko). GetPathToSpecialDir(NS_OS_TEMP_DIR, paths->tmpDir); GetPathToSpecialDir(NS_OS_HOME_DIR, paths->homeDir); diff --git a/dom/system/gonk/AudioManager.cpp b/dom/system/gonk/AudioManager.cpp index eda7cf2088..2287f080b1 100644 --- a/dom/system/gonk/AudioManager.cpp +++ b/dom/system/gonk/AudioManager.cpp @@ -486,7 +486,7 @@ AudioManager::AudioManager() lock->Get("audio.volume.telephony", callback); lock->Get("audio.volume.bt_sco", callback); - // Goanna only control stream volume not master so set to default value + // Gecko only control stream volume not master so set to default value // directly. AudioSystem::setMasterVolume(1.0); AudioSystem::setErrorCallback(BinderDeadCallback); diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 9eb57c9193..ade52fa510 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -3974,7 +3974,7 @@ RilObject.prototype = { continue; } - this._setDataCallGoannaState(updatedDataCall); + this._setDataCallGeckoState(updatedDataCall); if (updatedDataCall.state != currentDataCall.state) { if (updatedDataCall.state == GECKO_NETWORK_STATE_DISCONNECTED) { delete this.currentDataCalls[currentDataCall.cid]; @@ -4024,7 +4024,7 @@ RilObject.prototype = { } this.currentDataCalls[newDataCall.cid] = newDataCall; - this._setDataCallGoannaState(newDataCall); + this._setDataCallGeckoState(newDataCall); newDataCall.radioTech = newDataCallOptions.radioTech; newDataCall.apn = newDataCallOptions.apn; @@ -4039,7 +4039,7 @@ RilObject.prototype = { } }, - _setDataCallGoannaState: function(datacall) { + _setDataCallGeckoState: function(datacall) { switch (datacall.active) { case DATACALL_INACTIVE: datacall.state = GECKO_NETWORK_STATE_DISCONNECTED; @@ -11974,17 +11974,17 @@ ComprehensionTlvHelperObject.prototype = { }, /** - * Given a goannaError string, this function translates it into cause value + * Given a geckoError string, this function translates it into cause value * and write the value into buffer. * - * @param goannaError Error string that is passed to goanna. + * @param geckoError Error string that is passed to gecko. */ - writeCauseTlv: function(goannaError) { + writeCauseTlv: function(geckoError) { let GsmPDUHelper = this.context.GsmPDUHelper; let cause = -1; for (let errorNo in RIL_ERROR_TO_GECKO_ERROR) { - if (goannaError == RIL_ERROR_TO_GECKO_ERROR[errorNo]) { + if (geckoError == RIL_ERROR_TO_GECKO_ERROR[errorNo]) { cause = errorNo; break; } @@ -15029,12 +15029,12 @@ ICCUtilsHelperObject.prototype = { /** * Get whether specificed (U)SIM service is available. * - * @param goannaService + * @param geckoService * Service name like "ADN", "BDN", etc. * * @return true if the service is enabled, false otherwise. */ - isICCServiceAvailable: function(goannaService) { + isICCServiceAvailable: function(geckoService) { let RIL = this.context.RIL; let serviceTable = RIL._isCdma ? RIL.iccInfoPrivate.cst: RIL.iccInfoPrivate.sst; @@ -15056,9 +15056,9 @@ ICCUtilsHelperObject.prototype = { */ let simService; if (RIL.appType == CARD_APPTYPE_SIM) { - simService = GECKO_ICC_SERVICES.sim[goannaService]; + simService = GECKO_ICC_SERVICES.sim[geckoService]; } else { - simService = GECKO_ICC_SERVICES.ruim[goannaService]; + simService = GECKO_ICC_SERVICES.ruim[geckoService]; } if (!simService) { return false; @@ -15079,7 +15079,7 @@ ICCUtilsHelperObject.prototype = { * * @see 3GPP TS 31.102 4.2.8. */ - let usimService = GECKO_ICC_SERVICES.usim[goannaService]; + let usimService = GECKO_ICC_SERVICES.usim[geckoService]; if (!usimService) { return false; } @@ -15096,12 +15096,12 @@ ICCUtilsHelperObject.prototype = { /** * Get whether specificed CPHS service is available. * - * @param goannaService + * @param geckoService * Service name like "MDN", etc. * * @return true if the service is enabled, false otherwise. */ - isCphsServiceAvailable: function(goannaService) { + isCphsServiceAvailable: function(geckoService) { let RIL = this.context.RIL; let serviceTable = RIL.iccInfoPrivate.cphsSt; @@ -15123,7 +15123,7 @@ ICCUtilsHelperObject.prototype = { * * @See B.3.1.1 CPHS Information in CPHS Phase 2. */ - let cphsService = GECKO_ICC_SERVICES.cphs[goannaService]; + let cphsService = GECKO_ICC_SERVICES.cphs[geckoService]; if (!cphsService) { return false; diff --git a/dom/system/gonk/tests/marionette/ril_jshint/README.md b/dom/system/gonk/tests/marionette/ril_jshint/README.md index 338a35eea7..a63967d633 100644 --- a/dom/system/gonk/tests/marionette/ril_jshint/README.md +++ b/dom/system/gonk/tests/marionette/ril_jshint/README.md @@ -3,7 +3,7 @@ Test RIL Code Quality For more information, please refer to -* Bug 880643 - B2G RIL: Add a code quality test on try server for RIL javascript code in goanna +* Bug 880643 - B2G RIL: Add a code quality test on try server for RIL javascript code in gecko * Slide: https://speakerdeck.com/aknow/improve-code-quality-of-ril-code-by-jshint -* Document: https://hackpad.com/Code-Quality-Test-For-RIL-Javascript-Code-In-Goanna-cz5j7YIGiw8 +* Document: https://hackpad.com/Code-Quality-Test-For-RIL-Javascript-Code-In-Gecko-cz5j7YIGiw8 diff --git a/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js b/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js index a056dab981..3a4ee687ef 100644 --- a/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js +++ b/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js @@ -16,12 +16,12 @@ add_test(function test_is_icc_service_available() { let ICCUtilsHelper = context.ICCUtilsHelper; let RIL = context.RIL; - function test_table(sst, goannaService, simEnabled, usimEnabled) { + function test_table(sst, geckoService, simEnabled, usimEnabled) { RIL.iccInfoPrivate.sst = sst; RIL.appType = CARD_APPTYPE_SIM; - do_check_eq(ICCUtilsHelper.isICCServiceAvailable(goannaService), simEnabled); + do_check_eq(ICCUtilsHelper.isICCServiceAvailable(geckoService), simEnabled); RIL.appType = CARD_APPTYPE_USIM; - do_check_eq(ICCUtilsHelper.isICCServiceAvailable(goannaService), usimEnabled); + do_check_eq(ICCUtilsHelper.isICCServiceAvailable(geckoService), usimEnabled); } test_table([0x08], "ADN", true, false); @@ -307,12 +307,12 @@ add_test(function test_is_cphs_service_available() { let RIL = context.RIL; RIL.iccInfoPrivate.cphsSt = Uint8Array(2); - function test_table(cphsSt, goannaService) { + function test_table(cphsSt, geckoService) { RIL.iccInfoPrivate.cphsSt.set(cphsSt); for (let service in GECKO_ICC_SERVICES.cphs) { do_check_eq(ICCUtilsHelper.isCphsServiceAvailable(service), - goannaService == service); + geckoService == service); } } diff --git a/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js b/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js index 13344af94b..8055ef4a96 100644 --- a/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js +++ b/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js @@ -1487,8 +1487,8 @@ add_test(function test_read_mbdn_recovered_from_cphs_mbn() { } }; - iccUtilsHelper.isCphsServiceAvailable = function(goannaService) { - return goannaService == "MBN"; + iccUtilsHelper.isCphsServiceAvailable = function(geckoService) { + return geckoService == "MBN"; }; let isRecovered = false; diff --git a/dom/system/gonk/tests/test_ril_worker_ruim.js b/dom/system/gonk/tests/test_ril_worker_ruim.js index 497613728f..52192e8259 100644 --- a/dom/system/gonk/tests/test_ril_worker_ruim.js +++ b/dom/system/gonk/tests/test_ril_worker_ruim.js @@ -16,9 +16,9 @@ add_test(function test_is_ruim_service_available() { context.RIL._isCdma = true; context.RIL.appType = CARD_APPTYPE_RUIM; - function test_table(cst, goannaService, enabled) { + function test_table(cst, geckoService, enabled) { context.RIL.iccInfoPrivate.cst = cst; - do_check_eq(context.ICCUtilsHelper.isICCServiceAvailable(goannaService), + do_check_eq(context.ICCUtilsHelper.isICCServiceAvailable(geckoService), enabled); } diff --git a/dom/tests/mochitest/ajax/jquery/test/unit/core.js b/dom/tests/mochitest/ajax/jquery/test/unit/core.js index a7baf476b4..6d2ff6b9dc 100644 --- a/dom/tests/mochitest/ajax/jquery/test/unit/core.js +++ b/dom/tests/mochitest/ajax/jquery/test/unit/core.js @@ -61,23 +61,23 @@ test("browser", function() { /** Failing #1876 * "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; .NET CLR 2.0.50727; .NET CLR 1.1.4322; .NET CLR 3.0.04506.30)": "7.0", */ - //Browsers with Goanna engine + //Browsers with Gecko engine //Mozilla - "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Goanna/20050915" : "1.7.12", + "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915" : "1.7.12", //Firefox - "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.3) Goanna/20070309 Firefox/2.0.0.3": "1.8.1.3", + "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3": "1.8.1.3", //Netscape - "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Goanna/20070321 Netscape/8.1.3" : "1.7.5", + "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20070321 Netscape/8.1.3" : "1.7.5", //Flock - "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.11) Goanna/20070321 Firefox/1.5.0.11 Flock/0.7.12" : "1.8.0.11", + "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.11) Gecko/20070321 Firefox/1.5.0.11 Flock/0.7.12" : "1.8.0.11", //Opera browser "Opera/9.20 (X11; Linux x86_64; U; en)": "9.20", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 9.20" : "9.20", - "Mozilla/5.0 (Windows NT 5.1; U; pl; rv:1.8.0) Goanna/20060728 Firefox/1.5.0 Opera 9.20": "9.20", + "Mozilla/5.0 (Windows NT 5.1; U; pl; rv:1.8.0) Gecko/20060728 Firefox/1.5.0 Opera 9.20": "9.20", //WebKit engine - "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; sv-se) AppleWebKit/418.9 (KHTML, like Goanna) Safari/419.3": "418.9", - "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.8 (KHTML, like Goanna) Safari/419.3" : "418.8", - "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; sv-se) AppleWebKit/312.8 (KHTML, like Goanna) Safari/312.5": "312.8", + "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; sv-se) AppleWebKit/418.9 (KHTML, like Gecko) Safari/419.3": "418.9", + "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.8 (KHTML, like Gecko) Safari/419.3" : "418.8", + "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; sv-se) AppleWebKit/312.8 (KHTML, like Gecko) Safari/312.5": "312.8", //Other user agent string "Other browser's user agent 1.0":null }; diff --git a/dom/tests/mochitest/ajax/mochikit/MochiKit/DragAndDrop.js b/dom/tests/mochitest/ajax/mochikit/MochiKit/DragAndDrop.js index 0235a789a7..c471ffe900 100644 --- a/dom/tests/mochitest/ajax/mochikit/MochiKit/DragAndDrop.js +++ b/dom/tests/mochitest/ajax/mochikit/MochiKit/DragAndDrop.js @@ -722,7 +722,7 @@ MochiKit.DragAndDrop.Draggable.prototype = { style.top = p[1] + 'px'; } if (style.visibility == 'hidden') { - style.visibility = ''; // fix goanna rendering + style.visibility = ''; // fix gecko rendering } }, diff --git a/dom/tests/mochitest/ajax/mochikit/MochiKit/Sortable.js b/dom/tests/mochitest/ajax/mochikit/MochiKit/Sortable.js index 98dbfc4959..8976ec0b27 100644 --- a/dom/tests/mochitest/ajax/mochikit/MochiKit/Sortable.js +++ b/dom/tests/mochitest/ajax/mochikit/MochiKit/Sortable.js @@ -216,7 +216,7 @@ MochiKit.Base.update(MochiKit.Sortable, { accept: options.accept } - // fix for goanna engine + // fix for gecko engine MochiKit.DOM.removeEmptyTextNodes(element); options.draggables = []; @@ -334,7 +334,7 @@ MochiKit.Base.update(MochiKit.Sortable, { self.mark(dropon, 'before'); if (dropon.previousSibling != element) { var oldParentNode = element.parentNode; - element.style.visibility = 'hidden'; // fix goanna rendering + element.style.visibility = 'hidden'; // fix gecko rendering dropon.parentNode.insertBefore(element, dropon); if (dropon.parentNode != oldParentNode) { self.options(oldParentNode).onChange(element); @@ -346,7 +346,7 @@ MochiKit.Base.update(MochiKit.Sortable, { var nextElement = dropon.nextSibling || null; if (nextElement != element) { var oldParentNode = element.parentNode; - element.style.visibility = 'hidden'; // fix goanna rendering + element.style.visibility = 'hidden'; // fix gecko rendering dropon.parentNode.insertBefore(element, nextElement); if (dropon.parentNode != oldParentNode) { self.options(oldParentNode).onChange(element); diff --git a/dom/tests/mochitest/ajax/mochikit/MochiKit/Style.js b/dom/tests/mochitest/ajax/mochikit/MochiKit/Style.js index 412b4d5a5b..93e77862af 100644 --- a/dom/tests/mochitest/ajax/mochikit/MochiKit/Style.js +++ b/dom/tests/mochitest/ajax/mochikit/MochiKit/Style.js @@ -173,7 +173,7 @@ MochiKit.Base.update(MochiKit.Style, { elem = MochiKit.DOM.getElement(elem); var self = MochiKit.Style; if (o == 1) { - var toSet = /Goanna/.test(navigator.userAgent) && !(/Konqueror|AppleWebKit|KHTML/.test(navigator.userAgent)); + var toSet = /Gecko/.test(navigator.userAgent) && !(/Konqueror|AppleWebKit|KHTML/.test(navigator.userAgent)); elem.style["opacity"] = toSet ? 0.999999 : 1.0; if (/MSIE/.test(navigator.userAgent)) { elem.style['filter'] = diff --git a/dom/tests/mochitest/ajax/prototype/dist/prototype.js b/dom/tests/mochitest/ajax/prototype/dist/prototype.js index a5b735d9c1..69f82032a8 100644 --- a/dom/tests/mochitest/ajax/prototype/dist/prototype.js +++ b/dom/tests/mochitest/ajax/prototype/dist/prototype.js @@ -13,7 +13,7 @@ var Prototype = { IE: !!(window.attachEvent && !window.opera), Opera: !!window.opera, WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1, - Goanna: navigator.userAgent.indexOf('Goanna') > -1 && navigator.userAgent.indexOf('KHTML') == -1, + Gecko: navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1, MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/) }, @@ -1322,7 +1322,7 @@ Ajax.Request = Class.create(Ajax.Base, { * Content-length header. See Mozilla Bugzilla #246651. */ if (this.transport.overrideMimeType && - (navigator.userAgent.match(/Goanna\/(\d{4})/) || [0,2005])[1] < 2005) + (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005) headers['Connection'] = 'close'; } @@ -2610,7 +2610,7 @@ else if (Prototype.Browser.IE) { })(Element._attributeTranslations.read.values); } -else if (Prototype.Browser.Goanna && /rv:1\.8\.0/.test(navigator.userAgent)) { +else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) { Element.Methods.setOpacity = function(element, value) { element = $(element); element.style.opacity = (value == 1) ? 0.999999 : diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/base_test.js b/dom/tests/mochitest/ajax/prototype/test/unit/base_test.js index 048b11c59b..f2843128a0 100644 --- a/dom/tests/mochitest/ajax/prototype/test/unit/base_test.js +++ b/dom/tests/mochitest/ajax/prototype/test/unit/base_test.js @@ -374,9 +374,9 @@ new Test.Unit.Runner({ this.assert(Prototype.Browser.IE); } - if (navigator.userAgent.indexOf('Goanna') > -1 && navigator.userAgent.indexOf('KHTML') == -1) { - this.info('Running on Goanna'); - this.assert(Prototype.Browser.Goanna); + if (navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1) { + this.info('Running on Gecko'); + this.assert(Prototype.Browser.Gecko); } }, diff --git a/dom/tests/mochitest/ajax/scriptaculous/lib/prototype.js b/dom/tests/mochitest/ajax/scriptaculous/lib/prototype.js index 3a2e0a2464..1beb8a89ab 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/lib/prototype.js +++ b/dom/tests/mochitest/ajax/scriptaculous/lib/prototype.js @@ -13,7 +13,7 @@ var Prototype = { IE: !!(window.attachEvent && !window.opera), Opera: !!window.opera, WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1, - Goanna: navigator.userAgent.indexOf('Goanna') > -1 && navigator.userAgent.indexOf('KHTML') == -1 + Gecko: navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1 }, BrowserFeatures: { @@ -1075,7 +1075,7 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), { * Content-length header. See Mozilla Bugzilla #246651. */ if (this.transport.overrideMimeType && - (navigator.userAgent.match(/Goanna\/(\d{4})/) || [0,2005])[1] < 2005) + (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005) headers['Connection'] = 'close'; } @@ -1752,7 +1752,7 @@ else if (Prototype.Browser.IE) { return element; } } -else if (Prototype.Browser.Goanna) { +else if (Prototype.Browser.Gecko) { Element.Methods.setOpacity = function(element, value) { element = $(element); element.style.opacity = (value == 1) ? 0.999999 : diff --git a/dom/tests/mochitest/ajax/scriptaculous/src/dragdrop.js b/dom/tests/mochitest/ajax/scriptaculous/src/dragdrop.js index 0838aeb2a6..10c7c93264 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/src/dragdrop.js +++ b/dom/tests/mochitest/ajax/scriptaculous/src/dragdrop.js @@ -490,7 +490,7 @@ Draggable.prototype = { if((!this.options.constraint) || (this.options.constraint=='vertical')) style.top = p[1] + "px"; - if(style.visibility=="hidden") style.visibility = ""; // fix goanna rendering + if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering }, stopScrolling: function() { @@ -696,7 +696,7 @@ var Sortable = { hoverclass: options.hoverclass } - // fix for goanna engine + // fix for gecko engine Element.cleanWhitespace(element); options.draggables = []; @@ -754,7 +754,7 @@ var Sortable = { Sortable.mark(dropon, 'before'); if(dropon.previousSibling != element) { var oldParentNode = element.parentNode; - element.style.visibility = "hidden"; // fix goanna rendering + element.style.visibility = "hidden"; // fix gecko rendering dropon.parentNode.insertBefore(element, dropon); if(dropon.parentNode!=oldParentNode) Sortable.options(oldParentNode).onChange(element); @@ -765,7 +765,7 @@ var Sortable = { var nextElement = dropon.nextSibling || null; if(nextElement != element) { var oldParentNode = element.parentNode; - element.style.visibility = "hidden"; // fix goanna rendering + element.style.visibility = "hidden"; // fix gecko rendering dropon.parentNode.insertBefore(element, nextElement); if(dropon.parentNode!=oldParentNode) Sortable.options(oldParentNode).onChange(element); diff --git a/dom/tests/mochitest/ajax/scriptaculous/src/sound.js b/dom/tests/mochitest/ajax/scriptaculous/src/sound.js index 534edb8bbb..46618d9012 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/src/sound.js +++ b/dom/tests/mochitest/ajax/scriptaculous/src/sound.js @@ -52,7 +52,7 @@ Sound = { } }; -if(Prototype.Browser.Goanna && navigator.userAgent.indexOf("Win") > 0){ +if(Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0){ if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('QuickTime') != -1 })) Sound.template = new Template('') else diff --git a/dom/tests/mochitest/bugs/test_bug411103.html b/dom/tests/mochitest/bugs/test_bug411103.html index 806880a267..3830cf0332 100644 --- a/dom/tests/mochitest/bugs/test_bug411103.html +++ b/dom/tests/mochitest/bugs/test_bug411103.html @@ -65,7 +65,7 @@ var allNSTests = { args: ["http://example.com/", "\u0BC6:a"], code: 14, message: "non-ASCII character after colon is CombiningChar, which is " + "NCNameChar but not (Letter | \"_\") so invalid at start of " + - "NCName (Goanna chooses to throw 14 here, but either is valid " + + "NCName (Gecko chooses to throw 14 here, but either is valid " + "as this is both an invalid XML name and an invalid QName)" }, { args: ["http://example.com/", "a:a\u0BC6"] }, { args: ["http://example.com/", "a\u0BC6:a"] }, diff --git a/dom/tests/mochitest/fetch/test_request.js b/dom/tests/mochitest/fetch/test_request.js index 93b9232078..3d7148f982 100644 --- a/dom/tests/mochitest/fetch/test_request.js +++ b/dom/tests/mochitest/fetch/test_request.js @@ -246,13 +246,13 @@ function testBodyCreation() { // FormData has its own function since it has blobs and files. var params = new URLSearchParams(); - params.append("item", "Goannas"); + params.append("item", "Geckos"); params.append("feature", "stickyfeet"); params.append("quantity", "700"); var req3 = new Request("", { method: 'post', body: params }); var p3 = req3.text().then(function(v) { var extracted = new URLSearchParams(v); - is(extracted.get("item"), "Goannas", "Param should match"); + is(extracted.get("item"), "Geckos", "Param should match"); is(extracted.get("feature"), "stickyfeet", "Param should match"); is(extracted.get("quantity"), "700", "Param should match"); }); diff --git a/dom/tests/mochitest/fetch/test_response.js b/dom/tests/mochitest/fetch/test_response.js index fd51bcc7d2..3bafaa2bcb 100644 --- a/dom/tests/mochitest/fetch/test_response.js +++ b/dom/tests/mochitest/fetch/test_response.js @@ -143,13 +143,13 @@ function testBodyCreation() { }); var params = new URLSearchParams(); - params.append("item", "Goannas"); + params.append("item", "Geckos"); params.append("feature", "stickyfeet"); params.append("quantity", "700"); var res3 = new Response(params); var p3 = res3.text().then(function(v) { var extracted = new URLSearchParams(v); - is(extracted.get("item"), "Goannas", "Param should match"); + is(extracted.get("item"), "Geckos", "Param should match"); is(extracted.get("feature"), "stickyfeet", "Param should match"); is(extracted.get("quantity"), "700", "Param should match"); }); diff --git a/dom/tests/mochitest/whatwg/browserFu.js b/dom/tests/mochitest/whatwg/browserFu.js index c3e2f9ecf2..3fb5bdf956 100644 --- a/dom/tests/mochitest/whatwg/browserFu.js +++ b/dom/tests/mochitest/whatwg/browserFu.js @@ -3,4 +3,4 @@ * in other browsers but which we wish to test. */ -var isMozilla = navigator.product === "Goanna" && "buildID" in navigator; +var isMozilla = navigator.product === "Gecko" && "buildID" in navigator; diff --git a/dom/tests/mochitest/whatwg/postMessage_userpass_helper.html b/dom/tests/mochitest/whatwg/postMessage_userpass_helper.html index 5dec56d8a5..fab25b59d7 100644 --- a/dom/tests/mochitest/whatwg/postMessage_userpass_helper.html +++ b/dom/tests/mochitest/whatwg/postMessage_userpass_helper.html @@ -18,7 +18,7 @@ function sendMessage(evt) msg += " wrong-source"; // It would be good to guarantee that we've been opened with a userinfo of - // "bobhope:password", but Goanna elides that from the content-visible URL, + // "bobhope:password", but Gecko elides that from the content-visible URL, // and I can't find another way to actually detect this programmatically. window.parent.postMessage(msg, "http://mochi.test:8888"); diff --git a/dom/tests/mochitest/whatwg/test_postMessage_special.xhtml b/dom/tests/mochitest/whatwg/test_postMessage_special.xhtml index 34343c7583..bf443af99b 100644 --- a/dom/tests/mochitest/whatwg/test_postMessage_special.xhtml +++ b/dom/tests/mochitest/whatwg/test_postMessage_special.xhtml @@ -94,7 +94,7 @@ function sourceify(v) function messageReceiver(evt) { // It's not clear what the security model is for data: URLs and whether they - // can access their parents; WebKit denies access, while Goanna currently + // can access their parents; WebKit denies access, while Gecko currently // allows it. We work around this problem by using postMessage (surprise!) // to start the round of tests when each iframe loads. if (evt.data === "next-test") diff --git a/dom/tv/nsITVService.idl b/dom/tv/nsITVService.idl index 30c2d6e7fc..f379969917 100644 --- a/dom/tv/nsITVService.idl +++ b/dom/tv/nsITVService.idl @@ -16,7 +16,7 @@ interface nsIArray; /** * XPCOM component which acts as the container for tuner data. * - * NOTE: Use do_CreateInstance() to create the Goanna provided implementation, + * NOTE: Use do_CreateInstance() to create the Gecko provided implementation, * and then uses the setter functions to adjust the properties of the object * before passing it. */ @@ -56,7 +56,7 @@ interface nsITVTunerData : nsISupports /** * XPCOM component which acts as the container for channel data. * - * NOTE: Use do_CreateInstance() to create the Goanna provided implementation, + * NOTE: Use do_CreateInstance() to create the Gecko provided implementation, * and then uses the setter functions to adjust the properties of the object * before passing it. */ @@ -83,7 +83,7 @@ interface nsITVChannelData : nsISupports /** * XPCOM component which acts as the container for program data. * - * NOTE: Use do_CreateInstance() to create the Goanna provided implementation, + * NOTE: Use do_CreateInstance() to create the Gecko provided implementation, * and then uses the setter functions to adjust the properties of the object * before passing it. */ diff --git a/dom/webidl/AnonymousContent.webidl b/dom/webidl/AnonymousContent.webidl index 71055e3415..8aa44e19df 100644 --- a/dom/webidl/AnonymousContent.webidl +++ b/dom/webidl/AnonymousContent.webidl @@ -12,7 +12,7 @@ * * This API never returns a reference to the actual inserted DOM node on * purpose. This is to make sure the content cannot be randomly changed and the - * DOM cannot be traversed from the node, so that Goanna can remain in control of + * DOM cannot be traversed from the node, so that Gecko can remain in control of * the inserted content. */ diff --git a/dom/webidl/CaretPosition.webidl b/dom/webidl/CaretPosition.webidl index 074781a2c1..5907b40d50 100644 --- a/dom/webidl/CaretPosition.webidl +++ b/dom/webidl/CaretPosition.webidl @@ -13,7 +13,7 @@ interface CaretPosition { }; /** - * Goanna specific methods and properties for CaretPosition. + * Gecko specific methods and properties for CaretPosition. */ partial interface CaretPosition { DOMRect? getClientRect(); diff --git a/dom/webidl/CustomEvent.webidl b/dom/webidl/CustomEvent.webidl index fd1c5535a1..180159b33a 100644 --- a/dom/webidl/CustomEvent.webidl +++ b/dom/webidl/CustomEvent.webidl @@ -15,7 +15,7 @@ interface CustomEvent : Event { readonly attribute any detail; - // initCustomEvent is a Goanna specific deprecated method. + // initCustomEvent is a Gecko specific deprecated method. [Throws] void initCustomEvent(DOMString type, boolean canBubble, diff --git a/dom/webidl/DOMException.webidl b/dom/webidl/DOMException.webidl index f83f05c69f..a00f13a329 100644 --- a/dom/webidl/DOMException.webidl +++ b/dom/webidl/DOMException.webidl @@ -104,6 +104,6 @@ interface DOMException { readonly attribute unsigned short code; }; -// XXXkhuey copy all of Goanna's non-standard stuff onto DOMException, but leave +// XXXkhuey copy all of Gecko's non-standard stuff onto DOMException, but leave // the prototype chain sane. DOMException implements ExceptionMembers; diff --git a/dom/webidl/DeviceOrientationEvent.webidl b/dom/webidl/DeviceOrientationEvent.webidl index 7cd4cd5663..3cd053b66f 100644 --- a/dom/webidl/DeviceOrientationEvent.webidl +++ b/dom/webidl/DeviceOrientationEvent.webidl @@ -12,7 +12,7 @@ interface DeviceOrientationEvent : Event readonly attribute double? gamma; readonly attribute boolean absolute; - // initDeviceOrientationEvent is a Goanna specific deprecated method. + // initDeviceOrientationEvent is a Gecko specific deprecated method. [Throws] void initDeviceOrientationEvent(DOMString type, boolean canBubble, diff --git a/dom/webidl/Document.webidl b/dom/webidl/Document.webidl index c499f948ca..1ed9f98b84 100644 --- a/dom/webidl/Document.webidl +++ b/dom/webidl/Document.webidl @@ -78,7 +78,7 @@ interface Document : Node { // void append((Node or DOMString)... nodes); // These are not in the spec, but leave them for now for backwards compat. - // So sort of like Goanna extensions + // So sort of like Gecko extensions [NewObject, Throws] CDATASection createCDATASection(DOMString data); [NewObject, Throws] @@ -143,7 +143,7 @@ partial interface Document { // special event handler IDL attributes that only apply to Document objects [LenientThis] attribute EventHandler onreadystatechange; - // Goanna extensions? + // Gecko extensions? attribute EventHandler onwheel; attribute EventHandler oncopy; attribute EventHandler oncut; @@ -226,7 +226,7 @@ partial interface Document { //(Renamed?)void exitFullscreen(); - // Goanna-specific fullscreen bits + // Gecko-specific fullscreen bits readonly attribute boolean mozFullScreen; void mozCancelFullScreen(); }; diff --git a/dom/webidl/Element.webidl b/dom/webidl/Element.webidl index a0136ae7b6..302ef0a7a0 100644 --- a/dom/webidl/Element.webidl +++ b/dom/webidl/Element.webidl @@ -132,10 +132,10 @@ interface Element : Node { * Requests that this element be made the full-screen element, as per the DOM * full-screen api. * - * The options parameter is non-standard. In Goanna, it can be: + * The options parameter is non-standard. In Gecko, it can be: * a RequestFullscreenOptions object * - * @see + * @see */ [Throws, UnsafeInPrerendering] void mozRequestFullScreen(optional any options); diff --git a/dom/webidl/MutationObserver.webidl b/dom/webidl/MutationObserver.webidl index b8c0fb528b..e1bbccd425 100644 --- a/dom/webidl/MutationObserver.webidl +++ b/dom/webidl/MutationObserver.webidl @@ -11,7 +11,7 @@ interface MutationRecord { [Constant] readonly attribute DOMString type; // .target is not nullable per the spec, but in order to prevent crashes, - // if there are GC/CC bugs in Goanna, we let the property to be null. + // if there are GC/CC bugs in Gecko, we let the property to be null. [Constant] readonly attribute Node? target; [Constant] diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl index bd7eb671c8..c2962183fa 100644 --- a/dom/webidl/Navigator.webidl +++ b/dom/webidl/Navigator.webidl @@ -44,7 +44,7 @@ interface NavigatorID { [Constant, Cached] readonly attribute DOMString userAgent; [Constant, Cached] - readonly attribute DOMString product; // constant "Goanna" + readonly attribute DOMString product; // constant "Gecko" // Everyone but WebKit/Blink supports this. See bug 679971. boolean taintEnabled(); // constant false diff --git a/dom/webidl/SettingChangeNotification.webidl b/dom/webidl/SettingChangeNotification.webidl index 4e2496acd3..11c097e3dd 100644 --- a/dom/webidl/SettingChangeNotification.webidl +++ b/dom/webidl/SettingChangeNotification.webidl @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ -// Used internally by Goanna +// Used internally by Gecko dictionary SettingChangeNotification { DOMString key = ""; any value; diff --git a/dom/webidl/XMLDocument.webidl b/dom/webidl/XMLDocument.webidl index 640ba88ffa..0f503c9f5c 100644 --- a/dom/webidl/XMLDocument.webidl +++ b/dom/webidl/XMLDocument.webidl @@ -17,7 +17,7 @@ partial interface XMLDocument { boolean load(DOMString url); }; -// Goanna extensions? +// Gecko extensions? partial interface XMLDocument { attribute boolean async; }; diff --git a/dom/wifi/WifiProxyService.cpp b/dom/wifi/WifiProxyService.cpp index 9fa4a03f58..6efd7df7c0 100644 --- a/dom/wifi/WifiProxyService.cpp +++ b/dom/wifi/WifiProxyService.cpp @@ -13,7 +13,7 @@ #include "WifiUtils.h" #ifdef MOZ_TASK_TRACER -#include "GoannaTaskTracer.h" +#include "GeckoTaskTracer.h" using namespace mozilla::tasktracer; #endif diff --git a/dom/wifi/WifiWorker.js b/dom/wifi/WifiWorker.js index 186b2c9af9..b00403dc98 100755 --- a/dom/wifi/WifiWorker.js +++ b/dom/wifi/WifiWorker.js @@ -3027,10 +3027,10 @@ WifiWorker.prototype = { /** * Compatibility flags for detecting if Gaia is controlling wifi by settings - * or API, once API is called, goanna will no longer accept wifi enable + * or API, once API is called, gecko will no longer accept wifi enable * control from settings. * This is used to deal with compatibility issue while Gaia adopted to use - * API but goanna doesn't remove the settings code in time. + * API but gecko doesn't remove the settings code in time. * TODO: Remove this flag in Bug 1050147 */ ignoreWifiEnabledFromSettings: false, diff --git a/dom/workers/DataStore.cpp b/dom/workers/DataStore.cpp index acea524304..7939b30b3a 100644 --- a/dom/workers/DataStore.cpp +++ b/dom/workers/DataStore.cpp @@ -37,7 +37,7 @@ WorkerDataStore::WorkerDataStore(WorkerGlobalScope* aScope) already_AddRefed WorkerDataStore::Constructor(GlobalObject& aGlobal, ErrorResult& aRv) { - // We don't allow Goanna to create WorkerDataStore through JS codes like + // We don't allow Gecko to create WorkerDataStore through JS codes like // window.DataStore() on the worker, so disable this for now. NS_NOTREACHED("Cannot use the chrome constructor on the worker!"); return nullptr; diff --git a/dom/workers/DataStoreCursor.cpp b/dom/workers/DataStoreCursor.cpp index 0a02fd6e92..403c948c08 100644 --- a/dom/workers/DataStoreCursor.cpp +++ b/dom/workers/DataStoreCursor.cpp @@ -36,7 +36,7 @@ WorkerDataStoreCursor::WorkerDataStoreCursor(WorkerDataStore* aWorkerStore) already_AddRefed WorkerDataStoreCursor::Constructor(GlobalObject& aGlobal, ErrorResult& aRv) { - // We don't allow Goanna to create WorkerDataStoreCursor through JS codes like + // We don't allow Gecko to create WorkerDataStoreCursor through JS codes like // window.DataStoreCursor() on the worker, so disable this for now. NS_NOTREACHED("Cannot use the chrome constructor on the worker!"); return nullptr; diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp index c9fad4f4dd..ee3973ac47 100644 --- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp @@ -308,7 +308,7 @@ LogErrorToConsole(const nsAString& aMessage, static const char kErrorString[] = "JS error in Web Worker: %s [%s:%u]"; #ifdef ANDROID - __android_log_print(ANDROID_LOG_INFO, "Goanna", kErrorString, msg.get(), + __android_log_print(ANDROID_LOG_INFO, "Gecko", kErrorString, msg.get(), filename.get(), aLineNumber); #endif diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp index 686d480e0b..8da9ddcb20 100644 --- a/dom/workers/WorkerScope.cpp +++ b/dom/workers/WorkerScope.cpp @@ -314,7 +314,7 @@ WorkerGlobalScope::Dump(const Optional& aString) const NS_ConvertUTF16toUTF8 str(aString.Value()); #ifdef ANDROID - __android_log_print(ANDROID_LOG_INFO, "Goanna", "%s", str.get()); + __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", str.get()); #endif fputs(str.get(), stdout); fflush(stdout); diff --git a/dom/xbl/nsBindingManager.cpp b/dom/xbl/nsBindingManager.cpp index a206acc1ea..a45b7b0cd3 100644 --- a/dom/xbl/nsBindingManager.cpp +++ b/dom/xbl/nsBindingManager.cpp @@ -395,7 +395,7 @@ nsBindingManager::DoProcessAttachedQueue() // They're evil, but we'll fight back! Just poll on them being // done and repost the attached queue event. // - // But don't poll in a tight loop -- otherwise we keep the Goanna + // But don't poll in a tight loop -- otherwise we keep the Gecko // event loop non-empty and trigger bug 1021240 on OS X. nsresult rv = NS_ERROR_FAILURE; nsCOMPtr timer = do_CreateInstance(NS_TIMER_CONTRACTID); diff --git a/dom/xslt/tests/mochitest/test_bug603159.html b/dom/xslt/tests/mochitest/test_bug603159.html index a7063ff942..ac0191bd39 100644 --- a/dom/xslt/tests/mochitest/test_bug603159.html +++ b/dom/xslt/tests/mochitest/test_bug603159.html @@ -38,7 +38,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=603159 var content = document.getElementById("content"); content.appendChild(fragment); - // use Goanna's Date.parse to parse, then compare the milliseconds since epoch + // use Gecko's Date.parse to parse, then compare the milliseconds since epoch var xslt_ms = Date.parse(content.innerHTML); var now_ms = new Date().getTime(); var accepted_diff = 30 * 60 * 1000; // 30 minutes diff --git a/dom/xul/nsIXULOverlayProvider.idl b/dom/xul/nsIXULOverlayProvider.idl index 2c17db9e54..f74a1717dc 100644 --- a/dom/xul/nsIXULOverlayProvider.idl +++ b/dom/xul/nsIXULOverlayProvider.idl @@ -10,7 +10,7 @@ interface nsIURI; /** * The chrome registry implements this interface to give overlays - * to the goanna XUL engine. + * to the gecko XUL engine. */ [scriptable, uuid(1d5b5b94-dc47-4050-93b7-ac092e383cad)] diff --git a/dom/xul/nsXULContentSink.cpp b/dom/xul/nsXULContentSink.cpp index 94523c0920..ab1498df61 100644 --- a/dom/xul/nsXULContentSink.cpp +++ b/dom/xul/nsXULContentSink.cpp @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* - * An implementation for a Goanna-style content sink that knows how + * An implementation for a Gecko-style content sink that knows how * to build a content model (the "prototype" document) from XUL. * * For more information on XUL, diff --git a/editor/composer/nsEditingSession.cpp b/editor/composer/nsEditingSession.cpp index 68b6153431..48c1d257e1 100644 --- a/editor/composer/nsEditingSession.cpp +++ b/editor/composer/nsEditingSession.cpp @@ -980,7 +980,7 @@ nsEditingSession::EndDocumentLoad(nsIWebProgress *aWebProgress, if (makeEditable) { - // To keep pre Goanna 1.9 behavior, setup editor always when + // To keep pre Gecko 1.9 behavior, setup editor always when // mMakeWholeDocumentEditable. bool needsSetup = false; if (mMakeWholeDocumentEditable) { diff --git a/editor/libeditor/nsEditorEventListener.cpp b/editor/libeditor/nsEditorEventListener.cpp index f3967149d4..5a23d23426 100644 --- a/editor/libeditor/nsEditorEventListener.cpp +++ b/editor/libeditor/nsEditorEventListener.cpp @@ -472,7 +472,7 @@ nsEditorEventListener::HandleEvent(nsIDOMEvent* aEvent) nsAutoString eventType; aEvent->GetType(eventType); // We should accept "focus" and "blur" event even if it's synthesized with - // wrong interface for compatibility with older Goanna. + // wrong interface for compatibility with older Gecko. if (eventType.EqualsLiteral("focus")) { return Focus(aEvent); } diff --git a/editor/libeditor/nsHTMLEditor.cpp b/editor/libeditor/nsHTMLEditor.cpp index c050fb1037..6a8ecdef20 100644 --- a/editor/libeditor/nsHTMLEditor.cpp +++ b/editor/libeditor/nsHTMLEditor.cpp @@ -2840,7 +2840,7 @@ nsHTMLEditor::AddOverrideStyleSheet(const nsAString& aURL) // XXXbz Except this will actually try to load remote files // synchronously, of course.. nsRefPtr sheet; - // Editor override style sheets may want to style Goanna anonymous boxes + // Editor override style sheets may want to style Gecko anonymous boxes rv = ps->GetDocument()->CSSLoader()-> LoadSheetSync(uaURI, true, true, getter_AddRefs(sheet)); diff --git a/editor/libeditor/tests/browserscope/lib/richtext/richtext/js/range.js b/editor/libeditor/tests/browserscope/lib/richtext/richtext/js/range.js index 018ea0e35a..3e4463e118 100644 --- a/editor/libeditor/tests/browserscope/lib/richtext/richtext/js/range.js +++ b/editor/libeditor/tests/browserscope/lib/richtext/richtext/js/range.js @@ -69,20 +69,20 @@ var goog$now = Date.now || function() { else if(left > right)return 1; return 0 }; -goog$now();var goog$userAgent$detectedOpera_, goog$userAgent$detectedIe_, goog$userAgent$detectedWebkit_, goog$userAgent$detectedMobile_, goog$userAgent$detectedGoanna_, goog$userAgent$detectedCamino_, goog$userAgent$detectedMac_, goog$userAgent$detectedWindows_, goog$userAgent$detectedLinux_, goog$userAgent$detectedX11_, goog$userAgent$getUserAgentString = function() { +goog$now();var goog$userAgent$detectedOpera_, goog$userAgent$detectedIe_, goog$userAgent$detectedWebkit_, goog$userAgent$detectedMobile_, goog$userAgent$detectedGecko_, goog$userAgent$detectedCamino_, goog$userAgent$detectedMac_, goog$userAgent$detectedWindows_, goog$userAgent$detectedLinux_, goog$userAgent$detectedX11_, goog$userAgent$getUserAgentString = function() { return goog$global.navigator ? goog$global.navigator.userAgent : null }, goog$userAgent$getNavigator = function() { return goog$global.navigator }; -goog$userAgent$detectedCamino_ = goog$userAgent$detectedGoanna_ = goog$userAgent$detectedMobile_ = goog$userAgent$detectedWebkit_ = goog$userAgent$detectedIe_ = goog$userAgent$detectedOpera_ = false; +goog$userAgent$detectedCamino_ = goog$userAgent$detectedGecko_ = goog$userAgent$detectedMobile_ = goog$userAgent$detectedWebkit_ = goog$userAgent$detectedIe_ = goog$userAgent$detectedOpera_ = false; var JSCompiler_inline_ua_15; if(JSCompiler_inline_ua_15 = goog$userAgent$getUserAgentString()) { var JSCompiler_inline_navigator$$1_16 = goog$userAgent$getNavigator(); goog$userAgent$detectedOpera_ = JSCompiler_inline_ua_15.indexOf("Opera") == 0; goog$userAgent$detectedIe_ = !goog$userAgent$detectedOpera_ && JSCompiler_inline_ua_15.indexOf("MSIE") != -1; goog$userAgent$detectedMobile_ = (goog$userAgent$detectedWebkit_ = !goog$userAgent$detectedOpera_ && JSCompiler_inline_ua_15.indexOf("WebKit") != -1) && JSCompiler_inline_ua_15.indexOf("Mobile") != -1; - goog$userAgent$detectedCamino_ = (goog$userAgent$detectedGoanna_ = !goog$userAgent$detectedOpera_ && !goog$userAgent$detectedWebkit_ && JSCompiler_inline_navigator$$1_16.product == "Goanna") && JSCompiler_inline_navigator$$1_16.vendor == "Camino" -}var goog$userAgent$OPERA = goog$userAgent$detectedOpera_, goog$userAgent$IE = goog$userAgent$detectedIe_, goog$userAgent$GECKO = goog$userAgent$detectedGoanna_, goog$userAgent$WEBKIT = goog$userAgent$detectedWebkit_, goog$userAgent$MOBILE = goog$userAgent$detectedMobile_, goog$userAgent$PLATFORM, JSCompiler_inline_navigator$$2_19 = goog$userAgent$getNavigator(); + goog$userAgent$detectedCamino_ = (goog$userAgent$detectedGecko_ = !goog$userAgent$detectedOpera_ && !goog$userAgent$detectedWebkit_ && JSCompiler_inline_navigator$$1_16.product == "Gecko") && JSCompiler_inline_navigator$$1_16.vendor == "Camino" +}var goog$userAgent$OPERA = goog$userAgent$detectedOpera_, goog$userAgent$IE = goog$userAgent$detectedIe_, goog$userAgent$GECKO = goog$userAgent$detectedGecko_, goog$userAgent$WEBKIT = goog$userAgent$detectedWebkit_, goog$userAgent$MOBILE = goog$userAgent$detectedMobile_, goog$userAgent$PLATFORM, JSCompiler_inline_navigator$$2_19 = goog$userAgent$getNavigator(); goog$userAgent$PLATFORM = JSCompiler_inline_navigator$$2_19 && JSCompiler_inline_navigator$$2_19.platform || ""; goog$userAgent$detectedMac_ = goog$string$contains(goog$userAgent$PLATFORM, "Mac"); goog$userAgent$detectedWindows_ = goog$string$contains(goog$userAgent$PLATFORM, "Win"); @@ -490,7 +490,7 @@ goog$dom$browserrange$AbstractRange.prototype.containsBrowserRange = function(ra } }; goog$dom$browserrange$AbstractRange.prototype.containsNode = function(node, opt_allowPartial) { - return this.containsRange(goog$userAgent$IE ? goog$dom$browserrange$IeRange$createFromNodeContents(node) : goog$userAgent$WEBKIT ? new goog$dom$browserrange$WebKitRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)) : goog$userAgent$GECKO ? new goog$dom$browserrange$GoannaRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)) : new goog$dom$browserrange$W3cRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)), opt_allowPartial) + return this.containsRange(goog$userAgent$IE ? goog$dom$browserrange$IeRange$createFromNodeContents(node) : goog$userAgent$WEBKIT ? new goog$dom$browserrange$WebKitRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)) : goog$userAgent$GECKO ? new goog$dom$browserrange$GeckoRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)) : new goog$dom$browserrange$W3cRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)), opt_allowPartial) }; goog$dom$browserrange$AbstractRange.prototype.__iterator__ = function() { return new goog$dom$TextRangeIterator(this.getStartNode(), this.getStartOffset(), this.getEndNode(), this.getEndOffset()) @@ -545,11 +545,11 @@ goog$dom$browserrange$W3cRange.prototype.selectInternal = function(selection) { }; goog$dom$browserrange$W3cRange.prototype.collapse = function(toStart) { this.range_.collapse(toStart) -};var goog$dom$browserrange$GoannaRange = function(range) { +};var goog$dom$browserrange$GeckoRange = function(range) { goog$dom$browserrange$W3cRange.call(this, range) }; -goog$inherits(goog$dom$browserrange$GoannaRange, goog$dom$browserrange$W3cRange); -goog$dom$browserrange$GoannaRange.prototype.selectInternal = function(selection, reversed) { +goog$inherits(goog$dom$browserrange$GeckoRange, goog$dom$browserrange$W3cRange); +goog$dom$browserrange$GeckoRange.prototype.selectInternal = function(selection, reversed) { var anchorNode = reversed ? this.getEndNode() : this.getStartNode(), anchorOffset = reversed ? this.getEndOffset() : this.getStartOffset(), focusNode = reversed ? this.getStartNode() : this.getEndNode(), focusOffset = reversed ? this.getStartOffset() : this.getEndOffset(); selection.collapse(anchorNode, anchorOffset); if(anchorNode != focusNode || anchorOffset != focusOffset)selection.extend(focusNode, focusOffset) @@ -694,7 +694,7 @@ goog$dom$browserrange$WebKitRange.prototype.selectInternal = function(selection, selection.removeAllRanges(); reversed ? selection.setBaseAndExtent(this.getEndNode(), this.getEndOffset(), this.getStartNode(), this.getStartOffset()) : selection.setBaseAndExtent(this.getStartNode(), this.getStartOffset(), this.getEndNode(), this.getEndOffset()) };var goog$dom$browserrange$createRangeFromNodes = function(startNode, startOffset, endNode, endOffset) { - return goog$userAgent$IE ? new goog$dom$browserrange$IeRange(goog$dom$browserrange$IeRange$getBrowserRangeForNodes_(startNode, startOffset, endNode, endOffset), goog$dom$getOwnerDocument(startNode)) : goog$userAgent$WEBKIT ? new goog$dom$browserrange$WebKitRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNodes_(startNode, startOffset, endNode, endOffset)) : goog$userAgent$GECKO ? new goog$dom$browserrange$GoannaRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNodes_(startNode, startOffset, + return goog$userAgent$IE ? new goog$dom$browserrange$IeRange(goog$dom$browserrange$IeRange$getBrowserRangeForNodes_(startNode, startOffset, endNode, endOffset), goog$dom$getOwnerDocument(startNode)) : goog$userAgent$WEBKIT ? new goog$dom$browserrange$WebKitRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNodes_(startNode, startOffset, endNode, endOffset)) : goog$userAgent$GECKO ? new goog$dom$browserrange$GeckoRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNodes_(startNode, startOffset, endNode, endOffset)) : new goog$dom$browserrange$W3cRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNodes_(startNode, startOffset, endNode, endOffset)) };var goog$dom$TextRange = function() { }; @@ -705,7 +705,7 @@ var goog$dom$TextRange$createFromBrowserRangeWrapper_ = function(browserRange, o range.isReversed_ = !!opt_isReversed; return range }, goog$dom$TextRange$createFromNodeContents = function(node, opt_isReversed) { - return goog$dom$TextRange$createFromBrowserRangeWrapper_(goog$userAgent$IE ? goog$dom$browserrange$IeRange$createFromNodeContents(node) : goog$userAgent$WEBKIT ? new goog$dom$browserrange$WebKitRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)) : goog$userAgent$GECKO ? new goog$dom$browserrange$GoannaRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)) : new goog$dom$browserrange$W3cRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)), opt_isReversed) + return goog$dom$TextRange$createFromBrowserRangeWrapper_(goog$userAgent$IE ? goog$dom$browserrange$IeRange$createFromNodeContents(node) : goog$userAgent$WEBKIT ? new goog$dom$browserrange$WebKitRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)) : goog$userAgent$GECKO ? new goog$dom$browserrange$GeckoRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)) : new goog$dom$browserrange$W3cRange(goog$dom$browserrange$W3cRange$getBrowserRangeForNode(node)), opt_isReversed) }, goog$dom$TextRange$createFromNodes = function(anchorNode, anchorOffset, focusNode, focusOffset) { var range = new goog$dom$TextRange; range.isReversed_ = goog$dom$Range$isReversed(anchorNode, anchorOffset, focusNode, focusOffset); @@ -931,7 +931,7 @@ goog$dom$MultiRange.prototype.getTextRangeCount = function() { return this.browserRanges_.length }; goog$dom$MultiRange.prototype.getTextRange = function(i) { - this.ranges_[i] || (this.ranges_[i] = goog$dom$TextRange$createFromBrowserRangeWrapper_(goog$userAgent$IE ? new goog$dom$browserrange$IeRange(this.browserRanges_[i], goog$dom$getOwnerDocument(this.browserRanges_[i].parentElement())) : goog$userAgent$WEBKIT ? new goog$dom$browserrange$WebKitRange(this.browserRanges_[i]) : goog$userAgent$GECKO ? new goog$dom$browserrange$GoannaRange(this.browserRanges_[i]) : new goog$dom$browserrange$W3cRange(this.browserRanges_[i]), undefined)); + this.ranges_[i] || (this.ranges_[i] = goog$dom$TextRange$createFromBrowserRangeWrapper_(goog$userAgent$IE ? new goog$dom$browserrange$IeRange(this.browserRanges_[i], goog$dom$getOwnerDocument(this.browserRanges_[i].parentElement())) : goog$userAgent$WEBKIT ? new goog$dom$browserrange$WebKitRange(this.browserRanges_[i]) : goog$userAgent$GECKO ? new goog$dom$browserrange$GeckoRange(this.browserRanges_[i]) : new goog$dom$browserrange$W3cRange(this.browserRanges_[i]), undefined)); return this.ranges_[i] }; goog$dom$MultiRange.prototype.getContainer = function() { diff --git a/editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/range.js b/editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/range.js index e8a713d718..f323cf9b66 100644 --- a/editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/range.js +++ b/editor/libeditor/tests/browserscope/lib/richtext2/richtext2/static/js/range.js @@ -1359,7 +1359,7 @@ goog.userAgent.init_ = function() { goog.userAgent.detectedIe_ = false; goog.userAgent.detectedWebkit_ = false; goog.userAgent.detectedMobile_ = false; - goog.userAgent.detectedGoanna_ = false; + goog.userAgent.detectedGecko_ = false; var ua; if(!goog.userAgent.BROWSER_KNOWN_ && (ua = goog.userAgent.getUserAgentString())) { var navigator = goog.userAgent.getNavigator(); @@ -1367,7 +1367,7 @@ goog.userAgent.init_ = function() { goog.userAgent.detectedIe_ = !goog.userAgent.detectedOpera_ && ua.indexOf("MSIE") != -1; goog.userAgent.detectedWebkit_ = !goog.userAgent.detectedOpera_ && ua.indexOf("WebKit") != -1; goog.userAgent.detectedMobile_ = goog.userAgent.detectedWebkit_ && ua.indexOf("Mobile") != -1; - goog.userAgent.detectedGoanna_ = !goog.userAgent.detectedOpera_ && !goog.userAgent.detectedWebkit_ && navigator.product == "Goanna" + goog.userAgent.detectedGecko_ = !goog.userAgent.detectedOpera_ && !goog.userAgent.detectedWebkit_ && navigator.product == "Gecko" } }; if(!goog.userAgent.BROWSER_KNOWN_) { @@ -1375,7 +1375,7 @@ if(!goog.userAgent.BROWSER_KNOWN_) { } goog.userAgent.OPERA = goog.userAgent.BROWSER_KNOWN_ ? goog.userAgent.ASSUME_OPERA : goog.userAgent.detectedOpera_; goog.userAgent.IE = goog.userAgent.BROWSER_KNOWN_ ? goog.userAgent.ASSUME_IE : goog.userAgent.detectedIe_; -goog.userAgent.GECKO = goog.userAgent.BROWSER_KNOWN_ ? goog.userAgent.ASSUME_GECKO : goog.userAgent.detectedGoanna_; +goog.userAgent.GECKO = goog.userAgent.BROWSER_KNOWN_ ? goog.userAgent.ASSUME_GECKO : goog.userAgent.detectedGecko_; goog.userAgent.WEBKIT = goog.userAgent.BROWSER_KNOWN_ ? goog.userAgent.ASSUME_WEBKIT || goog.userAgent.ASSUME_MOBILE_WEBKIT : goog.userAgent.detectedWebkit_; goog.userAgent.MOBILE = goog.userAgent.ASSUME_MOBILE_WEBKIT || goog.userAgent.detectedMobile_; goog.userAgent.SAFARI = goog.userAgent.WEBKIT; @@ -4797,19 +4797,19 @@ goog.dom.browserrange.W3cRange.prototype.surroundWithNodes = function(startNode, goog.dom.browserrange.W3cRange.prototype.collapse = function(toStart) { this.range_.collapse(toStart) }; -goog.provide("goog.dom.browserrange.GoannaRange"); +goog.provide("goog.dom.browserrange.GeckoRange"); goog.require("goog.dom.browserrange.W3cRange"); -goog.dom.browserrange.GoannaRange = function(range) { +goog.dom.browserrange.GeckoRange = function(range) { goog.dom.browserrange.W3cRange.call(this, range) }; -goog.inherits(goog.dom.browserrange.GoannaRange, goog.dom.browserrange.W3cRange); -goog.dom.browserrange.GoannaRange.createFromNodeContents = function(node) { - return new goog.dom.browserrange.GoannaRange(goog.dom.browserrange.W3cRange.getBrowserRangeForNode(node)) +goog.inherits(goog.dom.browserrange.GeckoRange, goog.dom.browserrange.W3cRange); +goog.dom.browserrange.GeckoRange.createFromNodeContents = function(node) { + return new goog.dom.browserrange.GeckoRange(goog.dom.browserrange.W3cRange.getBrowserRangeForNode(node)) }; -goog.dom.browserrange.GoannaRange.createFromNodes = function(startNode, startOffset, endNode, endOffset) { - return new goog.dom.browserrange.GoannaRange(goog.dom.browserrange.W3cRange.getBrowserRangeForNodes(startNode, startOffset, endNode, endOffset)) +goog.dom.browserrange.GeckoRange.createFromNodes = function(startNode, startOffset, endNode, endOffset) { + return new goog.dom.browserrange.GeckoRange(goog.dom.browserrange.W3cRange.getBrowserRangeForNodes(startNode, startOffset, endNode, endOffset)) }; -goog.dom.browserrange.GoannaRange.prototype.selectInternal = function(selection, reversed) { +goog.dom.browserrange.GeckoRange.prototype.selectInternal = function(selection, reversed) { var anchorNode = reversed ? this.getEndNode() : this.getStartNode(); var anchorOffset = reversed ? this.getEndOffset() : this.getStartOffset(); var focusNode = reversed ? this.getStartNode() : this.getEndNode(); @@ -5322,7 +5322,7 @@ goog.dom.browserrange.WebKitRange.prototype.selectInternal = function(selection, goog.provide("goog.dom.browserrange"); goog.provide("goog.dom.browserrange.Error"); goog.require("goog.dom"); -goog.require("goog.dom.browserrange.GoannaRange"); +goog.require("goog.dom.browserrange.GeckoRange"); goog.require("goog.dom.browserrange.IeRange"); goog.require("goog.dom.browserrange.OperaRange"); goog.require("goog.dom.browserrange.W3cRange"); @@ -5337,7 +5337,7 @@ goog.dom.browserrange.createRange = function(range) { return new goog.dom.browserrange.WebKitRange(range) }else { if(goog.userAgent.GECKO) { - return new goog.dom.browserrange.GoannaRange(range) + return new goog.dom.browserrange.GeckoRange(range) }else { if(goog.userAgent.OPERA) { return new goog.dom.browserrange.OperaRange(range) @@ -5356,7 +5356,7 @@ goog.dom.browserrange.createRangeFromNodeContents = function(node) { return goog.dom.browserrange.WebKitRange.createFromNodeContents(node) }else { if(goog.userAgent.GECKO) { - return goog.dom.browserrange.GoannaRange.createFromNodeContents(node) + return goog.dom.browserrange.GeckoRange.createFromNodeContents(node) }else { if(goog.userAgent.OPERA) { return goog.dom.browserrange.OperaRange.createFromNodeContents(node) @@ -5375,7 +5375,7 @@ goog.dom.browserrange.createRangeFromNodes = function(startNode, startOffset, en return goog.dom.browserrange.WebKitRange.createFromNodes(startNode, startOffset, endNode, endOffset) }else { if(goog.userAgent.GECKO) { - return goog.dom.browserrange.GoannaRange.createFromNodes(startNode, startOffset, endNode, endOffset) + return goog.dom.browserrange.GeckoRange.createFromNodes(startNode, startOffset, endNode, endOffset) }else { if(goog.userAgent.OPERA) { return goog.dom.browserrange.OperaRange.createFromNodes(startNode, startOffset, endNode, endOffset) diff --git a/editor/txmgr/tests/moz.build b/editor/txmgr/tests/moz.build index 63078ff6c1..eb810960b0 100644 --- a/editor/txmgr/tests/moz.build +++ b/editor/txmgr/tests/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -GoannaCppUnitTests([ +GeckoCppUnitTests([ 'TestTXMgr', ]) diff --git a/embedding/browser/nsIEmbeddingSiteWindow.idl b/embedding/browser/nsIEmbeddingSiteWindow.idl index 1be4d1c941..f1365f206e 100644 --- a/embedding/browser/nsIEmbeddingSiteWindow.idl +++ b/embedding/browser/nsIEmbeddingSiteWindow.idl @@ -10,7 +10,7 @@ /** * The nsIEmbeddingSiteWindow is implemented by the embedder to provide - * Goanna with the means to call up to the host to resize the window, + * Gecko with the means to call up to the host to resize the window, * hide or show it and set/get its title. */ [scriptable, uuid(0b976267-4aaa-4f36-a2d4-27b5ca8d73bb)] diff --git a/embedding/browser/nsIWebBrowserChrome.idl b/embedding/browser/nsIWebBrowserChrome.idl index af96252643..e7a43150a8 100644 --- a/embedding/browser/nsIWebBrowserChrome.idl +++ b/embedding/browser/nsIWebBrowserChrome.idl @@ -11,7 +11,7 @@ interface nsIDocShellTreeItem; /** * nsIWebBrowserChrome corresponds to the top-level, outermost window - * containing an embedded Goanna web browser. + * containing an embedded Gecko web browser. */ [scriptable, uuid(E8C414C4-DC38-4BA3-AB4E-EC4CBBE22907)] diff --git a/embedding/browser/nsIWebBrowserPrint.idl b/embedding/browser/nsIWebBrowserPrint.idl index 084837356c..ce261e97da 100644 --- a/embedding/browser/nsIWebBrowserPrint.idl +++ b/embedding/browser/nsIWebBrowserPrint.idl @@ -12,7 +12,7 @@ interface nsIWebProgressListener; /** * nsIWebBrowserPrint corresponds to the main interface - * for printing an embedded Goanna web browser window/document + * for printing an embedded Gecko web browser window/document */ [scriptable, uuid(9A7CA4B0-FBBA-11d4-A869-00105A183419)] interface nsIWebBrowserPrint : nsISupports diff --git a/embedding/components/windowwatcher/nsIWindowWatcher.idl b/embedding/components/windowwatcher/nsIWindowWatcher.idl index c625e21824..3880fb66a3 100644 --- a/embedding/components/windowwatcher/nsIWindowWatcher.idl +++ b/embedding/components/windowwatcher/nsIWindowWatcher.idl @@ -17,7 +17,7 @@ interface nsIWindowCreator; /** - * nsIWindowWatcher is the keeper of Goanna/DOM Windows. It maintains + * nsIWindowWatcher is the keeper of Gecko/DOM Windows. It maintains * a list of open top-level windows, and allows some operations on them. * Usage notes: diff --git a/embedding/components/windowwatcher/nsPromptUtils.h b/embedding/components/windowwatcher/nsPromptUtils.h index 1779167806..65466c19aa 100644 --- a/embedding/components/windowwatcher/nsPromptUtils.h +++ b/embedding/components/windowwatcher/nsPromptUtils.h @@ -101,7 +101,7 @@ NS_GetAuthHostPort(nsIChannel* aChannel, nsIAuthInformation* aAuthInfo, /** * Creates the key for looking up passwords in the password manager. This - * function uses the same format that Goanna functions have always used, thus + * function uses the same format that Gecko functions have always used, thus * ensuring backwards compatibility. */ inline void diff --git a/embedding/nsEmbedCID.h b/embedding/nsEmbedCID.h index 03c5a56415..57dc4b453f 100644 --- a/embedding/nsEmbedCID.h +++ b/embedding/nsEmbedCID.h @@ -7,13 +7,13 @@ /** * @file - * @brief List of, and documentation for, frozen Goanna embedding contracts. + * @brief List of, and documentation for, frozen Gecko embedding contracts. */ /** * Web Browser ContractID * Creating an instance of this ContractID (via createInstanceByContractID) - * is the basic way to instantiate a Goanna browser. + * is the basic way to instantiate a Gecko browser. * * This contract implements the following interfaces: * nsIWebBrowser diff --git a/embedding/nsIWindowCreator.idl b/embedding/nsIWindowCreator.idl index e683c2616a..ade2dc467d 100644 --- a/embedding/nsIWindowCreator.idl +++ b/embedding/nsIWindowCreator.idl @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /** - * nsIWindowCreator is a callback interface used by Goanna to create + * nsIWindowCreator is a callback interface used by Gecko to create * new browser windows. The application, either Mozilla or an embedding app, * must provide an implementation of the Window Watcher component and * notify the WindowWatcher during application initialization. @@ -20,7 +20,7 @@ interface nsIWebBrowserChrome; interface nsIWindowCreator : nsISupports { - /** Create a new window. Goanna will/may call this method, if made + /** Create a new window. Gecko will/may call this method, if made available to it, to create new windows. @param parent parent window, if any. null if not. the newly created window should be made a child/dependent window of diff --git a/embedding/nsIWindowCreator2.idl b/embedding/nsIWindowCreator2.idl index 30bf1b11b2..41ac77e46e 100644 --- a/embedding/nsIWindowCreator2.idl +++ b/embedding/nsIWindowCreator2.idl @@ -32,7 +32,7 @@ interface nsIWindowCreator2 : nsIWindowCreator { // Likely that the window is an advertising popup. const unsigned long PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 0x00000001; - /** Create a new window. Goanna will/may call this method, if made + /** Create a new window. Gecko will/may call this method, if made available to it, to create new windows. @param parent Parent window, if any. Null if not. The newly created window should be made a child/dependent window of diff --git a/embedding/nsIWindowProvider.idl b/embedding/nsIWindowProvider.idl index b752450681..49ef9b6b60 100644 --- a/embedding/nsIWindowProvider.idl +++ b/embedding/nsIWindowProvider.idl @@ -4,8 +4,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /** - * nsIWindowProvider is a callback interface used by Goanna when it needs to - * open a new window. This interface can be implemented by Goanna consumers who + * nsIWindowProvider is a callback interface used by Gecko when it needs to + * open a new window. This interface can be implemented by Gecko consumers who * wish to provide a custom "new window" of their own (for example by returning * a new tab, an existing window, etc) instead of just having a real new * toplevel window open. diff --git a/embedding/tests/winEmbed/moz.build b/embedding/tests/winEmbed/moz.build index 0db9a1d553..c347aa2dca 100644 --- a/embedding/tests/winEmbed/moz.build +++ b/embedding/tests/winEmbed/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -GoannaProgram('winEmbed') +GeckoProgram('winEmbed') SOURCES += [ 'WebBrowserChrome.cpp', diff --git a/embedding/tests/winEmbed/winEmbed.rc b/embedding/tests/winEmbed/winEmbed.rc index 7b6882f5de..2a500e37fe 100644 --- a/embedding/tests/winEmbed/winEmbed.rc +++ b/embedding/tests/winEmbed/winEmbed.rc @@ -110,7 +110,7 @@ STRINGTABLE BEGIN IDS_APP_TITLE "winEmbed" IDS_HELLO "Embedding Mozilla is so much fun!!" - IDS_ABOUT "winEmbed - Goanna embedding sample" + IDS_ABOUT "winEmbed - Gecko embedding sample" IDS_ABOUT_TITLE "About winEmbed" IDS_HIST_BACK "Going Back to: " IDS_HIST_FORWARD "Going Forward to: " diff --git a/extensions/cookie/test/unit/test_schema_2_migration.js b/extensions/cookie/test/unit/test_schema_2_migration.js index 5d7677eb35..0990de58af 100644 --- a/extensions/cookie/test/unit/test_schema_2_migration.js +++ b/extensions/cookie/test/unit/test_schema_2_migration.js @@ -1,8 +1,8 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -// Test cookie database migration from version 2 (Goanna 1.9.3) to the current -// version, presently 4 (Goanna 2.0). +// Test cookie database migration from version 2 (Gecko 1.9.3) to the current +// version, presently 4 (Gecko 2.0). let test_generator = do_run_test(); diff --git a/extensions/cookie/test/unit/test_schema_3_migration.js b/extensions/cookie/test/unit/test_schema_3_migration.js index 28f3449f30..79b4c1039f 100644 --- a/extensions/cookie/test/unit/test_schema_3_migration.js +++ b/extensions/cookie/test/unit/test_schema_3_migration.js @@ -1,8 +1,8 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -// Test cookie database migration from version 3 (prerelease Goanna 2.0) to the -// current version, presently 4 (Goanna 2.0). +// Test cookie database migration from version 3 (prerelease Gecko 2.0) to the +// current version, presently 4 (Gecko 2.0). let test_generator = do_run_test(); diff --git a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/hunspell-en_US-20081205.dic b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/hunspell-en_US-20081205.dic index 0ffc9f1d07..d44ef51994 100644 --- a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/hunspell-en_US-20081205.dic +++ b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/hunspell-en_US-20081205.dic @@ -25250,7 +25250,7 @@ gearing/M gearshift/MS gearstick gearwheel/SM -goanna/SM +gecko/SM geddit gee/DS geegaw/SM diff --git a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/mozilla-specific.txt b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/mozilla-specific.txt index 59e1c55601..800541ba87 100644 --- a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/mozilla-specific.txt +++ b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/mozilla-specific.txt @@ -7,7 +7,7 @@ Composer/M Fennec/M Firefox/M Flock/M -Goanna/M +Gecko/M JavaScript/M Lightning/M Mozilla/M diff --git a/extensions/spellcheck/locales/en-US/hunspell/en-US.dic b/extensions/spellcheck/locales/en-US/hunspell/en-US.dic index 2b91f285b7..2a713afb64 100644 --- a/extensions/spellcheck/locales/en-US/hunspell/en-US.dic +++ b/extensions/spellcheck/locales/en-US/hunspell/en-US.dic @@ -5937,7 +5937,7 @@ Gdansk/M Ge/M Gearalt/M Gearard/M -Goanna/M +Gecko/M Geer/M Geffen/M Gehenna/M @@ -31266,7 +31266,7 @@ gearing/M gearshift/MS gearstick gearwheel/SM -goanna/SM +gecko/SM geddit gee/DS geegaw/SM diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build index a47d2292cc..df47ce3502 100644 --- a/gfx/angle/src/libEGL/moz.build +++ b/gfx/angle/src/libEGL/moz.build @@ -74,7 +74,7 @@ else: ] -GoannaSharedLibrary('libEGL', linkage=None) +GeckoSharedLibrary('libEGL', linkage=None) RCFILE = SRCDIR + '/libEGL.rc' DEFFILE = SRCDIR + '/libEGL.def' diff --git a/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build index 21b0fded02..dff6d95256 100644 --- a/gfx/angle/src/libGLESv2/moz.build +++ b/gfx/angle/src/libGLESv2/moz.build @@ -78,7 +78,7 @@ else: '\'%s/lib/%s/dxguid.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']), ] -GoannaSharedLibrary('libGLESv2', linkage=None) +GeckoSharedLibrary('libGLESv2', linkage=None) RCFILE = SRCDIR + '/libGLESv2.rc' DEFFILE = SRCDIR + '/libGLESv2.def' diff --git a/gfx/doc/AsyncPanZoom.md b/gfx/doc/AsyncPanZoom.md index edeb8e2a08..a0d6c0c774 100644 --- a/gfx/doc/AsyncPanZoom.md +++ b/gfx/doc/AsyncPanZoom.md @@ -179,7 +179,7 @@ This section describes how input events flow through the APZ code.
  1. Input events arrive from the hardware/widget code into the APZ via APZCTreeManager::ReceiveInputEvent. -The thread that invokes this is called the input thread, and may or may not be the same as the Goanna main thread. +The thread that invokes this is called the input thread, and may or may not be the same as the Gecko main thread.
  2. Conceptually the first thing that the APZCTreeManager does is to group these events into "input blocks". @@ -210,18 +210,18 @@ The call stack unwinds back to APZCTreeManager::ReceiveInputEvent, which does an
  3. The call stack unwinds back to the widget code that called ReceiveInputEvent. -This code now has the event in the coordinate space Goanna is expecting, and so can dispatch it to the Goanna main thread. +This code now has the event in the coordinate space Gecko is expecting, and so can dispatch it to the Gecko main thread.
  4. -Goanna performs its own usual hit-testing and event dispatching for the event. +Gecko performs its own usual hit-testing and event dispatching for the event. As part of this, it records whether any touch listeners cancelled the input block by calling preventDefault(). It also activates inactive scrollframes that were hit by the input events.
  5. The call stack unwinds back to the widget code, which sends two notifications to the APZ code on the input thread. The first notification is via APZCTreeManager::ContentReceivedInputBlock, and informs the APZ whether the input block was cancelled. -The second notification is via APZCTreeManager::SetTargetAPZC, and informs the APZ the results of the Goanna hit-test during event dispatch. -Note that Goanna may report that the input event did not hit any scrollable frame at all. +The second notification is via APZCTreeManager::SetTargetAPZC, and informs the APZ the results of the Gecko hit-test during event dispatch. +Note that Gecko may report that the input event did not hit any scrollable frame at all. These notifications happen only once per input block.
  6. @@ -238,7 +238,7 @@ These notifications happen only once per input block.
  • -If events were queued as part of step 4(ii) they are now either processed (if the input block was not cancelled and Goanna detected a scrollframe under the input event, or if the timeout expired) or dropped (all other cases). +If events were queued as part of step 4(ii) they are now either processed (if the input block was not cancelled and Gecko detected a scrollframe under the input event, or if the timeout expired) or dropped (all other cases). Note that the APZC that processes the events may be different at this step than the tentative target from step 3, depending on the SetTargetAPZC notification. Processing the events may trigger behaviours like scrolling or tap gestures.
    • @@ -261,14 +261,14 @@ If the CSS touch-action property is enabled, the above steps are modified as fol #### Threading considerations The bulk of the input processing in the APZ code happens on what we call "the input thread". -In practice the input thread could be the Goanna main thread, the compositor thread, or some other thread. -There are obvious downsides to using the Goanna main thread - that is, "asynchronous" panning and zooming is not really asynchronous as input events can only be processed while Goanna is idle. +In practice the input thread could be the Gecko main thread, the compositor thread, or some other thread. +There are obvious downsides to using the Gecko main thread - that is, "asynchronous" panning and zooming is not really asynchronous as input events can only be processed while Gecko is idle. However, this is the current state of things on B2G. Using the compositor thread as the input thread could work on some platforms, but may be inefficient on others. For example, on Android (Fennec) we receive input events from the system on a dedicated UI thread. We would have to redispatch the input events to the compositor thread if we wanted to the input thread to be the same as the compositor thread. This introduces a potential for higher latency, particularly if the compositor does any blocking operations - blocking SwapBuffers operations, for example. -As a result, the APZ code itself does not assume that the input thread will be the same as the Goanna main thread or the compositor thread. +As a result, the APZ code itself does not assume that the input thread will be the same as the Gecko main thread or the compositor thread. #### Active vs. inactive scrollframes @@ -283,7 +283,7 @@ The layout code also adds the area (or bounding region in case of weird shapes) When the user starts interacting with that content, the hit-test in the APZ code finds the dispatch-to-content region of P. The input block therefore has a tentative target of P when it goes into step 4(ii) in the flow above. -When goanna processes the input event, it must detect the inactive scrollframe and activate it, as part of step 7. +When gecko processes the input event, it must detect the inactive scrollframe and activate it, as part of step 7. Finally, the widget code sends the SetTargetAPZC notification in step 8 to notify the APZ that the input block should really apply to this new layer. The issue here is that the layer transaction containing the new layer must reach the compositor and APZ before the SetTargetAPZC notification. If this does not occur within the 300ms timeout, the APZ code will be unable to update the tentative target, and will continue to use P for that input block. @@ -291,5 +291,5 @@ Input blocks that start after the layer transaction will get correctly routed to This model implies that when the user initially attempts to scroll an inactive scrollframe, it may end up scrolling an ancestor scrollframe. (This is because in the absence of the SetTargetAPZC notification, the input events will get applied to the closest ancestor scrollframe's APZC.) -Only after the round-trip to the goanna thread is complete is there a layer for async scrolling to actually occur on the scrollframe itself. +Only after the round-trip to the gecko thread is complete is there a layer for async scrolling to actually occur on the scrollframe itself. At that point the scrollframe will start receiving new input blocks and will scroll normally. diff --git a/gfx/doc/GraphicsOverview.md b/gfx/doc/GraphicsOverview.md index 4a82686495..b834172c8d 100644 --- a/gfx/doc/GraphicsOverview.md +++ b/gfx/doc/GraphicsOverview.md @@ -49,7 +49,7 @@ We need to create a layer tree (from the frames tree), which will give us the co ### Graphics API #### Moz2D -* The Moz2D graphics API, part of the Azure project, is a cross-platform interface onto the various graphics backends that Goanna uses for rendering such as Direct2D (1.0 and 1.1), Skia, Cairo, Quartz, and NV Path. Adding a new graphics platform to Goanna is accomplished by adding a backend to Moz2D. +* The Moz2D graphics API, part of the Azure project, is a cross-platform interface onto the various graphics backends that Gecko uses for rendering such as Direct2D (1.0 and 1.1), Skia, Cairo, Quartz, and NV Path. Adding a new graphics platform to Gecko is accomplished by adding a backend to Moz2D. \see [Moz2D documentation on wiki](https://wiki.mozilla.org/Platform/GFX/Moz2D) #### Compositing diff --git a/gfx/doc/SharedMozSurface.md b/gfx/doc/SharedMozSurface.md index 1bd4017d30..3ff3e53ddd 100644 --- a/gfx/doc/SharedMozSurface.md +++ b/gfx/doc/SharedMozSurface.md @@ -16,7 +16,7 @@ Nicolas Silva ## Definitions -* Client and Host: In Goanna's compositing architecture, the client process is the producer, while the host process is the consumer side, where compositing takes place. +* Client and Host: In Gecko's compositing architecture, the client process is the producer, while the host process is the consumer side, where compositing takes place. ## Use cases @@ -122,11 +122,11 @@ In the other cases: The current design of MozSurface makes the surface accessible from both sides at the same time, forcing us to do Locking and have a hand shake around deallocating the shared data, while using pure message passing and making the surface accessible only from one side at a time would avoid these complications. -Using pure message passing was actually the first approach we tried when we created the first version of TextureClient and TextureHost. This strategy failed in several places, partly because of some legacy in Goanna's architecture, and partly because of some of optimizations we do to avoid copying surfaces. +Using pure message passing was actually the first approach we tried when we created the first version of TextureClient and TextureHost. This strategy failed in several places, partly because of some legacy in Gecko's architecture, and partly because of some of optimizations we do to avoid copying surfaces. We need a given surface to be accessible on both the client and host for the following reasons: -* Goanna can at any time require read access on the client side to a surface that is shared with the host process, for example to build a temporary layer manager and generate a screenshot. This is mostly a legacy problem. +* Gecko can at any time require read access on the client side to a surface that is shared with the host process, for example to build a temporary layer manager and generate a screenshot. This is mostly a legacy problem. * We do some copy-on-write optimizations on surfaces that are shared with the compositor in order to keep invalid regions as small as possible. Out tiling implementation is an example of that. * Our buffer rotation code on scrollable non-tiled layers also requires a synchronization on the client side between the front and back buffers, while the front buffer is used on the host side. diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp index 6739993646..33c6d49628 100644 --- a/gfx/gl/GLContext.cpp +++ b/gfx/gl/GLContext.cpp @@ -540,7 +540,7 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl) { (PRFuncPtr*) &mSymbols.fPointParameterf, { "PointParameterf", nullptr } }, { (PRFuncPtr*) &mSymbols.fDrawBuffer, { "DrawBuffer", nullptr } }, // These functions are only used by Skia/GL in desktop mode. - // Other parts of Goanna should avoid using these + // Other parts of Gecko should avoid using these { (PRFuncPtr*) &mSymbols.fDrawBuffers, { "DrawBuffers", nullptr } }, { (PRFuncPtr*) &mSymbols.fClientActiveTexture, { "ClientActiveTexture", nullptr } }, { (PRFuncPtr*) &mSymbols.fDisableClientState, { "DisableClientState", nullptr } }, diff --git a/gfx/gl/GLContextProviderImpl.h b/gfx/gl/GLContextProviderImpl.h index 1f74a4d2b3..9e87170c82 100644 --- a/gfx/gl/GLContextProviderImpl.h +++ b/gfx/gl/GLContextProviderImpl.h @@ -66,9 +66,9 @@ public: CreateHeadless(bool requireCompatProfile); /** - * Create wrapping Goanna GLContext for external gl context. + * Create wrapping Gecko GLContext for external gl context. * - * @param aContext External context which will be wrapped by Goanna GLContext. + * @param aContext External context which will be wrapped by Gecko GLContext. * @param aSurface External surface which is used for external context. * * @return Wrapping Context to use for rendering diff --git a/gfx/gl/GLContextSymbols.h b/gfx/gl/GLContextSymbols.h index 5e1adfca31..5579358153 100644 --- a/gfx/gl/GLContextSymbols.h +++ b/gfx/gl/GLContextSymbols.h @@ -340,7 +340,7 @@ struct GLContextSymbols PFNINVALIDATESUBFRAMEBUFFER fInvalidateSubFramebuffer; // These functions are only used by Skia/GL in desktop mode. - // Other parts of Goanna should avoid using these + // Other parts of Gecko should avoid using these typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTURE) (GLenum texture); PFNGLCLIENTACTIVETEXTURE fClientActiveTexture; typedef void (GLAPIENTRY * PFNDISABLECLIENTSTATE) (GLenum capability); diff --git a/gfx/layers/Compositor.h b/gfx/layers/Compositor.h index cabe3b0914..20374ff6b7 100644 --- a/gfx/layers/Compositor.h +++ b/gfx/layers/Compositor.h @@ -27,7 +27,7 @@ * structures. * Most of the documentation for layers is directly in the source code in the * form of doc comments. An overview can also be found in the the wiki: - * https://wiki.mozilla.org/Goanna:Overview#Graphics + * https://wiki.mozilla.org/Gecko:Overview#Graphics * * * # Main interfaces and abstractions diff --git a/gfx/layers/FrameMetrics.h b/gfx/layers/FrameMetrics.h index 7dc57cbcba..677edf25a8 100644 --- a/gfx/layers/FrameMetrics.h +++ b/gfx/layers/FrameMetrics.h @@ -254,7 +254,7 @@ public: // instead. // // This value is valid for nested scrollable layers as well, and is still - // relative to the layer tree origin. This value is provided by Goanna at + // relative to the layer tree origin. This value is provided by Gecko at // layout/paint time. ParentLayerRect mCompositionBounds; @@ -564,7 +564,7 @@ private: // The cumulative resolution that the current frame has been painted at. // This is the product of the pres-shell resolutions of the document // containing this scroll frame and its ancestors, and any css-driven - // resolution. This information is provided by Goanna at layout/paint time. + // resolution. This information is provided by Gecko at layout/paint time. // Note that this is allowed to have different x- and y-scales, but only // for subframes (mIsRoot = false). (The same applies to other scales that // "inherit" the 2D-ness of this one, such as mZoom.) @@ -608,10 +608,10 @@ private: // not any parents, regardless of parent transforms. CSSPoint mScrollOffset; - // The "user zoom". Content is painted by goanna at mResolution * mDevPixelsPerCSSPixel, + // The "user zoom". Content is painted by gecko at mResolution * mDevPixelsPerCSSPixel, // but will be drawn to the screen at mZoom. In the steady state, the // two will be the same, but during an async zoom action the two may - // diverge. This information is initialized in Goanna but updated in the APZC. + // diverge. This information is initialized in Gecko but updated in the APZC. CSSToParentLayerScale2D mZoom; // Whether mScrollOffset was updated by something other than the APZ code, and diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h index 144d3066cb..0d5816ac9c 100644 --- a/gfx/layers/Layers.h +++ b/gfx/layers/Layers.h @@ -114,7 +114,7 @@ public: * Motivation: For truly smooth animation and video playback, we need to * be able to compose frames and render them on a dedicated thread (i.e. * off the main thread where DOM manipulation, script execution and layout - * induce difficult-to-bound latency). This requires Goanna to construct + * induce difficult-to-bound latency). This requires Gecko to construct * some kind of persistent scene structure (graph or tree) that can be * safely transmitted across threads. We have other scenarios (e.g. mobile * browsing) where retaining some rendered data between paints is desired @@ -129,8 +129,8 @@ public: * We want to support a variety of layer implementations, including * a simple "immediate mode" implementation that doesn't retain any * rendered data between paints (i.e. uses cairo in just the way that - * Goanna used it before layers were introduced). But we also don't want - * to have bifurcated "layers"/"non-layers" rendering paths in Goanna. + * Gecko used it before layers were introduced). But we also don't want + * to have bifurcated "layers"/"non-layers" rendering paths in Gecko. * Therefore the layers API is carefully designed to permit maximally * efficient implementation in an "immediate mode" style. See the * BasicLayerManager for such an implementation. diff --git a/gfx/layers/apz/public/GeckoContentController.h b/gfx/layers/apz/public/GeckoContentController.h index 8302a4184b..9f31333755 100644 --- a/gfx/layers/apz/public/GeckoContentController.h +++ b/gfx/layers/apz/public/GeckoContentController.h @@ -24,9 +24,9 @@ public: NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GeckoContentController) /** - * Requests a paint of the given FrameMetrics |aFrameMetrics| from Goanna. + * Requests a paint of the given FrameMetrics |aFrameMetrics| from Gecko. * Implementations per-platform are responsible for actually handling this. - * This method will always be called on the Goanna main thread. + * This method will always be called on the Gecko main thread. */ virtual void RequestContentRepaint(const FrameMetrics& aFrameMetrics) = 0; diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp index ac9c25e663..c90a17b3ad 100644 --- a/gfx/layers/apz/src/APZCTreeManager.cpp +++ b/gfx/layers/apz/src/APZCTreeManager.cpp @@ -577,10 +577,10 @@ APZCTreeManager::ReceiveInputEvent(InputData& aEvent, // Update the out-parameters so they are what the caller expects. apzc->GetGuid(aOutTargetGuid); - Matrix4x4 transformToGoanna = GetScreenToApzcTransform(apzc) - * GetApzcToGoannaTransform(apzc); + Matrix4x4 transformToGecko = GetScreenToApzcTransform(apzc) + * GetApzcToGeckoTransform(apzc); wheelInput.mOrigin = - TransformTo(transformToGoanna, wheelInput.mOrigin); + TransformTo(transformToGecko, wheelInput.mOrigin); } break; } case PANGESTURE_INPUT: { @@ -597,12 +597,12 @@ APZCTreeManager::ReceiveInputEvent(InputData& aEvent, // Update the out-parameters so they are what the caller expects. apzc->GetGuid(aOutTargetGuid); - Matrix4x4 transformToGoanna = GetScreenToApzcTransform(apzc) - * GetApzcToGoannaTransform(apzc); + Matrix4x4 transformToGecko = GetScreenToApzcTransform(apzc) + * GetApzcToGeckoTransform(apzc); panInput.mPanStartPoint = TransformTo( - transformToGoanna, panInput.mPanStartPoint); + transformToGecko, panInput.mPanStartPoint); panInput.mPanDisplacement = TransformVector( - transformToGoanna, panInput.mPanDisplacement, panInput.mPanStartPoint); + transformToGecko, panInput.mPanDisplacement, panInput.mPanStartPoint); } break; } case PINCHGESTURE_INPUT: { // note: no one currently sends these @@ -620,7 +620,7 @@ APZCTreeManager::ReceiveInputEvent(InputData& aEvent, // Update the out-parameters so they are what the caller expects. apzc->GetGuid(aOutTargetGuid); Matrix4x4 outTransform = GetScreenToApzcTransform(apzc) - * GetApzcToGoannaTransform(apzc); + * GetApzcToGeckoTransform(apzc); pinchInput.mFocusPoint = TransformTo( outTransform, pinchInput.mFocusPoint); } @@ -640,7 +640,7 @@ APZCTreeManager::ReceiveInputEvent(InputData& aEvent, // Update the out-parameters so they are what the caller expects. apzc->GetGuid(aOutTargetGuid); Matrix4x4 outTransform = GetScreenToApzcTransform(apzc) - * GetApzcToGoannaTransform(apzc); + * GetApzcToGeckoTransform(apzc); tapInput.mPoint = TransformTo(outTransform, tapInput.mPoint); } break; @@ -660,11 +660,11 @@ APZCTreeManager::GetTouchInputBlockAPZC(const MultiTouchInput& aEvent, { // In this block we flush repaint requests for the entire APZ tree. We need to do this // at the start of an input block for a number of reasons. One of the reasons is so that - // after we untransform the event into goanna space, it doesn't end up under something + // after we untransform the event into gecko space, it doesn't end up under something // else. Another reason is that if we hit-test this event and end up on a layer's // dispatch-to-content region we cannot be sure we actually got the correct layer. We - // have to fall back to the goanna hit-test to handle this case, but we can't untransform - // the event we send to goanna because we don't know the layer to untransform with + // have to fall back to the gecko hit-test to handle this case, but we can't untransform + // the event we send to gecko because we don't know the layer to untransform with // respect to. MonitorAutoLock lock(mTreeLock); FlushRepaintsRecursively(mRootNode); @@ -754,12 +754,12 @@ APZCTreeManager::ProcessTouchInput(MultiTouchInput& aInput, /* aTargetConfirmed = */ mHitResultForInputBlock == HitLayer, aInput, aOutInputBlockId); - // For computing the event to pass back to Goanna, use up-to-date transforms + // For computing the event to pass back to Gecko, use up-to-date transforms // (i.e. not anything cached in an input block). - // This ensures that transformToApzc and transformToGoanna are in sync. + // This ensures that transformToApzc and transformToGecko are in sync. Matrix4x4 transformToApzc = GetScreenToApzcTransform(mApzcForInputBlock); - Matrix4x4 transformToGoanna = GetApzcToGoannaTransform(mApzcForInputBlock); - Matrix4x4 outTransform = transformToApzc * transformToGoanna; + Matrix4x4 transformToGecko = GetApzcToGeckoTransform(mApzcForInputBlock); + Matrix4x4 outTransform = transformToApzc * transformToGecko; for (size_t i = 0; i < aInput.mTouches.Length(); i++) { SingleTouchData& touchData = aInput.mTouches[i]; touchData.mScreenPoint = TransformTo( @@ -791,15 +791,15 @@ APZCTreeManager::ProcessTouchInput(MultiTouchInput& aInput, } void -APZCTreeManager::TransformCoordinateToGoanna(const ScreenIntPoint& aPoint, +APZCTreeManager::TransformCoordinateToGecko(const ScreenIntPoint& aPoint, LayoutDeviceIntPoint* aOutTransformedPoint) { MOZ_ASSERT(aOutTransformedPoint); nsRefPtr apzc = GetTargetAPZC(aPoint, nullptr); if (apzc && aOutTransformedPoint) { Matrix4x4 transformToApzc = GetScreenToApzcTransform(apzc); - Matrix4x4 transformToGoanna = GetApzcToGoannaTransform(apzc); - Matrix4x4 outTransform = transformToApzc * transformToGoanna; + Matrix4x4 transformToGecko = GetApzcToGeckoTransform(apzc); + Matrix4x4 outTransform = transformToApzc * transformToGecko; *aOutTransformedPoint = TransformTo(outTransform, aPoint); } } @@ -865,8 +865,8 @@ APZCTreeManager::ProcessEvent(WidgetInputEvent& aEvent, MOZ_ASSERT(hitResult == HitLayer || hitResult == HitDispatchToContentRegion); apzc->GetGuid(aOutTargetGuid); Matrix4x4 transformToApzc = GetScreenToApzcTransform(apzc); - Matrix4x4 transformToGoanna = GetApzcToGoannaTransform(apzc); - Matrix4x4 outTransform = transformToApzc * transformToGoanna; + Matrix4x4 transformToGecko = GetApzcToGeckoTransform(apzc); + Matrix4x4 outTransform = transformToApzc * transformToGecko; aEvent.refPoint = TransformTo(outTransform, aEvent.refPoint); } return result; @@ -1419,7 +1419,7 @@ APZCTreeManager::GetAPZCAtPoint(HitTestingTreeNode* aNode, return nullptr; } -/* The methods GetScreenToApzcTransform() and GetApzcToGoannaTransform() return +/* The methods GetScreenToApzcTransform() and GetApzcToGeckoTransform() return some useful transformations that input events may need applied. This is best illustrated with an example. Consider a chain of layers, L, M, N, O, P, Q, R. Layer L is the layer that corresponds to the argument |aApzc|, and layer R is the root @@ -1455,15 +1455,15 @@ APZCTreeManager::GetAPZCAtPoint(HitTestingTreeNode* aNode, MC.Inverse() This combined transformation is returned by GetScreenToApzcTransform(). - Next, if we want user inputs sent to goanna for event-dispatching, we will need to strip + Next, if we want user inputs sent to gecko for event-dispatching, we will need to strip out all of the async transforms that are involved in this chain. This is because async - transforms are stored only in the compositor and goanna does not account for them when + transforms are stored only in the compositor and gecko does not account for them when doing display-list-based hit-testing for event dispatching. - Furthermore, because these input events are processed by Goanna in a FIFO queue that + Furthermore, because these input events are processed by Gecko in a FIFO queue that includes other things (specifically paint requests), it is possible that by time the - input event reaches goanna, it will have painted something else. Therefore, we need to + input event reaches gecko, it will have painted something else. Therefore, we need to apply another transform to the input events to account for the possible disparity between - what we know goanna last painted and the last paint request we sent to goanna. Let this + what we know gecko last painted and the last paint request we sent to gecko. Let this transform be represented by LD, MD, ... RD. Therefore, given a user input in screen space, the following transforms need to be applied (in order from top to bottom): @@ -1493,7 +1493,7 @@ APZCTreeManager::GetAPZCAtPoint(HitTestingTreeNode* aNode, ... RC RD - Since GetScreenToApzcTransform() can be obtained by calling that function, GetApzcToGoannaTransform() + Since GetScreenToApzcTransform() can be obtained by calling that function, GetApzcToGeckoTransform() returns the remaining transforms (LA.Inverse() * LD * ... * RD), so that the caller code can combine it with GetScreenToApzcTransform() to get the final transform required in this case. @@ -1555,7 +1555,7 @@ APZCTreeManager::GetScreenToApzcTransform(const AsyncPanZoomController *aApzc) c * explanation of this function. */ Matrix4x4 -APZCTreeManager::GetApzcToGoannaTransform(const AsyncPanZoomController *aApzc) const +APZCTreeManager::GetApzcToGeckoTransform(const AsyncPanZoomController *aApzc) const { Matrix4x4 result; MonitorAutoLock lock(mTreeLock); @@ -1569,11 +1569,11 @@ APZCTreeManager::GetApzcToGoannaTransform(const AsyncPanZoomController *aApzc) c // asyncUntransform is LA.Inverse() Matrix4x4 asyncUntransform = aApzc->GetCurrentAsyncTransformWithOverscroll().Inverse(); - // aTransformToGoannaOut is initialized to LA.Inverse() * LD * MC * NC * OC * PC + // aTransformToGeckoOut is initialized to LA.Inverse() * LD * MC * NC * OC * PC result = asyncUntransform * aApzc->GetTransformToLastDispatchedPaint() * aApzc->GetAncestorTransform(); for (AsyncPanZoomController* parent = aApzc->GetParent(); parent; parent = parent->GetParent()) { - // aTransformToGoannaOut is LA.Inverse() * LD * MC * NC * OC * PC * PD * QC * RC + // aTransformToGeckoOut is LA.Inverse() * LD * MC * NC * OC * PC * PD * QC * RC result = result * parent->GetTransformToLastDispatchedPaint() * parent->GetAncestorTransform(); // The above value for result when parent == P matches the required output diff --git a/gfx/layers/apz/src/APZCTreeManager.h b/gfx/layers/apz/src/APZCTreeManager.h index c77c50cc3b..511602c3c4 100644 --- a/gfx/layers/apz/src/APZCTreeManager.h +++ b/gfx/layers/apz/src/APZCTreeManager.h @@ -192,12 +192,12 @@ public: uint64_t* aOutInputBlockId); /** - * A helper for transforming coordinates to goanna coordinate space. + * A helper for transforming coordinates to gecko coordinate space. * * @param aPoint point to transform * @param aOutTransformedPoint resulting transformed point */ - void TransformCoordinateToGoanna(const ScreenIntPoint& aPoint, + void TransformCoordinateToGecko(const ScreenIntPoint& aPoint, LayoutDeviceIntPoint* aOutTransformedPoint); /** @@ -398,7 +398,7 @@ public: already_AddRefed GetTargetAPZC(const ScreenPoint& aPoint, HitTestResult* aOutHitResult); gfx::Matrix4x4 GetScreenToApzcTransform(const AsyncPanZoomController *aApzc) const; - gfx::Matrix4x4 GetApzcToGoannaTransform(const AsyncPanZoomController *aApzc) const; + gfx::Matrix4x4 GetApzcToGeckoTransform(const AsyncPanZoomController *aApzc) const; private: typedef bool (*GuidComparator)(const ScrollableLayerGuid&, const ScrollableLayerGuid&); diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp index 370943625e..bf60b38ddd 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.cpp +++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp @@ -1404,13 +1404,13 @@ nsEventStatus AsyncPanZoomController::OnScaleEnd(const PinchGestureInput& aEvent } bool -AsyncPanZoomController::ConvertToGoanna(const ParentLayerPoint& aPoint, CSSPoint* aOut) +AsyncPanZoomController::ConvertToGecko(const ParentLayerPoint& aPoint, CSSPoint* aOut) { if (APZCTreeManager* treeManagerLocal = GetApzcTreeManager()) { - Matrix4x4 transformToGoanna = treeManagerLocal->GetApzcToGoannaTransform(this); + Matrix4x4 transformToGecko = treeManagerLocal->GetApzcToGeckoTransform(this); // NOTE: This isn't *quite* LayoutDevicePoint, we just don't have a name // for this coordinate space and it maps the closest to LayoutDevicePoint. - LayoutDevicePoint layoutPoint = TransformTo(transformToGoanna, aPoint); + LayoutDevicePoint layoutPoint = TransformTo(transformToGecko, aPoint); { // scoped lock to access mFrameMetrics ReentrantMonitorAutoEnter lock(mMonitor); *aOut = layoutPoint / mFrameMetrics.GetDevPixelsPerCSSPixel(); @@ -1687,14 +1687,14 @@ nsEventStatus AsyncPanZoomController::OnLongPress(const TapGestureInput& aEvent) APZC_LOG("%p got a long-press in state %d\n", this, mState); nsRefPtr controller = GetGeckoContentController(); if (controller) { - CSSPoint goannaScreenPoint; - if (ConvertToGoanna(aEvent.mLocalPoint, &goannaScreenPoint)) { + CSSPoint geckoScreenPoint; + if (ConvertToGecko(aEvent.mLocalPoint, &geckoScreenPoint)) { if (CurrentTouchBlock()->IsDuringFastMotion()) { APZC_LOG("%p dropping long-press because of fast motion\n", this); return nsEventStatus_eIgnore; } uint64_t blockId = GetInputQueue()->InjectNewTouchBlock(this); - controller->HandleLongTap(goannaScreenPoint, aEvent.modifiers, GetGuid(), blockId); + controller->HandleLongTap(geckoScreenPoint, aEvent.modifiers, GetGuid(), blockId); return nsEventStatus_eConsumeNoDefault; } } @@ -1705,9 +1705,9 @@ nsEventStatus AsyncPanZoomController::OnLongPressUp(const TapGestureInput& aEven APZC_LOG("%p got a long-tap-up in state %d\n", this, mState); nsRefPtr controller = GetGeckoContentController(); if (controller) { - CSSPoint goannaScreenPoint; - if (ConvertToGoanna(aEvent.mLocalPoint, &goannaScreenPoint)) { - controller->HandleLongTapUp(goannaScreenPoint, aEvent.modifiers, GetGuid()); + CSSPoint geckoScreenPoint; + if (ConvertToGecko(aEvent.mLocalPoint, &geckoScreenPoint)) { + controller->HandleLongTapUp(geckoScreenPoint, aEvent.modifiers, GetGuid()); return nsEventStatus_eConsumeNoDefault; } } @@ -1717,8 +1717,8 @@ nsEventStatus AsyncPanZoomController::OnLongPressUp(const TapGestureInput& aEven nsEventStatus AsyncPanZoomController::GenerateSingleTap(const ParentLayerPoint& aPoint, mozilla::Modifiers aModifiers) { nsRefPtr controller = GetGeckoContentController(); if (controller) { - CSSPoint goannaScreenPoint; - if (ConvertToGoanna(aPoint, &goannaScreenPoint)) { + CSSPoint geckoScreenPoint; + if (ConvertToGecko(aPoint, &geckoScreenPoint)) { if (!CurrentTouchBlock()->SetSingleTapOccurred()) { return nsEventStatus_eIgnore; } @@ -1729,7 +1729,7 @@ nsEventStatus AsyncPanZoomController::GenerateSingleTap(const ParentLayerPoint& // See bug 965381 for the issue this was causing. controller->PostDelayedTask( NewRunnableMethod(controller.get(), &GeckoContentController::HandleSingleTap, - goannaScreenPoint, aModifiers, + geckoScreenPoint, aModifiers, GetGuid()), 0); return nsEventStatus_eConsumeNoDefault; @@ -1765,9 +1765,9 @@ nsEventStatus AsyncPanZoomController::OnDoubleTap(const TapGestureInput& aEvent) nsRefPtr controller = GetGeckoContentController(); if (controller) { if (mZoomConstraints.mAllowDoubleTapZoom && CurrentTouchBlock()->TouchActionAllowsDoubleTapZoom()) { - CSSPoint goannaScreenPoint; - if (ConvertToGoanna(aEvent.mLocalPoint, &goannaScreenPoint)) { - controller->HandleDoubleTap(goannaScreenPoint, aEvent.modifiers, GetGuid()); + CSSPoint geckoScreenPoint; + if (ConvertToGecko(aEvent.mLocalPoint, &geckoScreenPoint)) { + controller->HandleDoubleTap(geckoScreenPoint, aEvent.modifiers, GetGuid()); } } return nsEventStatus_eConsumeNoDefault; @@ -2816,7 +2816,7 @@ void AsyncPanZoomController::NotifyLayersUpdated(const FrameMetrics& aLayerMetri } else { // If we're not taking the aLayerMetrics wholesale we still need to pull // in some things into our local mFrameMetrics because these things are - // determined by Goanna and our copy in mFrameMetrics may be stale. + // determined by Gecko and our copy in mFrameMetrics may be stale. if (FuzzyEqualsAdditive(mFrameMetrics.mCompositionBounds.width, aLayerMetrics.mCompositionBounds.width) && mFrameMetrics.GetDevPixelsPerCSSPixel() == aLayerMetrics.GetDevPixelsPerCSSPixel() && @@ -2866,7 +2866,7 @@ void AsyncPanZoomController::NotifyLayersUpdated(const FrameMetrics& aLayerMetri // going to be ignored by layout, and so mLastDispatchedPaintMetrics // becomes incorrect for the purposes of calculating the LD transform. To // correct this we need to update mLastDispatchedPaintMetrics to be the - // last thing we know was painted by Goanna. + // last thing we know was painted by Gecko. mLastDispatchedPaintMetrics = aLayerMetrics; // Since the scroll offset has changed, we need to recompute the diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h index acedec8792..7d6ddc6838 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.h +++ b/gfx/layers/apz/src/AsyncPanZoomController.h @@ -103,12 +103,12 @@ public: GestureBehavior aGestures = DEFAULT_GESTURES); // -------------------------------------------------------------------------- - // These methods must only be called on the goanna thread. + // These methods must only be called on the gecko thread. // /** * Read the various prefs and do any global initialization for all APZC instances. - * This must be run on the goanna thread before any APZC instances are actually + * This must be run on the gecko thread before any APZC instances are actually * used for anything meaningful. */ static void InitializeGlobalState(); @@ -225,10 +225,10 @@ public: /** * Returns the transform to take something from the coordinate space of the - * last thing we know goanna painted, to the coordinate space of the last thing - * we asked goanna to paint. In cases where that last request has not yet been + * last thing we know gecko painted, to the coordinate space of the last thing + * we asked gecko to paint. In cases where that last request has not yet been * processed, this is needed to transform input events properly into a space - * goanna will understand. + * gecko will understand. */ Matrix4x4 GetTransformToLastDispatchedPaint() const; @@ -453,7 +453,7 @@ protected: nsEventStatus OnDoubleTap(const TapGestureInput& aEvent); /** - * Helper method to cancel any gesture currently going to Goanna. Used + * Helper method to cancel any gesture currently going to Gecko. Used * primarily when a user taps the screen over some clickable content but then * pans down instead of letting go (i.e. to cancel a previous touch so that a * new one can properly take effect. @@ -547,7 +547,7 @@ protected: void TrackTouch(const MultiTouchInput& aEvent); /** - * Utility function to send updated FrameMetrics to Goanna so that it can paint + * Utility function to send updated FrameMetrics to Gecko so that it can paint * 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 @@ -566,12 +566,12 @@ protected: void RequestContentRepaint(FrameMetrics& aFrameMetrics, bool aThrottled = true); /** - * Actually send the next pending paint request to goanna. + * Actually send the next pending paint request to gecko. */ void DispatchRepaintRequest(const FrameMetrics& aFrameMetrics); /** - * Gets the current frame metrics. This is *not* the Goanna copy stored in the + * Gets the current frame metrics. This is *not* the Gecko copy stored in the * layers code. */ const FrameMetrics& GetFrameMetrics() const; @@ -602,7 +602,7 @@ protected: * NOTE: This must be converted to CSSPoint relative to the child * document before sending over IPC. */ - bool ConvertToGoanna(const ParentLayerPoint& aPoint, CSSPoint* aOut); + bool ConvertToGecko(const ParentLayerPoint& aPoint, CSSPoint* aOut); enum AxisLockMode { FREE, /* No locking at all */ @@ -658,16 +658,16 @@ private: // stored here so that it is accessible from the UI/controller thread. // These are the metrics at last content paint, the most recent // values we were notified of in NotifyLayersUpdate(). Since it represents - // the Goanna state, it should be used as a basis for untransformation when - // sending messages back to Goanna. + // the Gecko state, it should be used as a basis for untransformation when + // sending messages back to Gecko. FrameMetrics mLastContentPaintMetrics; // The last metrics that we requested a paint for. These are used to make sure // that we're not requesting a paint of the same thing that's already drawn. // If we don't do this check, we don't get a ShadowLayersUpdated back. FrameMetrics mLastPaintRequestMetrics; - // The last metrics that we actually sent to Goanna. This allows us to transform - // inputs into a coordinate space that Goanna knows about. This assumes the pipe - // through which input events and repaint requests are sent to Goanna operates + // The last metrics that we actually sent to Gecko. This allows us to transform + // inputs into a coordinate space that Gecko knows about. This assumes the pipe + // through which input events and repaint requests are sent to Gecko operates // in a FIFO manner. FrameMetrics mLastDispatchedPaintMetrics; diff --git a/gfx/layers/apz/src/InputBlockState.h b/gfx/layers/apz/src/InputBlockState.h index f0f270e8d9..6763cb812d 100644 --- a/gfx/layers/apz/src/InputBlockState.h +++ b/gfx/layers/apz/src/InputBlockState.h @@ -67,7 +67,7 @@ protected: * * Each cancelable input block can be cancelled by web content, and * this information is stored in the mPreventDefault flag. Because web - * content runs on the Goanna main thread, we cannot always wait for web content's + * content runs on the Gecko main thread, we cannot always wait for web content's * response. Instead, there is a timeout that sets this flag in the case * where web content doesn't respond in time. The mContentResponded * and mContentResponseTimerExpired flags indicate which of these scenarios @@ -250,7 +250,7 @@ private: * * Additionally, if touch-action is enabled, each touch block should * have a set of allowed touch behavior flags; one for each touch point. - * This also requires running code on the Goanna main thread, and so may + * This also requires running code on the Gecko main thread, and so may * be populated with some latency. The mAllowedTouchBehaviorSet and * mAllowedTouchBehaviors variables track this information. */ diff --git a/gfx/layers/apz/testutil/APZTestData.h b/gfx/layers/apz/testutil/APZTestData.h index 1158f6f783..87ad485cb1 100644 --- a/gfx/layers/apz/testutil/APZTestData.h +++ b/gfx/layers/apz/testutil/APZTestData.h @@ -22,7 +22,7 @@ namespace layers { typedef uint32_t SequenceNumber; /** - * This structure is used to store information logged by various goanna + * This structure is used to store information logged by various gecko * components for later examination by test code. * It consists of a bucket for every paint (initiated on the client side), * and every repaint request (initiated on the compositor side by diff --git a/gfx/layers/apz/util/APZCCallbackHelper.cpp b/gfx/layers/apz/util/APZCCallbackHelper.cpp index ba1cf00b74..4d5fc78b19 100644 --- a/gfx/layers/apz/util/APZCCallbackHelper.cpp +++ b/gfx/layers/apz/util/APZCCallbackHelper.cpp @@ -65,16 +65,16 @@ ScrollFrameTo(nsIScrollableFrame* aFrame, const CSSPoint& aPoint, bool& aSuccess // If the frame is overflow:hidden on a particular axis, we don't want to allow // user-driven scroll on that axis. Simply set the scroll position on that axis // to whatever it already is. Note that this will leave the APZ's async scroll - // position out of sync with the goanna scroll position, but APZ can deal with that + // position out of sync with the gecko scroll position, but APZ can deal with that // (by design). Note also that when we run into this case, even if both axes // have overflow:hidden, we want to set aSuccessOut to true, so that the displayport - // follows the async scroll position rather than the goanna scroll position. - CSSPoint goannaScrollPosition = CSSPoint::FromAppUnits(aFrame->GetScrollPosition()); + // follows the async scroll position rather than the gecko scroll position. + CSSPoint geckoScrollPosition = CSSPoint::FromAppUnits(aFrame->GetScrollPosition()); if (aFrame->GetScrollbarStyles().mVertical == NS_STYLE_OVERFLOW_HIDDEN) { - targetScrollPosition.y = goannaScrollPosition.y; + targetScrollPosition.y = geckoScrollPosition.y; } if (aFrame->GetScrollbarStyles().mHorizontal == NS_STYLE_OVERFLOW_HIDDEN) { - targetScrollPosition.x = goannaScrollPosition.x; + targetScrollPosition.x = geckoScrollPosition.x; } // If the scrollable frame is currently in the middle of an async or smooth @@ -87,13 +87,13 @@ ScrollFrameTo(nsIScrollableFrame* aFrame, const CSSPoint& aPoint, bool& aSuccess || aFrame->LastSmoothScrollOrigin(); if (!scrollInProgress) { aFrame->ScrollToCSSPixelsApproximate(targetScrollPosition, nsGkAtoms::apz); - goannaScrollPosition = CSSPoint::FromAppUnits(aFrame->GetScrollPosition()); + geckoScrollPosition = CSSPoint::FromAppUnits(aFrame->GetScrollPosition()); aSuccessOut = true; } // Return the final scroll position after setting it so that anything that relies // on it can have an accurate value. Note that even if we set it above re-querying it // is a good idea because it may have gotten clamped or rounded. - return goannaScrollPosition; + return geckoScrollPosition; } /** @@ -183,7 +183,7 @@ APZCCallbackHelper::UpdateRootFrame(nsIPresShell* aPresShell, // Set the scroll port size, which determines the scroll range. For example if // a 500-pixel document is shown in a 100-pixel frame, the scroll port length would - // be 100, and goanna would limit the maximum scroll offset to 400 (so as to prevent + // be 100, and gecko would limit the maximum scroll offset to 400 (so as to prevent // overscroll). Note that if the content here was zoomed to 2x, the document would // be 1000 pixels long but the frame would still be 100 pixels, and so the maximum // scroll range would be 900. Therefore this calculation depends on the zoom applied @@ -342,7 +342,7 @@ APZCCallbackHelper::ApplyCallbackTransform(const CSSPoint& aInput, { // First, scale inversely by the pres shell resolution to cancel the // scale-to-resolution transform that the compositor adds to the layer with - // the pres shell resolution. The points sent to Goanna by APZ don't have + // the pres shell resolution. The points sent to Gecko by APZ don't have // this transform unapplied (unlike other compositor-side transforms) // because APZ doesn't know about it. CSSPoint input = aInput / aPresShellResolution; diff --git a/gfx/layers/client/ClientTiledPaintedLayer.cpp b/gfx/layers/client/ClientTiledPaintedLayer.cpp index 4ba1fa9dfc..d6b41e25e5 100644 --- a/gfx/layers/client/ClientTiledPaintedLayer.cpp +++ b/gfx/layers/client/ClientTiledPaintedLayer.cpp @@ -182,7 +182,7 @@ ClientTiledPaintedLayer::BeginPaint() } TILING_LOG("TILING %p: Critical displayport %s\n", this, Stringify(mPaintData.mCriticalDisplayPort).c_str()); - // Store the resolution from the displayport ancestor layer. Because this is Goanna-side, + // Store the resolution from the displayport ancestor layer. Because this is Gecko-side, // before any async transforms have occurred, we can use the zoom for this. mPaintData.mResolution = displayportMetrics.GetZoom(); TILING_LOG("TILING %p: Resolution %s\n", this, Stringify(mPaintData.mResolution).c_str()); diff --git a/gfx/layers/client/ImageClient.h b/gfx/layers/client/ImageClient.h index d36d90a91d..19391ed6bf 100644 --- a/gfx/layers/client/ImageClient.h +++ b/gfx/layers/client/ImageClient.h @@ -162,7 +162,7 @@ protected: /** * And ImageClient to handle opaque video stream. * Such video stream does not upload new Image for each frame. - * Goanna have no way to get the buffer content from the Image, since the Image + * Gecko have no way to get the buffer content from the Image, since the Image * does not contain the real buffer. * It need special hardware to display the Image */ diff --git a/gfx/layers/composite/AsyncCompositionManager.cpp b/gfx/layers/composite/AsyncCompositionManager.cpp index 8d1d47e21a..2254acf5eb 100644 --- a/gfx/layers/composite/AsyncCompositionManager.cpp +++ b/gfx/layers/composite/AsyncCompositionManager.cpp @@ -915,14 +915,14 @@ AsyncCompositionManager::TransformScrollableLayer(Layer* aLayer) // GetTransform here. Matrix4x4 oldTransform = aLayer->GetTransform(); - CSSToLayerScale goannaZoom = metrics.LayersPixelsPerCSSPixel().ToScaleFactor(); + CSSToLayerScale geckoZoom = metrics.LayersPixelsPerCSSPixel().ToScaleFactor(); - LayerIntPoint scrollOffsetLayerPixels = RoundedToInt(metrics.GetScrollOffset() * goannaZoom); + LayerIntPoint scrollOffsetLayerPixels = RoundedToInt(metrics.GetScrollOffset() * geckoZoom); if (mIsFirstPaint) { mContentRect = metrics.GetScrollableRect(); SetFirstPaintViewport(scrollOffsetLayerPixels, - goannaZoom, + geckoZoom, mContentRect); mIsFirstPaint = false; } else if (!metrics.GetScrollableRect().IsEqualEdges(mContentRect)) { @@ -937,7 +937,7 @@ AsyncCompositionManager::TransformScrollableLayer(Layer* aLayer) (metrics.GetCriticalDisplayPort().IsEmpty() ? metrics.GetDisplayPort() : metrics.GetCriticalDisplayPort() - ) * goannaZoom); + ) * geckoZoom); displayPort += scrollOffsetLayerPixels; LayerMargin fixedLayerMargins(0, 0, 0, 0); @@ -954,7 +954,7 @@ AsyncCompositionManager::TransformScrollableLayer(Layer* aLayer) * metrics.GetCumulativeResolution().ToScaleFactor() * LayerToParentLayerScale(1)); ParentLayerPoint userScroll = metrics.GetScrollOffset() * userZoom; - SyncViewportInfo(displayPort, goannaZoom, mLayersUpdated, + SyncViewportInfo(displayPort, geckoZoom, mLayersUpdated, userScroll, userZoom, fixedLayerMargins, offset); mLayersUpdated = false; @@ -963,18 +963,18 @@ AsyncCompositionManager::TransformScrollableLayer(Layer* aLayer) mLayerManager->GetCompositor()->SetScreenRenderOffset(offset); // Handle transformations for asynchronous panning and zooming. We determine the - // zoom used by Goanna from the transformation set on the root layer, and we - // determine the scroll offset used by Goanna from the frame metrics of the + // zoom used by Gecko from the transformation set on the root layer, and we + // determine the scroll offset used by Gecko from the frame metrics of the // primary scrollable layer. We compare this to the user zoom and scroll // offset in the view transform we obtained from Java in order to compute the // transformation we need to apply. - ParentLayerPoint goannaScroll(0, 0); + ParentLayerPoint geckoScroll(0, 0); if (metrics.IsScrollable()) { - goannaScroll = metrics.GetScrollOffset() * userZoom; + geckoScroll = metrics.GetScrollOffset() * userZoom; } LayerToParentLayerScale asyncZoom = userZoom / metrics.LayersPixelsPerCSSPixel().ToScaleFactor(); - ParentLayerPoint translation = userScroll - goannaScroll; + ParentLayerPoint translation = userScroll - geckoScroll; Matrix4x4 treeTransform = ViewTransform(asyncZoom, -translation); // Apply the tree transform on top of GetLocalTransform() here (rather than @@ -1044,12 +1044,12 @@ AsyncCompositionManager::TransformShadowTree(TimeStamp aCurrentFrame) // // Attempt to apply an async content transform to any layer that has // an async pan zoom controller (which means that it is rendered - // async using Goanna). If this fails, fall back to transforming the + // async using Gecko). If this fails, fall back to transforming the // primary scrollable layer. "Failing" here means that we don't // find a frame that is async scrollable. Note that the fallback // code also includes Fennec which is rendered async. Fennec uses // its own platform-specific async rendering that is done partially - // in Goanna and partially in Java. + // in Gecko and partially in Java. wantNextFrame |= SampleAPZAnimations(LayerMetricsWrapper(root), aCurrentFrame); if (!ApplyAsyncContentTransformToTree(root)) { nsAutoTArray scrollableLayers; diff --git a/gfx/layers/ipc/AsyncTransactionTracker.h b/gfx/layers/ipc/AsyncTransactionTracker.h index 56c6a28cd2..de5c56fc79 100644 --- a/gfx/layers/ipc/AsyncTransactionTracker.h +++ b/gfx/layers/ipc/AsyncTransactionTracker.h @@ -104,7 +104,7 @@ protected: bool mCompleted; /** - * goanna does not provide atomic operation for uint64_t. + * gecko does not provide atomic operation for uint64_t. * Ensure atomicity by using Mutex. */ static uint64_t sSerialCounter; @@ -173,7 +173,7 @@ protected: std::map > mAsyncTransactionTrackeres; /** - * goanna does not provide atomic operation for uint64_t. + * gecko does not provide atomic operation for uint64_t. * Ensure atomicity by using Mutex. */ static uint64_t sSerialCounter; diff --git a/gfx/layers/ipc/CompositableForwarder.h b/gfx/layers/ipc/CompositableForwarder.h index 44dd6f7f24..d5a254710d 100644 --- a/gfx/layers/ipc/CompositableForwarder.h +++ b/gfx/layers/ipc/CompositableForwarder.h @@ -180,7 +180,7 @@ public: /** * Returns the type of backend that is used off the main thread. * We only don't allow changing the backend type at runtime so this value can - * be queried once and will not change until Goanna is restarted. + * be queried once and will not change until Gecko is restarted. */ virtual LayersBackend GetCompositorBackendType() const override { diff --git a/gfx/layers/ipc/CompositableTransactionParent.cpp b/gfx/layers/ipc/CompositableTransactionParent.cpp index 0b16216a1d..60d374ceea 100644 --- a/gfx/layers/ipc/CompositableTransactionParent.cpp +++ b/gfx/layers/ipc/CompositableTransactionParent.cpp @@ -236,7 +236,7 @@ CompositableParentManager::SendPendingAsyncMessges() // Some type of AsyncParentMessageData message could have // one file descriptor (e.g. OpDeliverFence). - // A number of file descriptors per goanna ipc message have a limitation + // A number of file descriptors per gecko ipc message have a limitation // on OS_POSIX (MACOSX or LINUX). #if defined(OS_POSIX) static const uint32_t kMaxMessageNumber = FileDescriptorSet::MAX_DESCRIPTORS_PER_MESSAGE; diff --git a/gfx/layers/ipc/ISurfaceAllocator.h b/gfx/layers/ipc/ISurfaceAllocator.h index d233790645..c539bda432 100644 --- a/gfx/layers/ipc/ISurfaceAllocator.h +++ b/gfx/layers/ipc/ISurfaceAllocator.h @@ -86,7 +86,7 @@ public: /** * Returns the type of backend that is used off the main thread. * We only don't allow changing the backend type at runtime so this value can - * be queried once and will not change until Goanna is restarted. + * be queried once and will not change until Gecko is restarted. * * XXX - With e10s this may not be true anymore. we can have accelerated widgets * and non-accelerated widgets (small popups, etc.) diff --git a/gfx/layers/ipc/LayerTransactionParent.cpp b/gfx/layers/ipc/LayerTransactionParent.cpp index b7e3273b07..d1d7172f1b 100644 --- a/gfx/layers/ipc/LayerTransactionParent.cpp +++ b/gfx/layers/ipc/LayerTransactionParent.cpp @@ -608,7 +608,7 @@ LayerTransactionParent::RecvUpdate(InfallibleTArray&& cset, #ifdef COMPOSITOR_PERFORMANCE_WARNING int compositeTime = (int)(mozilla::TimeStamp::Now() - updateStart).ToMilliseconds(); if (compositeTime > 15) { - printf_stderr("Compositor: Layers update took %i ms (blocking goanna).\n", compositeTime); + printf_stderr("Compositor: Layers update took %i ms (blocking gecko).\n", compositeTime); } #endif diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index fd694e93a0..66dda70bbf 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -196,7 +196,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': ] # NB: Gralloc is available on other platforms that use the android GL -# libraries, but only Gonk is able to use it reliably because Goanna +# libraries, but only Gonk is able to use it reliably because Gecko # has full system permissions there. if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': EXPORTS.mozilla.layers += [ diff --git a/gfx/layers/opengl/TextureHostOGL.cpp b/gfx/layers/opengl/TextureHostOGL.cpp index a79055e6fd..a1c430df32 100644 --- a/gfx/layers/opengl/TextureHostOGL.cpp +++ b/gfx/layers/opengl/TextureHostOGL.cpp @@ -141,7 +141,7 @@ TextureHostOGL::SetReleaseFence(const android::sp& aReleaseFence android::sp TextureHostOGL::GetAndResetReleaseFence() { - // Hold previous ReleaseFence to prevent Fence delivery failure via goanna IPC. + // Hold previous ReleaseFence to prevent Fence delivery failure via gecko IPC. mPrevReleaseFence = mReleaseFence; // Reset current ReleaseFence. mReleaseFence = android::Fence::NO_FENCE; diff --git a/gfx/layers/opengl/TextureHostOGL.h b/gfx/layers/opengl/TextureHostOGL.h index 47be55b39a..03e601ae3f 100644 --- a/gfx/layers/opengl/TextureHostOGL.h +++ b/gfx/layers/opengl/TextureHostOGL.h @@ -162,7 +162,7 @@ protected: android::sp mAcquireFence; /** - * Hold previous ReleaseFence to prevent Fence delivery failure via goanna IPC. + * Hold previous ReleaseFence to prevent Fence delivery failure via gecko IPC. * Fence is a kernel object and its lifetime is managed by a reference count. * Until the Fence is delivered to client side, need to hold Fence on host side. */ diff --git a/gfx/qcms/transform.c b/gfx/qcms/transform.c index 5a4ac126ee..f7bade6e8c 100644 --- a/gfx/qcms/transform.c +++ b/gfx/qcms/transform.c @@ -1044,7 +1044,7 @@ static void cpuid(uint32_t fxn, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t // -------------------------Runtime SSEx Detection----------------------------- /* MMX is always supported per - * Goanna v1.9.1 minimum CPU requirements */ + * Gecko v1.9.1 minimum CPU requirements */ #define SSE1_EDX_MASK (1UL << 25) #define SSE2_EDX_MASK (1UL << 26) #define SSE3_ECX_MASK (1UL << 0) diff --git a/gfx/tests/crashtests/407842.html b/gfx/tests/crashtests/407842.html index 1a24cc6aa4..a90c13b3d5 100644 --- a/gfx/tests/crashtests/407842.html +++ b/gfx/tests/crashtests/407842.html @@ -4,7 +4,7 @@ -Goanna Crash Demo +Gecko Crash Demo diff --git a/gfx/tests/gtest/TestAsyncPanZoomController.cpp b/gfx/tests/gtest/TestAsyncPanZoomController.cpp index 20b63ba02c..00423449b5 100644 --- a/gfx/tests/gtest/TestAsyncPanZoomController.cpp +++ b/gfx/tests/gtest/TestAsyncPanZoomController.cpp @@ -1752,13 +1752,13 @@ protected: class APZHitTestingTester : public APZCTreeManagerTester { protected: Matrix4x4 transformToApzc; - Matrix4x4 transformToGoanna; + Matrix4x4 transformToGecko; already_AddRefed GetTargetAPZC(const ScreenPoint& aPoint) { nsRefPtr hit = manager->GetTargetAPZC(aPoint, nullptr); if (hit) { transformToApzc = manager->GetScreenToApzcTransform(hit.get()); - transformToGoanna = manager->GetApzcToGoannaTransform(hit.get()); + transformToGecko = manager->GetApzcToGeckoTransform(hit.get()); } return hit.forget(); } @@ -1835,7 +1835,7 @@ TEST_F(APZHitTestingTester, HitTesting1) { TestAsyncPanZoomController* nullAPZC = nullptr; EXPECT_EQ(nullAPZC, hit.get()); EXPECT_EQ(Matrix4x4(), transformToApzc); - EXPECT_EQ(Matrix4x4(), transformToGoanna); + EXPECT_EQ(Matrix4x4(), transformToGecko); uint32_t paintSequenceNumber = 0; @@ -1846,7 +1846,7 @@ TEST_F(APZHitTestingTester, HitTesting1) { EXPECT_EQ(ApzcOf(root), hit.get()); // expect hit point at LayerIntPoint(15, 15) EXPECT_EQ(Point(15, 15), transformToApzc * Point(15, 15)); - EXPECT_EQ(Point(15, 15), transformToGoanna * Point(15, 15)); + EXPECT_EQ(Point(15, 15), transformToGecko * Point(15, 15)); // Now we have a sub APZC with a better fit SetScrollableFrameMetrics(layers[3], FrameMetrics::START_SCROLL_ID + 1); @@ -1856,7 +1856,7 @@ TEST_F(APZHitTestingTester, HitTesting1) { EXPECT_EQ(ApzcOf(layers[3]), hit.get()); // expect hit point at LayerIntPoint(25, 25) EXPECT_EQ(Point(25, 25), transformToApzc * Point(25, 25)); - EXPECT_EQ(Point(25, 25), transformToGoanna * Point(25, 25)); + EXPECT_EQ(Point(25, 25), transformToGecko * Point(25, 25)); // At this point, layers[4] obscures layers[3] at the point (15, 15) so // hitting there should hit the root APZC @@ -1870,24 +1870,24 @@ TEST_F(APZHitTestingTester, HitTesting1) { EXPECT_EQ(ApzcOf(layers[4]), hit.get()); // expect hit point at LayerIntPoint(15, 15) EXPECT_EQ(Point(15, 15), transformToApzc * Point(15, 15)); - EXPECT_EQ(Point(15, 15), transformToGoanna * Point(15, 15)); + EXPECT_EQ(Point(15, 15), transformToGecko * Point(15, 15)); // Hit test ouside the reach of layer[3,4] but inside root hit = GetTargetAPZC(ScreenPoint(90, 90)); EXPECT_EQ(ApzcOf(root), hit.get()); // expect hit point at LayerIntPoint(90, 90) EXPECT_EQ(Point(90, 90), transformToApzc * Point(90, 90)); - EXPECT_EQ(Point(90, 90), transformToGoanna * Point(90, 90)); + EXPECT_EQ(Point(90, 90), transformToGecko * Point(90, 90)); // Hit test ouside the reach of any layer hit = GetTargetAPZC(ScreenPoint(1000, 10)); EXPECT_EQ(nullAPZC, hit.get()); EXPECT_EQ(Matrix4x4(), transformToApzc); - EXPECT_EQ(Matrix4x4(), transformToGoanna); + EXPECT_EQ(Matrix4x4(), transformToGecko); hit = GetTargetAPZC(ScreenPoint(-1000, 10)); EXPECT_EQ(nullAPZC, hit.get()); EXPECT_EQ(Matrix4x4(), transformToApzc); - EXPECT_EQ(Matrix4x4(), transformToGoanna); + EXPECT_EQ(Matrix4x4(), transformToGecko); } // A more involved hit testing test that involves css and async transforms. @@ -1911,7 +1911,7 @@ TEST_F(APZHitTestingTester, HitTesting2) { nsRefPtr hit = GetTargetAPZC(ScreenPoint(75, 25)); EXPECT_EQ(apzcroot, hit.get()); EXPECT_EQ(Point(75, 25), transformToApzc * Point(75, 25)); - EXPECT_EQ(Point(75, 25), transformToGoanna * Point(75, 25)); + EXPECT_EQ(Point(75, 25), transformToGecko * Point(75, 25)); // Hit an area on the root that would be on layers[3] if layers[2] // weren't transformed. @@ -1923,21 +1923,21 @@ TEST_F(APZHitTestingTester, HitTesting2) { hit = GetTargetAPZC(ScreenPoint(15, 75)); EXPECT_EQ(apzcroot, hit.get()); EXPECT_EQ(Point(15, 75), transformToApzc * Point(15, 75)); - EXPECT_EQ(Point(15, 75), transformToGoanna * Point(15, 75)); + EXPECT_EQ(Point(15, 75), transformToGecko * Point(15, 75)); // Hit an area on layers[1]. hit = GetTargetAPZC(ScreenPoint(25, 25)); EXPECT_EQ(apzc1, hit.get()); EXPECT_EQ(Point(25, 25), transformToApzc * Point(25, 25)); - EXPECT_EQ(Point(25, 25), transformToGoanna * Point(25, 25)); + EXPECT_EQ(Point(25, 25), transformToGecko * Point(25, 25)); // Hit an area on layers[3]. hit = GetTargetAPZC(ScreenPoint(25, 75)); EXPECT_EQ(apzc3, hit.get()); // transformToApzc should unapply layers[2]'s transform EXPECT_EQ(Point(12.5, 75), transformToApzc * Point(25, 75)); - // and transformToGoanna should reapply it - EXPECT_EQ(Point(25, 75), transformToGoanna * Point(12.5, 75)); + // and transformToGecko should reapply it + EXPECT_EQ(Point(25, 75), transformToGecko * Point(12.5, 75)); // Hit an area on layers[3] that would be on the root if layers[2] // weren't transformed. @@ -1945,8 +1945,8 @@ TEST_F(APZHitTestingTester, HitTesting2) { EXPECT_EQ(apzc3, hit.get()); // transformToApzc should unapply layers[2]'s transform EXPECT_EQ(Point(37.5, 75), transformToApzc * Point(75, 75)); - // and transformToGoanna should reapply it - EXPECT_EQ(Point(75, 75), transformToGoanna * Point(37.5, 75)); + // and transformToGecko should reapply it + EXPECT_EQ(Point(75, 75), transformToGecko * Point(37.5, 75)); // Pan the root layer upward by 50 pixels. // This causes layers[1] to scroll out of view, and an async transform @@ -1955,7 +1955,7 @@ TEST_F(APZHitTestingTester, HitTesting2) { EXPECT_CALL(*mcc, RequestContentRepaint(_)).Times(1); // This first pan will move the APZC by 50 pixels, and dispatch a paint request. - // Since this paint request is in the queue to Goanna, transformToGoanna will + // Since this paint request is in the queue to Gecko, transformToGecko will // take it into account. ApzcPanNoFling(apzcroot, time, 100, 50); @@ -1964,10 +1964,10 @@ TEST_F(APZHitTestingTester, HitTesting2) { EXPECT_EQ(apzcroot, hit.get()); // transformToApzc doesn't unapply the root's own async transform EXPECT_EQ(Point(75, 75), transformToApzc * Point(75, 75)); - // and transformToGoanna unapplies it and then reapplies it, because by the - // time the event being transformed reaches Goanna the new paint request will + // and transformToGecko unapplies it and then reapplies it, because by the + // time the event being transformed reaches Gecko the new paint request will // have been handled. - EXPECT_EQ(Point(75, 75), transformToGoanna * Point(75, 75)); + EXPECT_EQ(Point(75, 75), transformToGecko * Point(75, 75)); // Hit where layers[1] used to be and where layers[3] should now be. hit = GetTargetAPZC(ScreenPoint(25, 25)); @@ -1975,9 +1975,9 @@ TEST_F(APZHitTestingTester, HitTesting2) { // transformToApzc unapplies both layers[2]'s css transform and the root's // async transform EXPECT_EQ(Point(12.5, 75), transformToApzc * Point(25, 25)); - // transformToGoanna reapplies both the css transform and the async transform + // transformToGecko reapplies both the css transform and the async transform // because we have already issued a paint request with it. - EXPECT_EQ(Point(25, 25), transformToGoanna * Point(12.5, 75)); + EXPECT_EQ(Point(25, 25), transformToGecko * Point(12.5, 75)); // This second pan will move the APZC by another 50 pixels but since the paint // request dispatched above has not "completed", we will not dispatch another @@ -1990,18 +1990,18 @@ TEST_F(APZHitTestingTester, HitTesting2) { EXPECT_EQ(apzcroot, hit.get()); // transformToApzc doesn't unapply the root's own async transform EXPECT_EQ(Point(75, 75), transformToApzc * Point(75, 75)); - // transformToGoanna unapplies the full async transform of -100 pixels, and then + // transformToGecko unapplies the full async transform of -100 pixels, and then // reapplies the "D" transform of -50 leading to an overall adjustment of +50 - EXPECT_EQ(Point(75, 125), transformToGoanna * Point(75, 75)); + EXPECT_EQ(Point(75, 125), transformToGecko * Point(75, 75)); // Hit where layers[1] used to be. It should now hit the root. hit = GetTargetAPZC(ScreenPoint(25, 25)); EXPECT_EQ(apzcroot, hit.get()); // transformToApzc doesn't unapply the root's own async transform EXPECT_EQ(Point(25, 25), transformToApzc * Point(25, 25)); - // transformToGoanna unapplies the full async transform of -100 pixels, and then + // transformToGecko unapplies the full async transform of -100 pixels, and then // reapplies the "D" transform of -50 leading to an overall adjustment of +50 - EXPECT_EQ(Point(25, 75), transformToGoanna * Point(25, 25)); + EXPECT_EQ(Point(25, 75), transformToGecko * Point(25, 25)); } TEST_F(APZCTreeManagerTester, ScrollablePaintedLayers) { @@ -2141,7 +2141,7 @@ TEST_F(APZHitTestingTester, TestRepaintFlushOnNewInputBlock) { // The main purpose of this test is to verify that touch-start events (or anything // that starts a new input block) don't ever get untransformed. This should always // hold because the APZ code should flush repaints when we start a new input block - // and the transform to goanna space should be empty. + // and the transform to gecko space should be empty. CreateSimpleScrollingLayer(); ScopedLayerTreeRegistration registration(0, root, mcc); @@ -2582,7 +2582,7 @@ protected: // LayerID 0 1 2 3 // 0 is the root // 1 is a container layer whose sole purpose to make a non-empty ancestor - // transform for 2, so that 2's screen-to-apzc and apzc-to-goanna + // transform for 2, so that 2's screen-to-apzc and apzc-to-gecko // transforms are different from 3's. // 2 is a small layer that is the actual target // 3 is a big layer obscuring 2 with a dispatch-to-content region diff --git a/gfx/thebes/VsyncSource.h b/gfx/thebes/VsyncSource.h index 08198d2877..b068728f39 100644 --- a/gfx/thebes/VsyncSource.h +++ b/gfx/thebes/VsyncSource.h @@ -42,7 +42,7 @@ public: // TODO: Windows / Linux. DOCUMENT THIS WHEN IMPLEMENTING ON THOSE PLATFORMS // Android: TODO // All platforms should normalize to the vsync that just occured. - // Large parts of Goanna assume TimeStamps should not be in the future such as animations + // Large parts of Gecko assume TimeStamps should not be in the future such as animations virtual void NotifyVsync(TimeStamp aVsyncTimestamp); nsRefPtr GetRefreshTimerVsyncDispatcher(); diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp index 6fbdaf6022..5fafca5f42 100644 --- a/gfx/thebes/gfxAndroidPlatform.cpp +++ b/gfx/thebes/gfxAndroidPlatform.cpp @@ -353,11 +353,11 @@ gfxAndroidPlatform::FontHintingEnabled() // might not want hinting. Let's see. #ifdef MOZ_USING_ANDROID_JAVA_WIDGETS - // On android-java, we currently only use goanna to render web + // On android-java, we currently only use gecko to render web // content that can always be be non-reflow-zoomed. So turn off // hinting. // - // XXX when goanna-android-java is used as an "app runtime", we may + // XXX when gecko-android-java is used as an "app runtime", we may // want to re-enable hinting for non-browser processes there. return false; #endif // MOZ_USING_ANDROID_JAVA_WIDGETS @@ -379,10 +379,10 @@ bool gfxAndroidPlatform::RequiresLinearZoom() { #ifdef MOZ_USING_ANDROID_JAVA_WIDGETS - // On android-java, we currently only use goanna to render web + // On android-java, we currently only use gecko to render web // content that can always be be non-reflow-zoomed. // - // XXX when goanna-android-java is used as an "app runtime", we may + // XXX when gecko-android-java is used as an "app runtime", we may // want to treat it like B2G and use linear zoom only for the web // browser process, not other apps. return true; diff --git a/gfx/thebes/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp index 789bc9cc9c..56c5603f96 100644 --- a/gfx/thebes/gfxFT2FontList.cpp +++ b/gfx/thebes/gfxFT2FontList.cpp @@ -18,7 +18,7 @@ #include "nsXULAppAPI.h" #include #include -#define ALOG(args...) __android_log_print(ANDROID_LOG_INFO, "Goanna" , ## args) +#define ALOG(args...) __android_log_print(ANDROID_LOG_INFO, "Gecko" , ## args) #include "ft2build.h" #include FT_FREETYPE_H diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h index 3c4be6f5e0..ea86f67d51 100644 --- a/gfx/thebes/gfxPlatform.h +++ b/gfx/thebes/gfxPlatform.h @@ -395,7 +395,7 @@ public: /** * True when hinting should be enabled. This setting shouldn't - * change per goanna process, while the process is live. If so the + * change per gecko process, while the process is live. If so the * results are not defined. * * NB: this bit is only honored by the FT2 backend, currently. @@ -411,7 +411,7 @@ public: * is only true for the browser process, not Gaia or other apps. * * Like FontHintingEnabled (above), this setting shouldn't - * change per goanna process, while the process is live. If so the + * change per gecko process, while the process is live. If so the * results are not defined. * * NB: this bit is only honored by the FT2 backend, currently. diff --git a/gfx/thebes/gfxPlatformMac.cpp b/gfx/thebes/gfxPlatformMac.cpp index 80fe2bca8a..16dc4e21a0 100644 --- a/gfx/thebes/gfxPlatformMac.cpp +++ b/gfx/thebes/gfxPlatformMac.cpp @@ -518,7 +518,7 @@ public: } // The vsync timestamps given by the CVDisplayLinkCallback are - // in the future for the NEXT frame. Large parts of Goanna, such + // in the future for the NEXT frame. Large parts of Gecko, such // as animations assume a timestamp at either now or in the past. // Normalize the timestamps given to the VsyncDispatchers to the vsync // that just occured, not the vsync that is upcoming. diff --git a/gfx/thebes/gfxScriptItemizer.cpp b/gfx/thebes/gfxScriptItemizer.cpp index 9c04204540..3ca2581b17 100644 --- a/gfx/thebes/gfxScriptItemizer.cpp +++ b/gfx/thebes/gfxScriptItemizer.cpp @@ -5,7 +5,7 @@ /* * This file is based on usc_impl.c from ICU 4.2.0.1, slightly adapted - * for use within Mozilla Goanna, separate from a standard ICU build. + * for use within Mozilla Gecko, separate from a standard ICU build. * * The original ICU license of the code follows: * diff --git a/gfx/thebes/gfxScriptItemizer.h b/gfx/thebes/gfxScriptItemizer.h index 0f35d1296b..def77663ed 100644 --- a/gfx/thebes/gfxScriptItemizer.h +++ b/gfx/thebes/gfxScriptItemizer.h @@ -5,7 +5,7 @@ /* * This file is based on usc_impl.c from ICU 4.2.0.1, slightly adapted - * for use within Mozilla Goanna, separate from a standard ICU build. + * for use within Mozilla Gecko, separate from a standard ICU build. * * The original ICU license of the code follows: * diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index 34f8cdebd6..3ac0bb351f 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -292,7 +292,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'): CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - # This is set for "normal Android", that is, when Goanna is running on + # This is set for "normal Android", that is, when Gecko is running on # top of the android java runtime. DEFINES['MOZ_USING_ANDROID_JAVA_WIDGETS'] = True diff --git a/hal/gonk/GonkHal.cpp b/hal/gonk/GonkHal.cpp index 0bac6daee5..ed9fb6d0e0 100644 --- a/hal/gonk/GonkHal.cpp +++ b/hal/gonk/GonkHal.cpp @@ -449,8 +449,8 @@ public: { // bug 975667 - // Goanna gonk hal is required to emit battery charging/level notification via nsIObserverService. - // This is useful for XPCOM components that are not statically linked to Goanna and cannot call + // Gecko gonk hal is required to emit battery charging/level notification via nsIObserverService. + // This is useful for XPCOM components that are not statically linked to Gecko and cannot call // hal::EnableBatteryNotifications nsCOMPtr obsService = mozilla::services::GetObserverService(); nsCOMPtr propbag = @@ -760,7 +760,7 @@ UpdateCpuSleepState() sInternalLockCpuMonitor->AssertCurrentThreadOwns(); bool allowed = sCpuSleepAllowed && !sInternalLockCpuCount; - WriteToFile(allowed ? wakeUnlockFilename : wakeLockFilename, "goanna"); + WriteToFile(allowed ? wakeUnlockFilename : wakeLockFilename, "gecko"); } static void diff --git a/hal/linux/LinuxPower.cpp b/hal/linux/LinuxPower.cpp index 7064cb4f24..70ab4a3f6e 100644 --- a/hal/linux/LinuxPower.cpp +++ b/hal/linux/LinuxPower.cpp @@ -139,7 +139,7 @@ void StartForceQuitWatchdog(hal::ShutdownMode aMode, int32_t aTimeoutSecs) { // Force-quits are intepreted a little more ferociously on Gonk, - // because while Goanna is in the process of shutting down, the user + // because while Gecko is in the process of shutting down, the user // can't call 911, for example. And if we hang on shutdown, bad // things happen. So, make sure that doesn't happen. if (aTimeoutSecs <= 0) { @@ -147,7 +147,7 @@ StartForceQuitWatchdog(hal::ShutdownMode aMode, int32_t aTimeoutSecs) } // Use a raw pthread here to insulate ourselves from bugs in other - // Goanna code that we're trying to protect! + // Gecko code that we're trying to protect! // // Note that we let the watchdog in charge of releasing |paramPtr| // if the pthread is successfully created. diff --git a/hal/windows/WindowsBattery.cpp b/hal/windows/WindowsBattery.cpp index 72f2e0eb05..475971dd67 100644 --- a/hal/windows/WindowsBattery.cpp +++ b/hal/windows/WindowsBattery.cpp @@ -78,7 +78,7 @@ EnableBatteryNotifications() } // Create custom window to watch battery event - // If we can get Goanna's window handle, this is unnecessary. + // If we can get Gecko's window handle, this is unnecessary. if (sHWnd == nullptr) { WNDCLASSW wc; diff --git a/image/imgLoader.cpp b/image/imgLoader.cpp index b1bf08226f..0de14337a1 100644 --- a/image/imgLoader.cpp +++ b/image/imgLoader.cpp @@ -1697,7 +1697,7 @@ bool imgLoader::ValidateEntry(imgCacheEntry *aEntry, // data URIs are immutable and by their nature can't leak data, so we can // just return true in that case. Doing so would mean that shift-reload // doesn't reload data URI documents/images though (which is handy for - // debugging during goanna development) so we make an exception in that case. + // debugging during gecko development) so we make an exception in that case. nsAutoCString scheme; aURI->GetScheme(scheme); if (scheme.EqualsLiteral("data") && diff --git a/intl/hyphenation/hnjalloc.h b/intl/hyphenation/hnjalloc.h index f74bd03d10..a5e7693227 100644 --- a/intl/hyphenation/hnjalloc.h +++ b/intl/hyphenation/hnjalloc.h @@ -19,7 +19,7 @@ /* * To enable us to load hyphenation dictionaries from arbitrary resource URIs, * not just through file paths using stdio, we override the (few) stdio APIs - * that hyphen.c uses and provide our own reimplementation that calls Goanna + * that hyphen.c uses and provide our own reimplementation that calls Gecko * i/o methods. */ diff --git a/intl/hyphenation/nsHyphenator.cpp b/intl/hyphenation/nsHyphenator.cpp index 84d5140c00..b72928f1ad 100644 --- a/intl/hyphenation/nsHyphenator.cpp +++ b/intl/hyphenation/nsHyphenator.cpp @@ -134,7 +134,7 @@ nsHyphenator::Hyphenate(const nsAString& aString, // Surprisingly, hnj_hyphen_hyphenate2 converts the 'hyphens' buffer // from utf8 code unit indexing (which would match the utf8 input // string directly) to Unicode character indexing. - // We then need to convert this to utf16 code unit offsets for Goanna. + // We then need to convert this to utf16 code unit offsets for Gecko. const char *hyphPtr = utf8hyphens.Elements(); const char16_t *cur = begin + wordStart; const char16_t *end = begin + wordLimit; diff --git a/intl/lwbrk/tests/moz.build b/intl/lwbrk/tests/moz.build index d46aadb5a5..243b1900af 100644 --- a/intl/lwbrk/tests/moz.build +++ b/intl/lwbrk/tests/moz.build @@ -4,6 +4,6 @@ # 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/. -GoannaCppUnitTests([ +GeckoCppUnitTests([ 'TestLineBreak', ]) diff --git a/intl/lwbrk/tools/spec_table.html b/intl/lwbrk/tools/spec_table.html index 3f8005e3f0..519f98c534 100644 --- a/intl/lwbrk/tools/spec_table.html +++ b/intl/lwbrk/tools/spec_table.html @@ -28,15 +28,15 @@ td {

    The values of IE7 and Opera9: 'A' means that the line is breakable After the character, and 'B' means Before. 'BA' means Before and After.

    (C) which is the tail of the IE7 and the Opera9 means Character. (N) means Numeric. This means that they are around the character at testing. E.g., "a$a" is a testcase for (C), "0$0" is a testcase for (N).

    -

    Goanna is not breaking the lines on most western language context. But for file paths, URLs and very long word which is connected hyphens, +

    Gecko is not breaking the lines on most western language context. But for file paths, URLs and very long word which is connected hyphens, some characters might be breakable. They are 'breakable' in the table. However, they are not always breakable, they depend on the context in the word.

    - + - + diff --git a/intl/uconv/nsScriptableUConv.cpp b/intl/uconv/nsScriptableUConv.cpp index 294f7e324f..8eb46290bb 100644 --- a/intl/uconv/nsScriptableUConv.cpp +++ b/intl/uconv/nsScriptableUConv.cpp @@ -306,7 +306,7 @@ nsScriptableUnicodeConverter::InitConverter() // internal encodings will be decoder-only in the future, let's relax // this. Note that the other methods check mEncoder for null anyway. // Let's try the upper case. E.g. UTF-7 and ISO-2022-CN have upper - // case Goanna-canonical names. + // case Gecko-canonical names. ToUpperCase(label); contractId.AssignLiteral(NS_UNICODEENCODER_CONTRACTID_BASE); contractId.Append(label); diff --git a/intl/unicharutil/tests/moz.build b/intl/unicharutil/tests/moz.build index c072a72b54..8cc74f51ad 100644 --- a/intl/unicharutil/tests/moz.build +++ b/intl/unicharutil/tests/moz.build @@ -6,7 +6,7 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] -GoannaSimplePrograms([ +GeckoSimplePrograms([ 'NormalizationTest', 'UnicharSelfTest', ], msvcrt='static') diff --git a/ipc/app/moz.build b/ipc/app/moz.build index 46302a7cb3..db062bff67 100644 --- a/ipc/app/moz.build +++ b/ipc/app/moz.build @@ -15,7 +15,7 @@ else: } if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT': kwargs['msvcrt'] = 'static' - GoannaProgram(CONFIG['MOZ_CHILD_PROCESS_NAME'], **kwargs) + GeckoProgram(CONFIG['MOZ_CHILD_PROCESS_NAME'], **kwargs) SOURCES += [ 'MozillaRuntimeMain.cpp', diff --git a/ipc/chromium/src/base/message_loop.cc b/ipc/chromium/src/base/message_loop.cc index c1191fc41f..c1602657c2 100644 --- a/ipc/chromium/src/base/message_loop.cc +++ b/ipc/chromium/src/base/message_loop.cc @@ -31,7 +31,7 @@ #include "base/message_pump_android.h" #endif #ifdef MOZ_TASK_TRACER -#include "GoannaTaskTracer.h" +#include "GeckoTaskTracer.h" #endif #include "MessagePump.h" diff --git a/ipc/chromium/src/base/message_loop.h b/ipc/chromium/src/base/message_loop.h index be8cd20850..0f5916b389 100644 --- a/ipc/chromium/src/base/message_loop.h +++ b/ipc/chromium/src/base/message_loop.h @@ -197,11 +197,11 @@ public: // // TYPE_MOZILLA_CHILD // This type of ML is used in Mozilla child processes which initialize - // XPCOM and use the goanna event loop. + // XPCOM and use the gecko event loop. // // TYPE_MOZILLA_UI // This type of ML is used in Mozilla parent processes which initialize - // XPCOM and use the goanna event loop. + // XPCOM and use the gecko event loop. // // TYPE_MOZILLA_NONMAINTHREAD // This type of ML is used in Mozilla parent processes which initialize diff --git a/ipc/chromium/src/base/thread.cc b/ipc/chromium/src/base/thread.cc index 2e8d599fe2..042cfdefef 100644 --- a/ipc/chromium/src/base/thread.cc +++ b/ipc/chromium/src/base/thread.cc @@ -11,7 +11,7 @@ #include "mozilla/IOInterposer.h" #ifdef MOZ_TASK_TRACER -#include "GoannaTaskTracer.h" +#include "GeckoTaskTracer.h" #endif namespace base { diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc index 3f9e2979de..bcce509c42 100644 --- a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc +++ b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc @@ -34,7 +34,7 @@ #include "mozilla/UniquePtr.h" #ifdef MOZ_TASK_TRACER -#include "GoannaTaskTracerImpl.h" +#include "GeckoTaskTracerImpl.h" using namespace mozilla::tasktracer; #endif diff --git a/ipc/chromium/src/chrome/common/ipc_message.cc b/ipc/chromium/src/chrome/common/ipc_message.cc index cd537bfc61..7771e7fb6c 100644 --- a/ipc/chromium/src/chrome/common/ipc_message.cc +++ b/ipc/chromium/src/chrome/common/ipc_message.cc @@ -11,7 +11,7 @@ #include "chrome/common/file_descriptor_set_posix.h" #endif #ifdef MOZ_TASK_TRACER -#include "GoannaTaskTracer.h" +#include "GeckoTaskTracer.h" #endif #include "mozilla/Move.h" diff --git a/ipc/chromium/src/chrome/common/ipc_message.h b/ipc/chromium/src/chrome/common/ipc_message.h index 01b5fa3436..e7e91fd97a 100644 --- a/ipc/chromium/src/chrome/common/ipc_message.h +++ b/ipc/chromium/src/chrome/common/ipc_message.h @@ -11,7 +11,7 @@ #include "base/pickle.h" #ifdef MOZ_TASK_TRACER -#include "GoannaTaskTracer.h" +#include "GeckoTaskTracer.h" #endif #if defined(OS_POSIX) diff --git a/ipc/contentproc/plugin-container.cpp b/ipc/contentproc/plugin-container.cpp index 7e6e9432d9..6409fcd0ff 100644 --- a/ipc/contentproc/plugin-container.cpp +++ b/ipc/contentproc/plugin-container.cpp @@ -49,7 +49,7 @@ # define LOGE_IF(cond, ...) \ ( (CONDITION(cond)) \ ? ((void)__android_log_print(ANDROID_LOG_ERROR, \ - "Goanna:MozillaRntimeMain", __VA_ARGS__)) \ + "Gecko:MozillaRntimeMain", __VA_ARGS__)) \ : (void)0 ) # ifdef MOZ_CONTENT_SANDBOX diff --git a/ipc/glue/BrowserProcessSubThread.cpp b/ipc/glue/BrowserProcessSubThread.cpp index 517494bd34..f0a6ae3957 100644 --- a/ipc/glue/BrowserProcessSubThread.cpp +++ b/ipc/glue/BrowserProcessSubThread.cpp @@ -21,12 +21,12 @@ namespace ipc { // Friendly names for the well-known threads. static const char* kBrowserThreadNames[BrowserProcessSubThread::ID_COUNT] = { - "Goanna_IOThread", // IO + "Gecko_IOThread", // IO // "Chrome_FileThread", // FILE // "Chrome_DBThread", // DB // "Chrome_HistoryThread", // HISTORY #if defined(OS_LINUX) - "Goanna_Background_X11Thread", // BACKGROUND_X11 + "Gecko_Background_X11Thread", // BACKGROUND_X11 #endif }; diff --git a/ipc/glue/MessagePump.cpp b/ipc/glue/MessagePump.cpp index 27f467cf12..0bbf28c57a 100644 --- a/ipc/glue/MessagePump.cpp +++ b/ipc/glue/MessagePump.cpp @@ -113,7 +113,7 @@ MessagePump::Run(MessagePump::Delegate* aDelegate) #ifdef MOZ_WIDGET_ANDROID // This processes messages in the Android Looper. Note that we only - // get here if the normal Goanna event loop has been awoken above. + // get here if the normal Gecko event loop has been awoken above. // Bug 750713 if (MOZ_LIKELY(AndroidBridge::HasEnv())) { did_work |= mozilla::widget::GeckoAppShell::PumpMessageLoop(); diff --git a/ipc/glue/ProcessUtils.h b/ipc/glue/ProcessUtils.h index 58524a63fb..99d0f532dd 100644 --- a/ipc/glue/ProcessUtils.h +++ b/ipc/glue/ProcessUtils.h @@ -20,7 +20,7 @@ void SetThisProcessName(const char *aName); #ifdef MOZ_B2G_LOADER // see ProcessUtils_linux.cpp for explaination. -void ProcLoaderClientGoannaInit(); +void ProcLoaderClientGeckoInit(); bool ProcLoaderLoad(const char *aArgv[], const char *aEnvp[], diff --git a/ipc/glue/ProcessUtils_linux.cpp b/ipc/glue/ProcessUtils_linux.cpp index 9366cbfc2b..35b9cf701a 100644 --- a/ipc/glue/ProcessUtils_linux.cpp +++ b/ipc/glue/ProcessUtils_linux.cpp @@ -78,9 +78,9 @@ void SetThisProcessName(const char *aName) * client side, the b2g process. Then the b2g_main() is called to * start b2g process. * - * ProcLoaderClientGoannaInit() is called by XRE_main() to create the + * ProcLoaderClientGeckoInit() is called by XRE_main() to create the * parent actor, |ProcLoaderParent|, of PProcLoader for servicing the - * request to run Nuwa process later once Goanna has been initialized. + * request to run Nuwa process later once Gecko has been initialized. * * ProcLoaderServiceRun() is called by the server process. It starts * an IOThread and event loop to serve the |ProcLoaderChild| @@ -105,7 +105,7 @@ using base::file_handle_mapping_vector; static bool sProcLoaderClientOnDeinit = false; static DebugOnly sProcLoaderClientInitialized = false; -static DebugOnly sProcLoaderClientGoannaInitialized = false; +static DebugOnly sProcLoaderClientGeckoInitialized = false; static pid_t sProcLoaderPid = 0; static int sProcLoaderChannelFd = -1; static PProcLoaderParent *sProcLoaderParent = nullptr; @@ -178,7 +178,7 @@ CloseFileDescriptors(FdArray& aFds) * * The initialization of B2G loader are divided into two stages. First * stage is to collect child info passed from the main program of the - * loader. Second stage is to initialize Goanna according to info from the + * loader. Second stage is to initialize Gecko according to info from the * first stage and make the client of loader service ready. * * \param aPeerPid is the pid of the child. @@ -195,16 +195,16 @@ ProcLoaderClientInit(pid_t aPeerPid, int aChannelFd) } /** - * Initialize the client of B2G loader for Goanna. + * Initialize the client of B2G loader for Gecko. */ void -ProcLoaderClientGoannaInit() +ProcLoaderClientGeckoInit() { MOZ_ASSERT(sProcLoaderClientInitialized, "call ProcLoaderClientInit() at first"); - MOZ_ASSERT(!sProcLoaderClientGoannaInitialized, - "call ProcLoaderClientGoannaInit() more than once"); + MOZ_ASSERT(!sProcLoaderClientGeckoInitialized, + "call ProcLoaderClientGeckoInit() more than once"); - sProcLoaderClientGoannaInitialized = true; + sProcLoaderClientGeckoInitialized = true; TransportDescriptor fd; fd.mFd = base::FileDescriptor(sProcLoaderChannelFd, /*auto_close=*/ false); @@ -224,8 +224,8 @@ ProcLoaderClientGoannaInit() static void ProcLoaderClientDeinit() { - MOZ_ASSERT(sProcLoaderClientGoannaInitialized && sProcLoaderClientInitialized); - sProcLoaderClientGoannaInitialized = false; + MOZ_ASSERT(sProcLoaderClientGeckoInitialized && sProcLoaderClientInitialized); + sProcLoaderClientGeckoInitialized = false; sProcLoaderClientInitialized = false; sProcLoaderClientOnDeinit = true; diff --git a/ipc/glue/SharedMemoryBasic_android.cpp b/ipc/glue/SharedMemoryBasic_android.cpp index ea6041baeb..729023003f 100644 --- a/ipc/glue/SharedMemoryBasic_android.cpp +++ b/ipc/glue/SharedMemoryBasic_android.cpp @@ -31,7 +31,7 @@ namespace ipc { static void LogError(const char* what) { - __android_log_print(ANDROID_LOG_ERROR, "Goanna", + __android_log_print(ANDROID_LOG_ERROR, "Gecko", "%s: %s (%d)", what, strerror(errno), errno); } diff --git a/ipc/glue/WindowsMessageLoop.cpp b/ipc/glue/WindowsMessageLoop.cpp index 24b4065aeb..3f7afaaa18 100644 --- a/ipc/glue/WindowsMessageLoop.cpp +++ b/ipc/glue/WindowsMessageLoop.cpp @@ -78,7 +78,7 @@ extern const wchar_t* kPropNameTabContent; // widget related message id constants we need to defer namespace mozilla { namespace widget { -extern UINT sAppShellGoannaMsgId; +extern UINT sAppShellGeckoMsgId; } } @@ -410,7 +410,7 @@ ProcessOrDeferMessage(HWND hwnd, default: { // Unknown messages only are logged in debug builds and sent to // DefWindowProc. - if (uMsg && uMsg == mozilla::widget::sAppShellGoannaMsgId) { + if (uMsg && uMsg == mozilla::widget::sAppShellGeckoMsgId) { // Widget's registered native event callback deferred = new DeferredSendMessage(hwnd, uMsg, wParam, lParam); } @@ -484,7 +484,7 @@ WindowIsDeferredWindow(HWND hWnd) // Common mozilla windows we must defer messages to. nsDependentString className(buffer, length); if (StringBeginsWith(className, NS_LITERAL_STRING("Mozilla")) || - StringBeginsWith(className, NS_LITERAL_STRING("Goanna")) || + StringBeginsWith(className, NS_LITERAL_STRING("Gecko")) || className.EqualsLiteral("nsToolkitClass") || className.EqualsLiteral("nsAppShell:EventWindowClass")) { return true; @@ -763,9 +763,9 @@ MessageChannel::SyncStackFrame::~SyncStackFrame() MessageChannel::SyncStackFrame* MessageChannel::sStaticTopFrame; -// nsAppShell's notification that goanna events are being processed. +// nsAppShell's notification that gecko events are being processed. // If we are here and there is an Interrupt Incall active, we are spinning -// a nested goanna event loop. In which case the remote process needs +// a nested gecko event loop. In which case the remote process needs // to know about it. void /* static */ MessageChannel::NotifyGeckoEventDispatch() diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py index 485d2312e8..e4013dc13e 100644 --- a/ipc/ipdl/ipdl/lower.py +++ b/ipc/ipdl/ipdl/lower.py @@ -1922,7 +1922,7 @@ def _generateMessageClass(clsname, msgid, priority, prettyName, compress): StmtExpr(ExprCall( ExprVar('__android_log_write'), args=[ ExprVar('ANDROID_LOG_INFO'), - ExprLiteral.String('GoannaIPC'), + ExprLiteral.String('GeckoIPC'), ExprCall(ExprSelect(msgvar, '.', 'c_str')) ])), CppDirective('endif') ]) diff --git a/ipc/ipdl/test/cxx/app/moz.build b/ipc/ipdl/test/cxx/app/moz.build index 9d2caba634..72091b73e4 100644 --- a/ipc/ipdl/test/cxx/app/moz.build +++ b/ipc/ipdl/test/cxx/app/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -GoannaProgram('ipdlunittest', linkage='dependent') +GeckoProgram('ipdlunittest', linkage='dependent') SOURCES += [ 'TestIPDL.cpp', diff --git a/ipc/unixsocket/SocketBase.h b/ipc/unixsocket/SocketBase.h index 34c824ad6d..97ef262fa1 100644 --- a/ipc/unixsocket/SocketBase.h +++ b/ipc/unixsocket/SocketBase.h @@ -15,7 +15,7 @@ #include "nsThreadUtils.h" #ifdef MOZ_TASK_TRACER -#include "GoannaTaskTracer.h" +#include "GeckoTaskTracer.h" using namespace mozilla::tasktracer; #endif diff --git a/js/ipc/JavaScriptShared.cpp b/js/ipc/JavaScriptShared.cpp index 967e6ecf49..ba5b9e7822 100644 --- a/js/ipc/JavaScriptShared.cpp +++ b/js/ipc/JavaScriptShared.cpp @@ -234,7 +234,7 @@ JavaScriptShared::incref() } bool -JavaScriptShared::convertIdToGoannaString(JSContext* cx, JS::HandleId id, nsString* to) +JavaScriptShared::convertIdToGeckoString(JSContext* cx, JS::HandleId id, nsString* to) { RootedValue idval(cx); if (!JS_IdToValue(cx, id, &idval)) @@ -248,7 +248,7 @@ JavaScriptShared::convertIdToGoannaString(JSContext* cx, JS::HandleId id, nsStri } bool -JavaScriptShared::convertGoannaStringToId(JSContext* cx, const nsString& from, JS::MutableHandleId to) +JavaScriptShared::convertGeckoStringToId(JSContext* cx, const nsString& from, JS::MutableHandleId to) { RootedString str(cx, JS_NewUCStringCopyN(cx, from.BeginReading(), from.Length())); if (!str) @@ -434,7 +434,7 @@ JavaScriptShared::fromJSIDVariant(JSContext* cx, const JSIDVariant& from, Mutabl } case JSIDVariant::TnsString: - return convertGoannaStringToId(cx, from.get_nsString(), to); + return convertGeckoStringToId(cx, from.get_nsString(), to); case JSIDVariant::Tint32_t: to.set(INT_TO_JSID(from.get_int32_t())); @@ -744,7 +744,7 @@ JavaScriptShared::Wrap(JSContext* cx, HandleObject aObj, InfallibleTArray35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('if(V z=="1k"){(B(){if(V D["1o"]=="1k"){D.1o={}}if((!D["1z"])||(!1z["ca"])){D.1z={}}A cn=["rA","rz","1K","ry","rx","9f","rw","rv","ru","rt","rs","rr","rq","ro","rn","rm"];A i=0,24;1s(24=cn[i++]){if(!1z[24]){1z[24]=B(){}}}if(V D["z"]=="1k"){D.z={}}z.1W=D;A d3={im:U,rl:U,rk:"",rj:"",ri:"",rh:K,rg:U};R(A 8z in d3){if(V 1o[8z]=="1k"){1o[8z]=d3[8z]}}A jK=["rf","rd","rc","rb"];A t;1s(t=jK.3a()){z["is"+t]=U}})();z.8h=1o.8h;z.cY={jJ:0,jI:9,jH:0,jG:"",jF:2V("$ra: r9 $".1f(/[0-9]+/)[0]),2i:B(){4G(z.cY){C jJ+"."+jI+"."+jH+jG+" ("+jF+")"}}};z.d1=B(jE,jD,1V){A 2h=1V||z.1W;R(A i=0,p;2h&&(p=jE[i]);i++){2h=(p in 2h?2h[p]:(jD?2h[p]={}:1k))}C 2h};z.88=B(jC,jA,jB){A d2=jC.1A("."),p=d2.8q(),M=z.d1(d2,K,jB);C(M&&p?(M[p]=jA):1k)};z.6q=B(jz,jy,jx){C z.d1(jz.1A("."),jy,jx)};z.r8=B(jw,M){C!!z.6q(jw,U,M)};z["3u"]=B(d0){C z.1W.3u?z.1W.3u(d0):3u(d0)};z.ia=B(jv,cZ,cX){A 8y="r7: "+jv;if(cZ){8y+=" "+cZ}if(cX){8y+=" -- r6 be r5 in cY: "+cX}1z.1K(8y)};z.r4=B(ju,cW){A cV="r3: "+ju+" -- r2 r1 4F r0 qZ qY.";if(cW){cV+=" "+cW}1z.1K(cV)};(B(){A cR={53:{},6p:0,1h:{},8k:{z:{1p:"z",1Z:"."},cU:{1p:"cU",1Z:"../qX/cU"},cT:{1p:"cT",1Z:"cT"}},cN:B(cS){A mp=D.8k;C jp(mp[cS]&&mp[cS].1Z)},jk:B(8x){A mp=D.8k;if(D.cN(8x)){C mp[8x].1Z}C 8x},8v:[],6t:U,56:[],8t:[],8u:U};R(A cQ in cR){z[cQ]=cR[cQ]}})();z.jg=B(8w,cP,cb){A 1g=(((8w.2s(0)=="/"||8w.1f(/^\\w+:/)))?"":D.51)+8w;if(1o.jt&&z.c8){1g+="?"+67(1o.jt).2f(/\\W+/g,"")}1u{C!cP?D.cO(1g,cb):D.jq(1g,cP,cb)}1y(e){1z.1K(e);C U}};z.cO=B(1g,cb){if(D.8v[1g]){C K}A 6u=D.iR(1g,K);if(!6u){C U}D.8v[1g]=K;D.8v.Y(1g);if(cb){6u="("+6u+")"}A jr=z["3u"](6u+"\\r\\n//@ qW="+1g);if(cb){cb(jr)}C K};z.jq=B(1g,jo,cb){A ok=U;1u{ok=D.cO(1g,cb)}1y(e){1z.1K("qV je ",1g," 4G 9f: ",e)}C jp(ok&&D.53[jo])};z.6m=B(){D.8u=K;D.6t=K;A 57=D.56;D.56=[];R(A x=0;x<57.G;x++){57[x]()}D.8u=U;if(z.6t&&z.6p==0&&D.56.G>0){z.8s()}};z.ck=B(){A 57=D.8t;1s(57.G){(57.8q())()}};z.qU=B(M,jn){A d=z;if(P.G==1){d.56.Y(M)}I{if(P.G>1){d.56.Y(B(){M[jn]()})}}if(d.6t&&d.6p==0&&!d.8u){d.8s()}};z.dW=B(M,jm){A d=z;if(P.G==1){d.8t.Y(M)}I{if(P.G>1){d.8t.Y(B(){M[jm]()})}}};z.iM=B(){if(D.6t){C}if(D.6p>0){1z.1K("qT qS in qR!");C}z.8s()};z.8s=B(){if(V 5c=="8b"||(1o["qQ"]&&z.2M)){5c("z.6m();",0)}I{z.6m()}};z.cF=B(jl){A 4v=jl.1A(".");R(A i=4v.G;i>0;i--){A 8r=4v.2w(0,i).22(".");if((i==1)&&!D.cN(8r)){4v[0]="../"+4v[0]}I{A cM=D.jk(8r);if(cM!=8r){4v.3S(0,i,cM);3f}}}C 4v};z.jj=U;z.8m=B(2T,qP,55){55=D.jj||55;A 54=D.53[2T];if(54){C 54}A cL=2T.1A(".");A 3L=D.cF(2T);A jh=((3L[0].2s(0)!="/")&&!3L[0].1f(/^\\w+:/));A ji=3L[3L.G-1];A 3m;if(ji=="*"){2T=cL.2w(0,-1).22(".");3L.8q();3m=3L.22("/")+"/"+(1o["qO"]||"qN")+".js";if(jh&&3m.2s(0)=="/"){3m=3m.2w(1)}}I{3m=3L.22("/")+".js";2T=cL.22(".")}A jf=(!55)?2T:L;A ok=D.jg(3m,jf);if((!ok)&&(!55)){2m S 1O("qM 3O 4E \'"+2T+"\'; 72 qL \'"+3m+"\'")}if((!55)&&(!D["qK"])){54=D.53[2T];if(!54){2m S 1O("qJ \'"+2T+"\' is 3O qI a8 je \'"+3m+"\'")}}C 54};z.8c=z.8m;z.1Q=B(cK){A cJ=cK+"";A 8p=cJ;A 6s=cK.1A(/\\./);if(6s[6s.G-1]=="*"){6s.8q();8p=6s.22(".")}A 8o=z.6q(8p,K);D.53[cJ]=8o;D.53[8p]=8o;C 8o};z.qH=B(8n){A jd=8n["qG"]||[];A cI=jd.3U(8n[z.j4]||8n["aY"]||[]);R(A x=0;x0&&!(j==1&&1X[0]=="")&&1X[j]==".."&&1X[j-1]!=".."){if(j==(1X.G-1)){1X.3S(j,1);1X[j-1]=""}I{1X.3S(j-1,2);j-=2}}}}1t.28=1X.22("/")}}}}1g="";if(1t.4t){1g+=1t.4t+":"}if(1t.3l){1g+="//"+1t.3l}1g+=1t.28;if(1t.1r){1g+="?"+1t.1r}if(1t.52){1g+="#"+1t.52}}D.1g=1g.2i();A r=D.1g.1f(j7);D.4t=r[2]||(r[1]?"":n);D.3l=r[4]||(r[3]?"":n);D.28=r[5];D.1r=r[7]||(r[6]?"":n);D.52=r[9]||(r[8]?"":n);if(D.3l!=n){r=D.3l.1f(j6);D.8X=r[3]||n;D.8W=r[4]||n;D.qw=r[5];D.qv=r[7]||n}};z.4r.1C.2i=B(){C D.1g}})();z.qu=B(j5,2E){A 2B=z.cF(j5).22("/");if(!2B){C L}if(2B.31("/")!=2B.G-1){2B+="/"}A cE=2B.T(":");if(2B.2s(0)!="/"&&(cE==-1||cE>2B.T("/"))){2B=z.51+2B}C S z.4r(2B,2E)};if(V 26!="1k"){z.c8=K;z.j4="qt";(B(){A d=z;if(1q&&1q.4I){A 8j=1q.4I("ak");A j3=/z(\\.qs)?\\.js([\\?\\.]|$)/i;R(A i=0;i<8j.G;i++){A 4X=8j[i].5t("4X");if(!4X){6c}A m=4X.1f(j3);if(m){if(!1o["51"]){1o["51"]=4X.21(0,m.hK)}A cD=8j[i].5t("1o");if(cD){A cC=3u("({ "+cD+" })");R(A x in cC){1o[x]=cC[x]}}3f}}}d.51=1o["51"];A n=cq;A 8i=n.iL;A 4Z=n.qr;A 6r=2k(4Z);d.2M=(8i.T("qq")>=0)?6r:0;d.6B=(4Z.T("qo")>=0)||(4Z.T("j2")>=0)?6r:0;d.3o=(4Z.T("j2")>=0)?6r:0;A j1=8i.T("qn");d.gu=d.7B=((j1>=0)&&(!d.6B))?6r:0;d.j0=0;d.1l=0;d.iV=0;1u{if(d.7B){d.j0=2k(8i.1A("qm/")[1].1A(" ")[0])}if((1q.gx)&&(!d.2M)){d.1l=2k(4Z.1A("qk ")[1].1A(";")[0])}}1y(e){}if(z.1l&&(26.8f.cu==="9q:")){1o.iT=K}d.iX=B(){A 2A;A qj;A cB=d.6q("cz.cy");if(cB){C cB}if(V iZ!="1k"){2A=S iZ()}I{if(d.1l){1u{2A=S 9j("qi.qh")}1y(e){}}I{if(cq.qg["8Z/x-iY"]){2A=1q.a9("8b");2A.cA("Z","8Z/x-iY");2A.cA("3n",0);2A.cA("58",0);2A.1c.gq="7C";1q.5K.4c(2A)}}}if(!2A){C L}z.88("cz.cy.qf",2A);C z.6q("cz.cy")};A iW=d.iX();if(iW){d.iV=K}A cm=1q["aX"];d.qe=(cm=="aW")||(cm=="gr")||(d.1l<6);d.8h=1o.8h||(d.1l?n.qd:n.qc).1M();d.qb=1z.1K;d.cx=["iU.8g","em.8g","iU.8g.4.0"];d.9b=B(){A 4s=L;A cv=L;if(!z.1l||!1o.iT){1u{4s=S qa()}1y(e){}}if(!4s){R(A i=0;i<3;++i){A cw=z.cx[i];1u{4s=S 9j(cw)}1y(e){cv=e}if(4s){z.cx=[cw];3f}}}if(!4s){2m S 1O("8g 3O q9: "+cv)}C 4s};d.8Y=B(iS){A 4Y=iS.3N||0;C((4Y>=q8)&&(4Y0);d.iR=B(1g,iP){A 3K=D.9b();if(!iQ&&z.4r){1g=(S z.4r(26.8f,1g)).2i()}3K.dL("dD",1g,U);1u{3K.dI(L);if(!d.8Y(3K)){A 1G=1O("q2 4F 4E "+1g+" 3N:"+3K.3N);1G.3N=3K.3N;1G.2G=3K.2G;2m 1G}}1y(e){if(iP){C L}2m e}C 3K.2G}})();z.iO=U;z.6o=B(e){z.iO=K;A cr=(e&&e.Z)?e.Z.1M():"4E";if(P.2O.iN||(cr!="q1"&&cr!="4E")){C}P.2O.iN=K;if(V z["8e"]!="1k"){dX(z.8e);63 z.8e}if(z.6p==0){z.iM()}};if(1q.66){if(z.2M||(z.7B&&(1o["q0"]===K))){1q.66("pZ",z.6o,L)}26.66("4E",z.6o,L)}if(/(pY|pX)/i.6Z(cq.iL)){z.8e=dN(B(){if(/6m|iJ/.6Z(1q.6F)){z.6o()}},10)}(B(){A 3g=26;A 8d=B(cp,fp){A iK=3g[cp]||B(){};3g[cp]=B(){fp.14(3g,P);iK.14(3g,P)}};if(z.1l){1q.fJ(""+"");A co=K;8d("iG",B(){3g.5c(B(){co=U},0)});8d("pU",B(){if(co){z.ck()}});1u{1q.pT.2P("v","pS:pR-pQ-pP:pO");1q.pN().pM("v\\\\:*","pL:2E(#aY#pK)")}1y(e){}}I{8d("iG",B(){z.ck()})}})();z.pJ=B(){};z.1e=26["1q"]||L;z.3E=B(){C z.1e.3E||z.1e.4I("3E")[0]};z.ch=B(iF,iE){z.1W=iF;z.1e=iE};z.cf=B(4q,6n,iD){if((6n)&&((V 4q=="3c")||(4q 1N 67))){4q=6n[4q]}C(6n?4q.14(6n,iD||[]):4q())};z.pI=B(cj,iC,iB,iA){A cg;A iz=z.1W;A iy=z.1e;1u{z.ch(cj,cj.1q);cg=z.cf(iC,iB,iA)}ir{z.ch(iz,iy)}C cg};z.pH=B(ix,iw,iv,iu){A ce;A ip=z.1e;1u{z.1e=ix;ce=z.cf(iw,iv,iu)}ir{z.1e=ip}C ce};if(1o["cd"]){R(A cc in 1o["cd"]){z.io(cc,1o["cd"][cc])}}}if(1o.im){if(!1z.ca){z.8c("z.pG.ca")}}}if(!z.1h["z.X.c9"]){z.1h["z.X.c9"]=K;z.1Q("z.X.c9");z.1R=B(it){C(V it=="3c"||it 1N 67)};z.2l=B(it){C(it&&it 1N 4e||V it=="6a"||((V z["1H"]!="1k")&&(it 1N z.1H)))};if(z.c8&&z.3o){z.1Y=B(it){if((V(it)=="B")&&(it=="[8b 1H]")){C U}C(V it=="B"||it 1N bI)}}I{z.1Y=B(it){C(V it=="B"||it 1N bI)}}z.ib=B(it){if(V it=="1k"){C U}C(it===L||V it=="8b"||z.2l(it)||z.1Y(it))};z.pF=B(it){A d=z;if((!it)||(V it=="1k")){C U}if(d.1R(it)){C U}if(d.1Y(it)){C U}if(d.2l(it)){C K}if((it.5w)&&(it.5w.1M()=="3R")){C U}if(pE(it.G)){C K}C U};z.pD=B(it){if(!it){C U}C!z.1Y(it)&&/\\{\\s*\\[il 5h\\]\\s*\\}/.6Z(67(it))};z.c7=B(M,4W){A 8a={};R(A x in 4W){if((V 8a[x]=="1k")||(8a[x]!=4W[x])){M[x]=4W[x]}}if(z.1l){A p=4W.2i;if((V(p)=="B")&&(p!=M.2i)&&(p!=8a.2i)&&(p!="\\pC 2i() {\\n [il 5h]\\n}\\n")){M.2i=4W.2i}}C M};z.1x=B(M,pB){R(A i=1,l=P.G;i2){C z.ig.14(z,P)}if(!3k){3k=2z;2z=L}if(z.1R(3k)){2z=2z||z.1W;if(!2z[3k]){2m(["z.2p: ie[\\"",3k,"\\"] is L (ie=\\"",2z,"\\")"].22(""))}C B(){C 2z[3k].14(2z,P||[])}}I{C(!2z?3k:B(){C 3k.14(2z,P||[])})}};z.6j=B(M,c3){B c4(){};c4.1C=M;A c2=S c4();if(c3){z.1x(c2,c3)}C c2};z.7X=B(pz){A Q=[L];C z.2p.14(z,Q.3U(z.4d(P)))};z.4d=B(M,ic){A Q=[];R(A x=ic||0;x3)){z.ia("z.2r: R 9P \'"+6l+"\' py pw B as \'1P\' pv pu of as a pt i3.","","1.0");A c=3j;3j=P[3]||{};3j.1P=c}A dd=P.2O,4V=L;if(z.2l(4p)){4V=4p;4p=4V.3a()}if(4V){R(A i=0,m;i<4V.G;i++){m=4V[i];if(!m){2m("ps #"+i+" 4F pr of "+6l+" is L. pq\'s pp a po pl is 3O 6m.")}4p=dd.6j(4p,m)}}A i9=(3j||0).1P,6k=dd.6j(4p),fn;R(A i in 3j){if(z.1Y(fn=3j[i])&&(!0[i])){fn.i4=i}}z.4M(6k,{4o:6l,bY:i9,bZ:L},3j||0);6k.1C.1P=6k;C z.88(6l,6k)};z.1x(z.2r,{6j:B(c0,i8){A bp=(c0||0).1C,mp=(i8||0).1C;A 2S=z.2r.i7();z.1x(2S,{84:bp,1x:mp});if(c0){2S.1C=z.6j(bp)}z.4M(2S,z.2r.i6,mp||0,{bY:L});2S.1C.1P=2S;2S.1C.4o=(bp||0).4o+"pk"+(mp||0).4o;z.88(2S.1C.4o,2S);C 2S},i7:B(){C B(){D.i5(P)}},i6:{i5:B(86){A c=86.2O,s=c.84,ct=s&&s.1P,m=c.1x,87=m&&m.1P,a=86,ii,fn;if(a[0]){if((fn=a[0]["bZ"])){a=fn.14(D,a)||a}}if(fn=c.1C.bZ){a=fn.14(D,a)||a}if(ct&&ct.14){ct.14(D,a)}if(87&&87.14){87.14(D,a)}if(ii=c.1C.bY){ii.14(D,86)}},bX:B(85){A c=D.1P,p,m;1s(c){p=c.84;m=c.1x;if(m==85||(m 1N 85.1P)){C p}if(m&&(m=m.bX(85))){C m}c=p&&p.1P}},6h:B(83,82,bW,6i){A p=bW,c,m,f;do{c=p.1P;m=c.1x;if(m&&(m=D.6h(83,82,m,6i))){C m}if((f=p[83])&&(6i==(f==82))){C p}p=c.84}1s(p);C!6i&&(p=D.bX(bW))&&D.6h(83,82,p,6i)},bU:B(2R,4U,bV){A a=P;if(!z.1R(a[0])){bV=4U;4U=2R;2R=4U.2O.i4}A c=4U.2O,p=D.1P.1C,a=bV||4U,fn,mp;if(D[2R]!=c||p[2R]==c){mp=D.6h(2R,c,p,K);if(!mp){2m(D.4o+": 1p i3 (\\""+2R+"\\") 4F bU pj 1f 2O (2r.js)")}p=D.6h(2R,c,mp,U)}fn=p&&p[2R];if(!fn){1z.1K(mp.4o+": no bU \\""+2R+"\\" ph pg (2r.js)");C}C fn.14(D,a)}}})}if(!z.1h["z.X.2c"]){z.1h["z.X.2c"]=K;z.1Q("z.X.2c");z.3i={i2:B(){C B(){A ap=4e.1C,c=P.2O,ls=c.2b,t=c.5V;A r=t&&t.14(D,P);R(A i in ls){if(!(i in ap)){ls[i].14(D,P)}}C r}},2P:B(6g,bT,i1){6g=6g||z.1W;A f=6g[bT];if(!f||!f.2b){A d=z.3i.i2();d.5V=f;d.2b=[];f=6g[bT]=d}C f.2b.Y(i1)},3J:B(i0,hZ,bS){A f=(i0||z.1W)[hZ];if(f&&f.2b&&bS--){63 f.2b[bS]}}};z.2c=B(M,pd,pc,pa,p9){A a=P,F=[],i=0;F.Y(z.1R(a[0])?L:a[i++],a[i++]);A a1=a[i+1];F.Y(z.1R(a1)||z.1Y(a1)?a[i++]:L,a[i++]);R(A l=a.G;i2){6e=z.7X(6e,P,2)}C D.5k(6e,6e)},ef:B(cb,4T){A 7Y=z.2p(cb,4T);if(P.G>2){7Y=z.7X(7Y,P,2)}C D.5k(7Y,L)},ed:B(cb,4T){A 7W=z.2p(cb,4T);if(P.G>2){7W=z.7X(7W,P,2)}C D.5k(L,7W)},5k:B(cb,eb){D.bM.Y([cb,eb]);if(D.2y>=0){D.7U()}C D},7U:B(){A bL=D.bM;A 4n=D.2y;A 1v=D.4R[4n];A 4S=D;A cb=L;1s((bL.G>0)&&(D.3M==0)){A f=bL.3a()[4n];if(!f){6c}1u{1v=f(1v);4n=((1v 1N 1O)?1:0);if(1v 1N z.30){cb=B(1v){4S.7V(1v);4S.3M--;if((4S.3M==0)&&(4S.2y>=0)){4S.7U()}};D.3M++}}1y(1G){1z.1K(1G);4n=1;1v=1G}}D.2y=4n;D.4R[4n]=1v;if((cb)&&(D.3M)){1v.9e(cb)}}})}if(!z.1h["z.X.2e"]){z.1h["z.X.2e"]=K;z.1Q("z.X.2e");z.5m=B(2e){1u{C 3u("("+2e+")")}1y(e){1z.1K(e);C 2e}};z.bK=B(2H){C("\\""+2H.2f(/(["\\\\])/g,"\\\\$1")+"\\"").2f(/[\\f]/g,"\\\\f").2f(/[\\b]/g,"\\\\b").2f(/[\\n]/g,"\\\\n").2f(/[\\t]/g,"\\\\t").2f(/[\\r]/g,"\\\\r")};z.hM="\\t";z.eq=B(it,4l,4P){4P=4P||"";A 4k=(4l?4P+z.hM:"");A 6b=(4l?"\\n":"");A 4Q=V(it);if(4Q=="1k"){C"1k"}I{if((4Q=="4J")||(4Q=="p1")){C it+""}I{if(it===L){C"L"}}}if(4Q=="3c"){C z.bK(it)}A 6d=P.2O;A 4m;if(V it.hL=="B"){4m=it.hL();if(it!==4m){C 6d(4m,4l,4k)}}if(V it.2e=="B"){4m=it.2e();if(it!==4m){C 6d(4m,4l,4k)}}if(z.2l(it)){A 1v=[];R(A i=0;i>=7R;t[x]=7R==4?17*c:c});t.a=1;C t};z.7P=B(a,M){A t=M||S z.1J();t.bz(2V(a[0]),2V(a[1]),2V(a[2]),2V(a[3]));if(2L(t.a)){t.a=1}C t.7Q()};z.hq=B(2H,M){A a=z.1J.hp[2H];C a&&z.7P(a,M)||z.ho(2H,M)||z.hn(2H,M)}}if(!z.1h["z.X"]){z.1h["z.X"]=K;z.1Q("z.X")}if(!z.1h["z.X.5Z"]){z.1h["z.X.5Z"]=K;z.1Q("z.X.5Z");(B(){A 1j=z.b2={2P:B(E,68,fp){if(!E){C}68=1j.4O(68);fp=1j.7G(68,fp);E.66(68,fp,U);C fp},3J:B(E,hm,hl){(E)&&(E.oF(1j.4O(hm),hl,U))},4O:B(1p){C(1p.2w(0,2)=="on"?1p.2w(2):1p)},7G:B(1p,fp){C(1p!="4b"?fp:B(e){C fp.2d(D,1j.4i(e,D))})},4i:B(H,oE){4w(H.Z){2X"4b":1j.7K(H);3f}C H},7K:B(H){H.oD=(H.3h?67.oC(H.3h):"")}};z.oB=B(H,hk){C 1j.4i(H,hk)};z.gY=B(H){H.7J();H.7I()};A 7O=z.3i;z.by=B(M,bx,hh,hg,hi){A hj=M&&(M.2t||M.oA||M.66);A bw=!hj?0:(!hi?1:2),l=[z.3i,1j,7O][bw];A h=l.2P(M,bx,z.2p(hh,hg));C[M,bx,h,bw]};z.bv=B(M,he,hd,hf){([z.3i,1j,7O][hf]).3J(M,he,hd)};z.5W={oz:8,gV:9,oy:12,ox:13,ow:16,ov:17,ou:18,gG:19,ot:20,os:27,or:32,b5:33,b4:34,gE:35,gF:36,b7:37,b9:38,b6:39,b8:40,gD:45,8S:46,oq:47,oo:91,om:92,ol:93,oj:96,oi:97,oh:98,og:99,oe:6D,od:oc,ob:oa,o9:o8,o7:o6,o5:o4,o3:bi,o2:o1,o0:nZ,nY:nX,nW:nV,nU:bk,gS:nT,gR:nS,gQ:nR,gP:nQ,gO:nP,gN:nO,gM:nN,gL:nM,gK:nL,gJ:nK,gI:nJ,gH:nI,nH:nG,nF:nE,nD:nC,gB:nB,gC:nA};if(z.1l){bf=B(e,5h){1u{C(e.3I=5h)}1y(e){C 0}};A 61=z.3i;if(!1o.nz){7O=61=z.gy={b3:[],2P:B(64,bu,hc){64=64||z.1W;A f=64[bu];if(!f||!f.2b){A d=z.gz();d.5V=f&&(7M.Y(f)-1);d.2b=[];f=64[bu]=d}C f.2b.Y(7M.Y(hc)-1)},3J:B(hb,ha,7N){A f=(hb||z.1W)[ha],l=f&&f.2b;if(f&&l&&7N--){63 7M[l[7N]];63 l[7N]}}};A 7M=61.b3}z.1x(1j,{2P:B(E,62,fp){if(!E){C}62=1j.4O(62);if(62=="h3"){A kd=E.bs;if(!kd||!kd.2b||!kd.h9){1j.2P(E,"bs",1j.h4);E.bs.h9=K}}C 61.2P(E,62,1j.7G(fp))},3J:B(E,h8,h7){61.3J(E,1j.4O(h8),h7)},4O:B(7L){C(7L.2w(0,2)!="on"?"on"+7L:7L)},ny:B(){},4i:B(H,4N){if(!H){A w=(4N)&&((4N.aD||4N.1q||4N).nx)||26;H=w.5Z}if(!H){C(H)}H.5V=H.br;H.bh=(4N||H.br);H.nw=H.nv;H.nu=H.nr;A bq=H.br,1e=(bq&&bq.aD)||1q;A bn=((z.1l<6)||(1e["aX"]=="aW"))?1e.3E:1e.5K;A bm=z.aB();H.nq=H.np+z.aH(bn.5I||0)-bm.x;H.nn=H.nm+(bn.5G||0)-bm.y;if(H.Z=="fk"){H.h6=H.nl}if(H.Z=="fj"){H.h6=H.nk}H.7I=1j.bc;H.7J=1j.ba;C 1j.h5(H)},h5:B(H){4w(H.Z){2X"4b":A c=("3h"in H?H.3h:H.3I);if(c==10){c=0;H.3I=13}I{if(c==13||c==27){c=0}I{if(c==3){c=99}}}H.3h=c;1j.7K(H);3f}C H},gZ:{bi:42,bk:47,h2:59,nj:43,ni:44,nh:45,ng:46,nf:47,60:96,h1:91,nb:92,na:93,h0:39},h4:B(H){A kp=H.bh.h3;if(!kp||!kp.2b){C}A k=H.3I;A bj=(k!=13)&&(k!=32)&&(k!=27)&&(k<48||k>90)&&(k<96||k>bk)&&(k60)&&(kh0);if(bj||H.5Y){A c=(bj?0:k);if(H.5Y){if(k==3||k==13){C}I{if(c>95&&c=65&&c<=90)){c+=32}I{c=1j.gZ[c]||c}}}}A 2x=1j.7H(H,{Z:"4b",2x:K,3h:c});kp.2d(H.bh,2x);H.bg=2x.bg;H.bd=2x.bd;bf(H,2x.3I)}},bc:B(){D.bg=K},ba:B(){D.n9=D.3I;if(D.5Y){bf(D,0)}D.bd=U}});z.gY=B(H){H=H||26.5Z;1j.bc.2d(H);1j.ba.2d(H)}}1j.7H=B(H,gX){A 2x=z.1x({},H,gX);1j.7K(2x);2x.7J=B(){H.7J()};2x.7I=B(){H.7I()};C 2x};if(z.2M){z.1x(1j,{4i:B(H,n8){4w(H.Z){2X"4b":A c=H.n7;if(c==3){c=99}c=((c<41)&&(!H.5X)?0:c);if((H.5Y)&&(!H.5X)&&(c>=65)&&(c<=90)){c+=32}C 1j.7H(H,{3h:c})}C H}})}if(z.3o){z.1x(1j,{4i:B(H,n6){4w(H.Z){2X"4b":A c=H.3h,s=H.5X,k=H.3I;k=k||gA[H.gW]||0;if(H.gW=="n5"){c=0}I{if((H.5Y)&&(c>0)&&(c<27)){c+=96}I{if(c==z.5W.gU){c=z.5W.gV;s=K}I{c=(c>=32&&c gh",E).1n(B(i){i.1c.7E=i.1c.7E.2f(/gk:[^;]*;/i,"")})}}I{A o="mh(mg="+(7D*6D)+")";E.1c.3T=o}if(E.gj.1M()=="gi"){z.1r("> gh",E).1n(B(i){i.1c.3T=o})}C 7D}:B(E,gg){C E.1c.2W=gg});A 5Q={3n:K,58:K,2g:K,5J:K};A gd=B(E,Z,5P){Z=Z.1M();if(5Q[Z]===K){C z.4g(E,5P)}I{if(5Q[Z]===U){C 5P}I{if((Z.T("mf")>=0)||(Z.T("md")>=0)||(Z.T("3n")>=0)||(Z.T("58")>=0)||(Z.T("5q")>=0)||(Z.T("mc")>=0)||(Z.T("ma")>=0)){5Q[Z]=K;C z.4g(E,5P)}I{5Q[Z]=U;C 5P}}}};z.1c=B(E,5O,aT){A n=z.1D(E),F=P.G,op=(5O=="2W");if(F==3){C op?z.gf(n,aT):n.1c[5O]=aT}if(F==2&&op){C z.ge(n)}A s=z.3F(n);C(F==1)?s:gd(n,5O,s[5O])};z.7A=B(n,gc){A s=gc||1E(n),px=z.4g,l=px(n,s.m9),t=px(n,s.m8);C{l:l,t:t,w:l+px(n,s.m7),h:t+px(n,s.m6)}};z.5N=B(n,gb){A ne="7C",px=z.4g,s=gb||1E(n),bl=(s.m5!=ne?px(n,s.m4):0),bt=(s.m3!=ne?px(n,s.m2):0);C{l:bl,t:bt,w:bl+(s.m1!=ne?px(n,s.m0):0),h:bt+(s.lZ!=ne?px(n,s.lY):0)}};z.aN=B(n,ga){A s=ga||1E(n),p=z.7A(n,s),b=z.5N(n,s);C{l:p.l+b.l,t:p.t+b.t,w:p.w+b.w,h:p.h+b.h}};z.aM=B(n,g9){A s=g9||1E(n),px=z.4g,l=px(n,s.lX),t=px(n,s.lW),r=px(n,s.lV),b=px(n,s.lU);if(z.3o&&(s.ax!="fU")){r=l}C{l:l,t:t,w:l+r,h:t+b}};z.au=B(E,g8){A s=g8||1E(E),me=z.aM(E,s);A l=E.fT-me.l,t=E.fS-me.t;if(z.7B){A aS=2k(s.2g),aR=2k(s.5J);if(!2L(aS)&&!2L(aR)){l=aS,t=aR}I{A p=E.1L;if(p&&p.1c){A aQ=1E(p);if(aQ.lT!="lS"){A be=z.5N(p,aQ);l+=be.l,t+=be.t}}}}I{if(z.2M){A p=E.1L;if(p){A be=z.5N(p);l-=be.l,t-=be.t}}}C{l:l,t:t,w:E.6v+me.w,h:E.8D+me.h}};z.aK=B(E,g7){A s=g7||1E(E),pe=z.7A(E,s),be=z.5N(E,s),w=E.aF,h;if(!w){w=E.6v,h=E.8D}I{h=E.lR,be.w=be.h=0}if(z.2M){pe.l+=be.l;pe.t+=be.t}C{l:pe.l,t:pe.t,w:w-pe.w-be.w,h:h-pe.h-be.h}};z.lQ=B(E,g6){A s=g6||1E(E),pe=z.7A(E,s),cb=z.aK(E,s);C{l:cb.l-pe.l,t:cb.t-pe.t,w:cb.w+pe.w,h:cb.h+pe.h}};z.aL=B(E,l,t,w,h,u){u=u||"px";4G(E.1c){if(!2L(l)){2g=l+u}if(!2L(t)){5J=t+u}if(w>=0){3n=w+u}if(h>=0){58=h+u}}};z.aO=B(E){A n=E.5w;C(z.aP=="g5-3G")||(n=="lP")||(n=="lO")};z.fX=B(E,7z,7y,g4){A bb=z.aO(E);if(bb){A pb=z.aN(E,g4);if(7z>=0){7z+=pb.w}if(7y>=0){7y+=pb.h}}z.aL(E,g3,g3,7z,7y)};z.fY=B(E,g1,g0,5M,5L,g2){A s=g2||z.3F(E);A bb=z.aO(E),pb=bb?fZ:z.aN(E,s),mb=z.aM(E,s);if(5M>=0){5M=2Y.5q(5M-pb.w-mb.w,0)}if(5L>=0){5L=2Y.5q(5L-pb.h-mb.h,0)}z.aL(E,g1,g0,5M,5L)};A fZ={l:0,t:0,w:0,h:0};z.lN=B(E,3G){A n=z.1D(E),s=1E(n),b=3G;C!b?z.au(n,s):z.fY(n,b.l,b.t,b.w,b.h,s)};z.lM=B(E,3G){A n=z.1D(E),s=1E(n),b=3G;C!b?z.aK(n,s):z.fX(n,b.w,b.h,s)};A 5H=B(E,1a){if(!(E=(E||0).1L)){C 0}A 1U,aJ=0,2h=z.3E();1s(E&&E.1c){if(1E(E).ax=="lL"){C 0}1U=E[1a];if(1U){aJ+=1U-0;if(E==2h){3f}}E=E.1L}C aJ};z.fQ=B(){A 2h=z.3E();A 3g=z.1W;A de=z.1e.5K;C{y:(3g.lK||de.5G||2h.5G||0),x:(3g.lJ||z.aH(de.5I)||2h.5I||0)}};z.aG=B(){C V z.aI=="1k"?(z.aI=z.3F(z.3E()).lI=="lH"):z.aI};z.aB=B(){A de=z.1e.5K;if(z.1l>=7){C{x:de.aC().2g,y:de.aC().5J}}I{C{x:z.aG()||26.am==26?de.fW:de.6v-de.aF-de.fW,y:de.lG}}};z.aH=B(aE){if(z.1l&&!z.aG()){A de=z.1e.5K;C aE+de.aF-de.lF}C aE};z.fP=B(E,aw){A ay=E.aD;A J={x:0,y:0};A 7w=U;A db=z.3E();if(z.1l){A aA=E.aC();A az=z.aB();J.x=aA.2g-az.x;J.y=aA.5J-az.y}I{if(ay["fV"]){A bo=ay.fV(E);J.x=bo.x-5H(E,"5I");J.y=bo.y-5H(E,"5G")}I{if(E["fR"]){7w=K;A 7x;if(z.3o&&(1E(E).ax=="fU")&&(E.1L==db)){7x=db}I{7x=db.1L}if(E.1L!=db){A nd=E;if(z.2M){nd=db}J.x-=5H(nd,"5I");J.y-=5H(nd,"5G")}A 4f=E;do{A n=4f["fT"];if(!z.2M||n>0){J.x+=2L(n)?0:n}A m=4f["fS"];J.y+=2L(m)?0:m;4f=4f.fR}1s((4f!=7x)&&4f)}I{if(E["x"]&&E["y"]){J.x+=2L(E.x)?0:E.x;J.y+=2L(E.y)?0:E.y}}}}if(7w||aw){A av=z.fQ();A m=7w?(!aw?-1:0):1;J.y+=m*av.y;J.x+=m*av.x}C J};z.af=B(E,fO){A n=z.1D(E),s=1E(n),mb=z.au(n,s);A at=z.fP(n,fO);mb.x=at.x;mb.y=at.y;C mb}})();z.fL=B(E,fN){C((" "+E.3A+" ").T(" "+fN+" ")>=0)};z.7s=B(E,ar){A 7v=E.3A;if((" "+7v+" ").T(" "+ar+" ")<0){E.3A=7v+(7v?" ":"")+ar}};z.7r=B(E,fM){A t=z.7g((" "+E.3A+" ").2f(" "+fM+" "," "));if(E.3A!=t){E.3A=t}};z.lE=B(E,aq,7u){if(V 7u=="1k"){7u=!z.fL(E,aq)}z[7u?"7s":"7r"](E,aq)}}if(!z.1h["z.X.1H"]){z.1h["z.X.1H"]=K;z.1Q("z.X.1H");(B(){A d=z;z.1H=B(){A F=P;if((F.G==1)&&(V F[0]=="4J")){D.G=eK(F[0])}I{if(F.G){d.1n(F,B(i){D.Y(i)},D)}}};z.1H.1C=S 4e;if(d.1l){A fK=B(al){C("A a2 = am."+al+"; "+"A ap = 4e.1C; "+"A ao = a2.1C; "+"R(A x in ao){ ap[x] = ao[x]; } "+"am."+al+" = 4e; ")};A fI=fK("z.1H");A aj=26.lD();aj.1q.fJ(""+fI+"");aj.lC(1,1,1,1)}z.4M(z.1H,{T:B(fH,fG){C d.T(D,fH,fG)},31:B(lB,lA){A aa=d.4d(P);aa.ae(D);C d.31.14(d,aa)},ah:B(fF,fE){C d.ah(D,fF,fE)},ag:B(fD,fC){C d.ag(D,fD,fC)},1n:B(fB,fA){d.1n(D,fB,fA);C D},23:B(7t,M){C d.23(D,7t,M,d.1H)},af:B(){C d.23(D,d.af)},1c:B(lz,ly){A aa=d.4d(P);aa.ae(D[0]);A s=d.1c.14(d,aa);C(P.G>1)?D:s},lx:B(lw,lv){A aa=d.4d(P);aa.ae(L);A s=D.23(B(i){aa[0]=i;C d.1c.14(d,aa)});C(P.G>1)?D:s},7s:B(fz){C D.1n(B(i){z.7s(i,fz)})},7r:B(fy){C D.1n(B(i){z.7r(i,fy)})},5E:B(fw,7q){A 1m=d.1r(fw)[0];7q=7q||"72";R(A x=0;x=0){if(i[x]<1d){1d=i[x]}}}C(1d<0)?ql:1d};A 6X=B(7l){A i=2I(7l);if(i[0]!=-1){C 7l.21(i[0]+1,a0(7l,1))}I{C""}};A 5r=B(7k){A 5D;A i=2I(7k);if((i[0]==0)||(i[1]==0)){5D=0}I{5D=a0(7k,0)}C((5D>0)?7k.3b(0,5D).1M():"*")};A fg=B(Q){A J=-1;R(A x=0;x=0){if((1S>J)||(J==-1)){J=1S}}}C J};A 9H=B(7i){A i=2I(7i);if(-1==i[1]){C""}A di=i[1]+1;A 7j=fg(i.2w(2));if(di<7j){C 7i.21(di,7j)}I{if(-1==7j){C 7i.3b(di)}I{C""}}};A f3=[{1i:"|=",1f:B(15,fe){C"[5z(3U(\' \',@"+15+",\' \'), \' "+fe+"-\')]"}},{1i:"~=",1f:B(15,fd){C"[5z(3U(\' \',@"+15+",\' \'), \' "+fd+" \')]"}},{1i:"^=",1f:B(15,fb){C"[li-4G(@"+15+", \'"+fb+"\')]"}},{1i:"*=",1f:B(15,fa){C"[5z(@"+15+", \'"+fa+"\')]"}},{1i:"$=",1f:B(15,9Z){C"[21(@"+15+", 3c-G(@"+15+")-"+(9Z.G-1)+")=\'"+9Z+"\']"}},{1i:"!=",1f:B(15,f9){C"[3O(@"+15+"=\'"+f9+"\')]"}},{1i:"=",1f:B(15,f8){C"[@"+15+"=\'"+f8+"\']"}}];A 9C=B(9Y,3Z,f7,f6){A 49;A i=2I(3Z);if(i[2]>=0){A 4L=3Z.T("]",i[2]);A 29=3Z.21(i[2]+1,4L);1s(29&&29.G){if(29.2s(0)=="@"){29=29.2w(1)}49=L;R(A x=0;x<9Y.G;x++){A 1S=9Y[x];A 7h=29.T(1S.1i);if(7h>=0){A 15=29.21(0,7h);A 4a=29.21(7h+1S.1i.G);if((4a.2s(0)=="\\"")||(4a.2s(0)=="\'")){4a=4a.21(1,4a.G-1)}49=1S.1f(d.7g(15),d.7g(4a));3f}}if((!49)&&(29.G)){49=f7(29)}if(49){f6(49)}29=L;A 7f=3Z.T("[",4L);if(0<=7f){4L=3Z.T("]",7f);if(0<=4L){29=3Z.21(7f+1,4L)}}}}};A f0=B(f5){A 4K=".";A 7e=f5.1A(" ");1s(7e.G){A 2K=7e.3a();A 7d;if(2K==">"){7d="/";2K=7e.3a()}I{7d="//"}A f4=5r(2K);4K+=7d+f4;A id=6X(2K);if(id.G){4K+="[@id=\'"+id+"\'][1]"}A cn=9H(2K);if(cn.G){A 9X=" ";if(cn.2s(cn.G-1)=="*"){9X="";cn=cn.3b(0,cn.G-1)}4K+="[5z(3U(\' \',@9P,\' \'), \' "+cn+9X+"\')]"}9C(f3,2K,B(f2){C"[@"+f2+"]"},B(f1){4K+=f1})}C 4K};A 7a={};A eC=B(28){if(7a[28]){C 7a[28]}A 1e=d.1e;A 9W=f0(28);A 4H=B(9V){A J=[];A 7b;1u{7b=1e.9x(9W,9V,L,lh.lg,L)}1y(e){1z.1K("lf in le:",9W,"lc:",9V);1z.1K(e)}A 7c=7b.eZ();1s(7c){J.Y(7c);7c=7b.eZ()}C J};C 7a[28]=4H};A 5x={};A 9B={};A 3y=B(79,78){if(!79){C 78}if(!78){C 79}C B(){C 79.14(26,P)&&78.14(26,P)}};A 75=B(9U,3Y,5B,2J){A 2v=2J+1;A 76=(3Y.G==2v);A 2K=3Y[2J];if(2K==">"){A 77=9U.3W;if(!77.G){C}2v++;76=(3Y.G==2v);A 4H=6O(3Y[2J+1]);R(A x=0,11;x<77.G,11=77[x];x++){if(4H(11)){if(76){5B.Y(11)}I{75(11,3Y,5B,2v)}}}}A 5C=6U(2K)(9U);if(76){1s(5C.G){5B.Y(5C.3a())}}I{1s(5C.G){75(5C.3a(),3Y,5B,2v)}}};A eE=B(9T,eY){A J=[];A x=9T.G-1,11;1s(11=9T[x--]){75(11,eY,J,0)}C J};A 6O=B(3D){if(5x[3D]){C 5x[3D]}A ff=L;A 9S=5r(3D);if(9S!="*"){ff=3y(ff,B(N){C((N.2t==1)&&(9S==N.5w.1M()))})}A 9R=6X(3D);if(9R.G){ff=3y(ff,B(N){C((N.2t==1)&&(N.id==9R))})}if(2Y.5q.14(D,2I(3D).2w(1))>=0){ff=3y(ff,9z(3D))}C 5x[3D]=ff};A 5y=B(E){A pn=E.1L;A 9Q=pn.3W;A 2v=-1;A 3C=pn.5A;if(!3C){C 2v}A ci=E["eW"];A cl=pn["eX"];if(((V cl=="4J")&&(cl!=9Q.G))||(V ci!="4J")){pn["eX"]=9Q.G;A 2J=1;do{if(3C===E){2v=2J}if(3C.2t==1){3C["eW"]=2J;2J++}3C=3C.71}1s(3C)}I{2v=ci}C 2v};A lb=0;A 3X=B(N,15){A 74="";if(15=="9P"){C N.3A||74}if(15=="R"){C N.la||74}C N.5t(15,2)||74};A eH=[{1i:"|=",1f:B(15,9O){A eV=" "+9O+"-";C B(N){A ea=" "+(N.5t(15,2)||"");C((ea==9O)||(ea.T(eV)==0))}}},{1i:"^=",1f:B(15,eU){C B(N){C(3X(N,15).T(eU)==0)}}},{1i:"*=",1f:B(15,eT){C B(N){C(3X(N,15).T(eT)>=0)}}},{1i:"~=",1f:B(15,eS){A 9N=" "+eS+" ";C B(N){A ea=" "+3X(N,15)+" ";C(ea.T(9N)>=0)}}},{1i:"$=",1f:B(15,73){A 9N=" "+73;C B(N){A ea=" "+3X(N,15);C(ea.31(73)==(ea.G-73.G))}}},{1i:"!=",1f:B(15,eR){C B(N){C(3X(N,15)!=eR)}}},{1i:"=",1f:B(15,eQ){C B(N){C(3X(N,15)==eQ)}}}];A 9E=[{1i:"9M-9K",1f:B(1p,l9){C B(N){if(N.2t!=1){C U}A fc=N.eP;1s(fc&&(fc.2t!=1)){fc=fc.eP}C(!fc)}}},{1i:"72-9K",1f:B(1p,l8){C B(N){if(N.2t!=1){C U}A nc=N.71;1s(nc&&(nc.2t!=1)){nc=nc.71}C(!nc)}}},{1i:"l7",1f:B(1p,l6){C B(N){A cn=N.3W;A eO=N.3W.G;R(A x=eO-1;x>=0;x--){A nt=cn[x].2t;if((nt==1)||(nt==3)){C U}}C K}}},{1i:"5z",1f:B(1p,eN){C B(N){C(N.9L.T(eN)>=0)}}},{1i:"3O",1f:B(1p,eM){A eL=6O(eM);C B(N){C(!eL(N))}}},{1i:"l5-9K",1f:B(1p,2u){A pi=eK;if(2u=="l4"){C B(N){C(((5y(N))%2)==1)}}I{if((2u=="2n")||(2u=="l3")){C B(N){C((5y(N)%2)==0)}}I{if(2u.T("l2+")==0){A 70=pi(2u.3b(3));C B(N){C(N.1L.3W[70-1]===N)}}I{if((2u.T("n+")>0)&&(2u.G>3)){A 9J=2u.1A("n+",2);A eJ=pi(9J[0]);A 2J=pi(9J[1]);C B(N){C((5y(N)%eJ)==2J)}}I{if(2u.T("n")==-1){A 70=pi(2u);C B(N){C(5y(N)==70)}}}}}}}}];A 9z=B(3e){A 9I=(9B[3e]||5x[3e]);if(9I){C 9I}A ff=L;A i=2I(3e);if(i[0]>=0){A 24=5r(3e);if(24!="*"){ff=3y(ff,B(N){C(N.5w.1M()==24)})}}A 5u;A 3B=9H(3e);if(3B.G){A 9F=3B.2s(3B.G-1)=="*";if(9F){3B=3B.3b(0,3B.G-1)}A re=S 9G("(?:^|\\\\s)"+3B+(9F?".*":"")+"(?:\\\\s|$)");ff=3y(ff,B(N){C re.6Z(N.3A)})}if(i[3]>=0){A 3z=3e.3b(i[3]+1);A 9D="";A 5v=3z.T("(");A 6Y=3z.31(")");if((0<=5v)&&(0<=6Y)&&(6Y>5v)){9D=3z.21(5v+1,6Y);3z=3z.3b(0,5v)}5u=L;R(A x=0;x<9E.G;x++){A 1S=9E[x];if(1S.1i==3z){5u=1S.1f(3z,9D);3f}}if(5u){ff=3y(ff,5u)}}A eG=(d.1l)?B(5s){A eI=5s.1M();C B(N){C N[5s]||N[eI]}}:B(5s){C B(N){C(N&&N.5t&&N.l1(5s))}};9C(eH,3e,eG,B(eF){ff=3y(ff,eF)});if(!ff){ff=B(){C K}}C 9B[3e]=ff};A 6W={};A 6U=B(3d,1B){A 9A=6W[3d];if(9A){C 9A}A i=2I(3d);A id=6X(3d);if(i[0]==0){C 6W[3d]=B(1B){C[d.1D(id)]}}A 9y=9z(3d);A 5p;if(i[0]>=0){5p=B(1B){A 11=d.1D(id);if(9y(11)){C[11]}}}I{A 3V;A 24=5r(3d);if(2Y.5q.14(D,2I(3d))==-1){5p=B(1B){A J=[];A 11,x=0,3V=1B.4I(24);1s(11=3V[x++]){J.Y(11)}C J}}I{5p=B(1B){A J=[];A 11,x=0,3V=1B.4I(24);1s(11=3V[x++]){if(9y(11)){J.Y(11)}}C J}}}C 6W[3d]=5p};A l0={};A 5o={">":B(1B){A J=[];A 11,x=0,3V=1B.3W;1s(11=3V[x++]){if(11.2t==1){J.Y(11)}}C J}};A 9w=B(6V){if(0>6V.T(" ")){C 6U(6V)}A eD=B(1B){A 6S=6V.1A(" ");A 6T;if(6S[0]==">"){6T=[1B]}I{6T=6U(6S.3a())(1B)}C eE(6T,6S)};C eD};A 9v=((1q["9x"]&&!d.3o)?B(3x){A 6R=3x.1A(" ");if((1q["9x"])&&(3x.T(":")==-1)&&((K))){if(((6R.G>2)&&(3x.T(">")==-1))||(6R.G>3)||(3x.T("[")>=0)||((1==6R.G)&&(0<=3x.T(".")))){C eC(3x)}}C 9w(3x)}:9w);A ey=B(3w){if(5o[3w]){C 5o[3w]}if(0>3w.T(",")){C 5o[3w]=9v(3w)}I{A eB=3w.1A(/\\s*,\\s*/);A 4H=B(1B){A eA=0;A J=[];A 6Q;1s(6Q=eB[eA++]){J=J.3U(9v(6Q,6Q.T(" "))(1B))}C J};C 5o[3w]=4H}};A 5n=0;A ez=B(Q){A J=S d.1H();if(!Q){C J}if(Q[0]){J.Y(Q[0])}if(Q.G<2){C J}5n++;Q[0]["9u"]=5n;R(A x=1,11;11=Q[x];x++){if(Q[x]["9u"]!=5n){J.Y(11)}11["9u"]=5n}C J};d.1r=B(6P,1B){if(V 6P!="3c"){C S d.1H(6P)}if(V 1B=="3c"){1B=d.1D(1B)}C ez(ey(6P)(1B||d.1e))};d.9t=B(ex,9s){A 9r=S d.1H();A ff=(9s)?6O(9s):B(){C K};R(A x=0,11;11=ex[x];x++){if(ff(11)){9r.Y(11)}}C 9r}})()}if(!z.1h["z.X.1b"]){z.1h["z.X.1b"]=K;z.1Q("z.X.1b");z.6K=B(ew){A J={};A iq="kZ[Z!=9q][Z!=kY][Z!=et][Z!=kX][Z!=kW], kV, kU";z.1r(iq,ew).3T(B(E){C(!E.kT)}).1n(B(1m){A 3v=1m.1p;A Z=(1m.Z||"").1M();if((Z=="kS")||(Z=="kR")){if(1m.kQ){J[3v]=1m.1Z}}I{if(1m.kP){A ev=J[3v]=[];z.1r("kO[kN]",1m).1n(B(eu){ev.Y(eu.1Z)})}I{J[3v]=1m.1Z;if(Z=="et"){J[3v+".x"]=J[3v+".y"]=J[3v].x=J[3v].y=0}}}});C J};z.9h=B(23){A ec=kM;A J="";A es={};R(A x in 23){if(23[x]!=es[x]){if(z.2l(23[x])){R(A y=0;y<23[x].G;y++){J+=ec(x)+"="+ec(23[x][y])+"&"}}I{J+=ec(x)+"="+ec(23[x])+"&"}}}if((J.G)&&(J.2s(J.G-1)=="&")){J=J.3b(0,J.G-1)}C J};z.kL=B(er){C z.9h(z.6K(er))};z.kK=B(ep){C z.eq(z.6K(ep))};z.kJ=B(2H){A J={};A qp=2H.1A("&");A dc=kI;z.1n(qp,B(1m){if(1m.G){A 9p=1m.1A("=");A 1p=dc(9p.3a());A 1U=dc(9p.22("="));if(z.1R(J[1p])){J[1p]=[J[1p]]}if(z.2l(J[1p])){J[1p].Y(1U)}I{J[1p]=1U}}});C J};z.e1=U;z.e6={"9g":B(1b){C 1b.2G},"2e":B(1b){if(!1o.eo){1z.1K("kH kG kF a kE of 9g/2e-6M-9m"+" 4F kD kC kB kA 4G en kz"+" (ky 1o.eo=K 4F kx kw D kv)")}C z.5m(1b.2G)},"2e-6M-ku":B(1b){A 6N=1b.2G;A 9o=6N.T("/*");A 9n=6N.31("*/");if((9o==-1)||(9n==-1)){C z.5m(1b.2G)}C z.5m(6N.21(9o+2,9n))},"2e-6M-9m":B(1b){A 6L=1b.2G;A 9l=6L.T("/*");A 9k=6L.31("*/");if((9l==-1)||(9k==-1)){1z.1K("kt en ks\'t 6M 9m!");C""}C z.5m(6L.21(9l+2,9k))},"kr":B(1b){C z.3u(1b.2G)},"kq":B(1b){if(z.1l&&!1b.el){z.1n(["ko","em","kn","km"],B(i){1u{A 1e=S 9j(kl[i]+".kk");1e.kj=U;1e.ki(1b.2G);C 1e}1y(e){}})}I{C 1b.el}}};(B(){z.e5=B(F,ej,ei,eh){A 2F={};2F.F=F;A 6J=L;if(F.3R){A 3R=z.1D(F.3R);A 9i=3R.kh("kg");2F.2E=F.2E||(9i?9i.1Z:L);6J=z.6K(3R)}I{2F.2E=F.2E}A 5l=[{}];if(6J){5l.Y(6J)}if(F.5g){5l.Y(F.5g)}if(F.ek){5l.Y({"z.ek":S 5d().8O()})}2F.1r=z.9h(z.1x.14(L,5l));2F.9d=F.9d||"9g";A d=S z.30(ej);d.5k(ei,B(eg){C eh(eg,d)});A ld=F.4E;if(ld&&z.1Y(ld)){d.ef(B(ee){C ld.2d(F,ee,2F)})}A 1G=F.9f;if(1G&&z.1Y(1G)){d.ed(B(e9){C 1G.2d(F,e9,2F)})}A 6I=F.kf;if(6I&&z.1Y(6I)){d.9e(B(e8){C 6I.2d(F,e8,2F)})}d.1F=2F;C d};A e4=B(O){O.e0=K;A 1b=O.1F.1b;if(V 1b.e7=="B"){1b.e7()}};A e3=B(O){C z.e6[O.1F.9d](O.1F.1b)};A e2=B(9c,O){1z.1K(9c);C 9c};A 3Q=B(F){A O=z.e5(F,e4,e3,e2);O.1F.1b=z.9b(O.1F.F);C O};A 5j=L;A 3t=[];A 94=B(){A dZ=(S 5d()).dU();if(!z.e1){z.1n(3t,B(4D,6H){if(!4D){C}A O=4D.O;1u{if(!O||O.e0||!4D.dT(O)){3t.3S(6H,1);C}if(4D.dR(O)){3t.3S(6H,1);4D.dP(O)}I{if(O.9a){if(O.9a+(O.1F.F.6G||0)0){5c(z.2p(D,B(){D.5b(L,8R)}),d);C D}D.4A=S 5d().8O();if(D.2Z){D.4A-=D.8Q*D.2o}D.8N=D.4A+D.8Q;D.2D=K;D.2Z=U;A 8P=D.2C.4x(D.2o);if(!D.2o){if(!D.4y){D.4y=D.4z}D.3q("dt",[8P])}D.3q("ds",[8P]);D.8M();C D},jS:B(){5e(D.3r);if(!D.2D){C D}D.2Z=K;D.3q("dr",[D.2C.4x(D.2o)]);C D},jR:B(dq,dp){5e(D.3r);D.2D=D.2Z=K;D.2o=dq*6D;if(dp){D.5b()}C D},jQ:B(dn){if(!D.3r){C}5e(D.3r);if(dn){D.2o=1}D.3q("dm",[D.2C.4x(D.2o)]);D.2D=D.2Z=U;C D},3N:B(){if(D.2D){C D.2Z?"3M":"jP"}C"jO"},8M:B(){5e(D.3r);if(D.2D){A dl=S 5d().8O();A 2q=(dl-D.4A)/(D.8N-D.4A);if(2q>=1){2q=1}D.2o=2q;if(D.5a){2q=D.5a(2q)}D.3q("8B",[D.2C.4x(2q)]);if(2q<1){D.3r=5c(z.2p(D,"8M"),D.dj)}I{D.2D=U;if(D.4z>0){D.4z--;D.5b(L,K)}I{if(D.4z==-1){D.5b(L,K)}I{if(D.4y){D.4z=D.4y;D.4y=0}}}D.2o=0;D.3q("dh")}}C D}});(B(){A df=B(E){if(z.1l){A ns=E.1c;if(!ns.8L.G&&z.1c(E,"8L")=="dg"){ns.8L="1"}if(!ns.3n.G&&z.1c(E,"3n")=="8K"){ns.3n="8K"}}};z.6C=B(F){if(V F.1d=="1k"){2m S 1O("z.6C jN an 1d 1Z")}F.E=z.1D(F.E);A 3p=z.1x({6w:{}},F);A 8J=(3p.6w.2W={});8J.1w=(V 3p.1w=="1k")?B(){C 2V(z.1c(3p.E,"2W"))}:3p.1w;8J.1d=3p.1d;A 2U=z.6y(3p);z.2c(2U,"6x",L,B(){df(3p.E)});C 2U};z.8I=B(F){C z.6C(z.1x({1d:1},F))};z.8H=B(F){C z.6C(z.1x({1d:0},F))};if(z.6B&&!z.3o){z.8E=B(n){C 2k("0.5")+((2Y.da((n+2k("1.5"))*2Y.d9))/2)}}I{z.8E=B(n){C 0.5+((2Y.da((n+1.5)*2Y.d9))/2)}}A d4=B(6A){D.8G=6A;R(A p in 6A){A 1a=6A[p];if(1a.1w 1N z.1J){1a.d7=S z.1J()}}D.4x=B(r){A J={};R(A p in D.8G){A 1a=D.8G[p];A 6z=L;if(1a.1w 1N z.1J){6z=z.d8(1a.1w,1a.1d,r,1a.d7).8F()}I{if(!z.2l(1a.1w)){6z=((1a.1d-1a.1w)*r)+1a.1w+(p!="2W"?1a.jM||"px":"")}}J[p]=6z}C J}};z.6y=B(F){F.E=z.1D(F.E);if(!F.5a){F.5a=z.8E}A 2U=S z.d6(F);z.2c(2U,"6x",2U,B(){A pm={};R(A p in D.6w){A 1a=pm[p]=z.1x({},D.6w[p]);if(z.1Y(1a.1w)){1a.1w=1a.1w()}if(z.1Y(1a.1d)){1a.1d=1a.1d()}A d5=(p.1M().T("jL")>=0);B 8C(E,p){4w(p){2X"58":C E.8D;2X"3n":C E.6v}A v=z.1c(E,p);C(p=="2W")?2V(v):2k(v)};if(V 1a.1d=="1k"){1a.1d=8C(D.E,p)}I{if(V 1a.1w=="1k"){1a.1w=8C(D.E,p)}}if(d5){1a.1w=S z.1J(1a.1w);1a.1d=S z.1J(1a.1d)}I{1a.1w=(p=="2W")?2V(1a.1w):2k(1a.1w)}}D.2C=S d4(pm)});z.2c(2U,"8B",2U,B(8A){R(A s in 8A){z.1c(D.E,s,8A[s])}});C 2U}})()}',62,1711,'|||||||||||||||||||||||||||||||||||dojo|var|function|return|this|node|args|length|evt|else|ret|true|null|obj|elem|dfd|arguments|arr|for|new|indexOf|false|typeof||_base|push|type||te|||apply|attr|||||prop|xhr|style|end|doc|match|uri|_hasResource|key|del|undefined|isIE|item|forEach|djConfig|name|document|query|while|_66|try|res|start|mixin|catch|console|split|root|prototype|byId|gcs|ioArgs|err|NodeList|_p|Color|debug|parentNode|toLowerCase|instanceof|Error|constructor|provide|isString|ta|255|val|_a|global|_69|isFunction|value||substring|join|map|tn||window||path|_343|_220|_listeners|connect|call|json|replace|left|_b|toString|128|parseFloat|isArray|throw||_percent|hitch|step|declare|charAt|nodeType|_3c3|nidx|slice|faux|fired|_c4|_7e|loc|curve|_active|url|_44c|responseText|str|_312|idx|tqp|isNaN|isOpera|_22d|callee|add|_18b|_f8|_e2|_41|anim|Number|opacity|case|Math|_paused|Deferred|lastIndexOf|||||||||shift|substr|string|_3e7|_3ce|break|_w|charCode|_listener|_d5|_c5|authority|_49|width|isSafari|_49e|fire|_timer|_47b|_465|eval|_in|_40c|_409|_362|_3d9|className|_3d5|_386|_37a|body|getComputedStyle|box|_221|keyCode|remove|_8d|_46|paused|status|not|_478|_461|form|splice|filter|concat|tret|childNodes|_38b|_367|_33d||||||||||_340|_348|keypress|appendChild|_toArray|Array|_2b0|_toPixelValue|ref|_fixEvent|_19f|_14c|_14a|_150|_141|declaredClass|_d4|_99|_Url|_83|scheme|_67|_3d|switch|getValue|_startRepeatCount|repeat|_startTime|_47e|cancel|tif|load|to|with|tf|getElementsByTagName|number|_34c|_342|extend|_1e3|_normalizeEventName|_14b|_14e|results|self|cbfn|_f9|_d8|_b2|src|_88|dav||baseUrl|fragment|_loadedModules|_44|_43|_loaders|mll|height||easing|play|setTimeout|Date|clearTimeout|hdr|content|code|errback|_464|addCallbacks|_450|fromJson|_413|_3fc|_3ee|max|_31e|cond|getAttribute|_3d4|obi|tagName|_360|_381|contains|firstChild|_368|_372|_320|place|_2fa|scrollTop|_299|scrollLeft|top|documentElement|_288|_287|_getBorderExtents|_23f|_23d|_239|_218|_216|_211|eles|target|keys|shiftKey|ctrlKey|event|192|iel|_1db|delete|_1cf||addEventListener|String|_1af|_157|array|_14d|continue|_14f|_137|_11f|_106|_findMethod|has|_delegate|_dc|_d3|loaded|_9a|_loadInit|_inFlightCount|getObject|tv|_4f|_postLoad|_2d|offsetWidth|properties|beforeBegin|animateProperty|_4ad|_4a6|isKhtml|_fade|100|headers|readyState|timeout|_469|_457|_44d|formToObject|_441|comment|_43d|_36f|_419|tp|_40a|_406|_407|_373|_403|_3e6|_31b|cbi|test|_3c7|nextSibling|last|_3a1|_38e|_365|_36b|ecn|_364|_363|_356|_35e|_35f|_34f|_34d|_349|trim|tci|_328|_32b|_31f|_31c|_anim|_300|_2ff|_2f5|_2e7|removeClass|addClass|func|_2c4|cls|_2a9|_2ae|_280|_27f|_getPadExtents|isMoz|none|_233|cssText|_214|_fixCallback|_synthesizeEvent|stopPropagation|preventDefault|_setKeyChar|_1e1|ieh|_1d7|_1be|colorFromArray|sanitize|bits|rgb|_156|_fire|_resback|_13d|partial|_13a|silentlyCancelled|_topics|_127|_f1|_f0|superclass|_ec|_e3|mct|setObject|_bf|_b3|object|require|_92|_khtmlTimer|location|XMLHTTP|locale|dua|_71|_modulePrefixes|_55|_loadModule|_51|_50|_4e|pop|_3f|_callLoaded|_unloaders|_loadNotifying|_loadedUrls|_27|_24|_1d|_5|_4b7|onAnimate|getStyle|offsetHeight|_defaultEasing|toCss|_properties|fadeOut|fadeIn|_49f|auto|zoom|_cycle|_endTime|valueOf|_494|duration|_492|DELETE|_ioAddQueryToUrl|putData|contentType|password|user|_isDocumentOk|application|||||_466||||||startTime|_xhrObj|_45f|handleAs|addBoth|error|text|objectToQuery|_44f|ActiveXObject|_443|_442|filtered|_43f|_43e|_437|file|tnl|_41c|_filterQueryResult|_zipIdx|_408|_402|evaluate|_3ed|_380|fHit|_361|_33b|_3da|_3ab|_3d6|RegExp|_327|_3cf|_3c9|child|innerHTML|first|tval|_391|class|pnc|_37e|_37c|_375|_366|_35c|_35a|_353|_33c|_336|_314|||_315|_oe|_307|_309|cloneNode|after|createElement||_2f8|_2ef|_2ee|unshift|coords|some|every||_2cb|script|_2c9|parent||a2p||_2c3|_2bd||abs|_getMarginBox|_2b3|_2a6|position|_2a7|_2ac|_2ab|_getIeDocumentElementOffset|getBoundingClientRect|ownerDocument|_2a3|clientWidth|_isBodyLtr|_fixIeBiDiScrollLeft|_bodyLtr|_29d|_getContentBox|_setBox|_getMarginExtents|_getPadBorderExtents|_usesBorderBox|boxModel|pcs|st|sl|_240|runtimeStyle|_dcm|BackCompat|compatMode|default|_21b|_d|html|_event_listener|handlers|PAGE_DOWN|PAGE_UP|RIGHT_ARROW|LEFT_ARROW|DOWN_ARROW|UP_ARROW|_preventDefault||_stopPropagation|returnValue||_trySetKeyCode|cancelBubble|currentTarget|106|_1ee|111||_1e8|_1e7|||se|srcElement|onkeydown||_1d0|_disconnect|lid|_1c0|_connect|_set|_195|_185|_183|_17d|_everyOrSome|_16b|_172|_15b|Function|_154|_escapeString|_140|chain|_check|canceller|_12d|_124|_11a|_10d|_107|inherited|_fa|_f2|_findMixin|_constructor|preamble|_de|clone|tmp|_c7|TMP|_be|_ba|_mixin|isBrowser|lang|firebug||param|modulePaths|_a7|_fireCallback|_a0|setContext||_9c|unloaded||||_96|_93|navigator|_90|_89||protocol|_84|_86|_XMLHTTP_PROGIDS|gears|google|setAttribute|_80|_77|cfg|_6f|_getModuleSymbols|_5a|_58|_53|_4d|_4c|_45|_40|_moduleHasPrefix|_loadUri|_28|_26|_21|_22|tests|doh|_20|_1f|_1c|version|_1b|_19|_getProp|_11|_4|_4a5|_4b3|_Animation|tempColor|blendColors|PI|sin|||||_49a|normal|onEnd||rate||curr|onStop|_497||_496|pct|onPause|onPlay|onBegin|delay||_491|_Line|_48b|wrapForm|PUT|_487|POST|GET|_476|_474|_472|_ioWatch|send|_471|setRequestHeader|open|callback|setInterval|_470|resHandle|_46f|ioCheck|_46e|validCheck|getTime|_ioCancelAll|addOnUnload|clearInterval|dojoType|now|canceled|_blockAsync|_45e|_45c|_459|_ioSetArgs|_contentHandlers|abort|_458|_456||||addErrback|_454|addCallback|_452|_44b|_44a|_449|preventCache|responseXML|Microsoft|JSON|usePlainJson|_431|toJson|_430|_42d|image|opt|ria|_421|_41b|_40b|_zip|_410|_40d|_357|sqf|_374|_3e5|_3df|_38f|clc|pred|parseInt|ntf|_3bf|_3bc|cnl|previousSibling|_3a9|_3a6|_39c|_399|_396|_392|__cachedIndex|__cachedLength|_376|iterateNext|_34a|_355|_354|_32c|_350|_34b|_33f|_33e|_33a|_338|_334|_332||_330|_32e||_322|_316|mousemove|mouseout|mouseover|_305|lastChild||_2f9||_2f2|_2f1|removeChild|_2ec|_2eb|_2ea|_2e6||_2e4|_2e2|_2d6|_2d5|_2d4|_2d3|_2d2|_2d1|_2cd|_2cc|scs|write|_2c8|hasClass|_2c0|_2bb|_2b5|_abs|_docScroll|offsetParent|offsetTop|offsetLeft|absolute|getBoxObjectFor|clientLeft|_setContentSize|_setMarginBox|_28d|_286|_285|_289|NaN|_281|border|_272|_26b|_260|_258|_253|_24c|_246|_23a|_getOpacity|_setOpacity|_238|td|tr|nodeName|FILTER|_22f|_22e|currentStyle|_22c|_22b|display|QuirksMode|unselectable|_217|isMozilla|getElementById|attributes|all|_ie_listener|_getIeDispatcher|_1fd|NUM_LOCK|SCROLL_LOCK|INSERT|END|HOME|PAUSE|F12|F11|F10|F9|F8|F7|F6|F5|F4|F3|F2|F1|63232|SHIFT_TAB|TAB|keyIdentifier|_1f3|stopEvent|_punctMap|222|219|186|onkeypress|_stealthKeyDown|_fixKeys|relatedTarget|_1e0|_1df|_stealthKeydown|_1d6|_1d5|_1d1|_1ca|_1c9|_1cb|_1c2|_1c1|_1c3|_1c4|_1bc|_1b3|_1b2|colorFromHex|colorFromRgb|named|colorFromString|mask|rgba|_19c|_197|_192|setColor|_180|_178|_177|_175|_174|_16d|_166|_164|_163|_162|_15c|_15d|_15e|index|__json__|toJsonIndentStr|_nextId|_12f|_12b|publish|_128|_126|_125|_122|_121|_123|_11c|_11b|_10c|_10b|_108|getDispatcher|argument|nom|_construct|_core|_makeCtor|_df|_db|deprecated|isObject|_cc||scope||_hitchArgs|_c2||pre|_c1|native|isDebug||registerModulePath|_a8||finally|||_a6|_a5|_a4|_a3|_a2|_a1|_9f|_9e|_9d|_9b|_98|_97|onbeforeunload|ipt|scr|complete|_95|userAgent|_modulesLoaded|initialized|_initFired|_8c|_8a|_getText|_87|ieForceActiveXXhr|Msxml2|isGears|_81|_gearsObject|googlegears|GearsFactory|isFF|_7d|Safari|_72|_name|_6c|ire|ore|_68|i18n|_5b|requireIf|_56|_52|loading|_4a|_loadPath|_47|_48|_global_omit_module_check|_getModulePrefix|_3c|_3a|_37|_30|Boolean|_loadUriAndCheck|_2e||cacheBust|_1e|_1a|_17|_16|_15|_14|_f|_10|_e|_9|_8|revision|flag|patch|minor|major|_6|color|units|needs|stopped|playing|stop|gotoPercent|pause|1000|implemented|yet|_48a|xhrDelete|rawXhrPut|xhrPut|postData|rawXhrPost|xhrPost|xhrGet|Type|Content|sync|response|http|bad|urlencoded|www|_watchInFlightError||exceeded|handle|action|getAttributeNode|loadXML|async|XMLDOM|prefixes|MSXML3|MSXML|MSXML2||xml|javascript|wasn|your|optional|message|off|turn|use|endpoints|issues|security|potential|avoid|mimetype|using|consider|please|decodeURIComponent|queryToObject|formToJson|formToQuery|encodeURIComponent|selected|option|multiple|checked|checkbox|radio|disabled|textarea|select|button|reset|submit|input|_3fb|hasAttribute|0n|even|odd|nth|_3b5|empty|_3b1|_3ad|htmlFor|_38a|under||exprssion|failure|ANY_TYPE|XPathResult|starts|keyup|keydown|mouseup|mousedown|blur|click|combine|span|addContent||adopt|orphan|_2de|_2dd|styles|_2da|_2d9|_2cf|_2ce|show|createPopup|toggleClass|scrollWidth|clientTop|ltr|direction|pageXOffset|pageYOffset|fixed|contentBox|marginBox|BUTTON|TABLE|_getBorderBox|clientHeight|visible|overflow|marginBottom|marginRight|marginTop|marginLeft|borderBottomWidth|borderBottomStyle|borderRightWidth|borderRightStyle|borderTopWidth|borderTopStyle|borderLeftWidth|borderLeftStyle|paddingBottom|paddingRight|paddingTop|paddingLeft|offset||min|padding||margin|Opacity|Alpha|alpha|filters|pixelLeft|medium|_22a|defaultView|before||insertBefore|KhtmlUserSelect|MozUserSelect|setSelectable|isDescendant|div|_destroyElement|BackgroundImageCache|execCommand|PageDown|PageUp|Right|Left|Down|Up|63289|63249|63248|PRINT_SCREEN|63302|63277|63276|63275|63273|63272|63250|63247|63246|63245|63244|63243|63242|63241|63240|63239|63238|63237|63236|63235|63234|63233|Enter|_1f9|which|_1f6|bubbledKeyCode|221|220||||191|190|189|188|187|toElement|fromElement|clientY|pageY||clientX|pageX|offsetY|||layerY|offsetX|layerX|parentWindow|_nop|_allow_leaks|145|144|126|F15|125|F14|124|F13|123|122|121|120|119|118|117|116|115|114|113|112|NUMPAD_DIVIDE|110|NUMPAD_PERIOD|109|NUMPAD_MINUS|108|NUMPAD_ENTER|107|NUMPAD_PLUS|NUMPAD_MULTIPLY|105|NUMPAD_9|104|NUMPAD_8|103|NUMPAD_7|102|NUMPAD_6|101|NUMPAD_5|NUMPAD_4||NUMPAD_3|NUMPAD_2|NUMPAD_1|NUMPAD_0||SELECT|RIGHT_WINDOW||LEFT_WINDOW||HELP|SPACE|ESCAPE|CAPS_LOCK|ALT|CTRL|SHIFT|ENTER|CLEAR|BACKSPACE|attachEvent|fixEvent|fromCharCode|keyChar|_1b9|removeEventListener|0x|round|toHex|toRgba|toRgb|aqua|teal|blue|navy|yellow|olive|lime|green|fuchsia|purple|red|maroon|white|gray|silver|black|boolean|called|already|Cancelled|connectPublisher|unsubscribe|subscribe|disconnect|_113|_112||_111|_110|||found|was||must|_|module|||required|likely|It|declaration|Mixin|separate|instead|property|initializer||pass|_c9|_bb|_b7|nfunction|isAlien|isFinite|isArrayLike|_firebug|withDoc|withGlobal|_writeIncludes|VML|behavior|addRule|createStyleSheet|vml|com|microsoft|schemas|urn|namespaces|onunload|onreadystatechange|defer|khtml|WebKit|DOMContentLoaded|enableMozDomContentLoaded|domcontentloaded|Unable|base|chrome|1223|304|300|200|available|XMLHttpRequest|_println|language|userLanguage|isQuirks|factory|mimeTypes|Factory|Gears|_7f|MSIE||Firefox|Goanna|Konqueror||Opera|appVersion|xd|browser|moduleUrl|port|host|hostenv|_requireLocalization|_5f|_5e|_5d|_5c|requireLocalization|requireAfterIf|_57|common|platformRequire|defined|symbol|_isXDomain|tried|Could|__package__|packageFileName|_42|useXDomain|flight|still|files|addOnLoad|failed|sourceURL|util|notice|without|change|subject|APIs|EXPERIMENTAL|experimental|removed|will|DEPRECATED|exists|10315|Rev|Mobile|Spidermonkey|Rhino||Browser|delayMozLoadingFix|preventBackButtonFix|libraryScriptUri|baseRelativePath|baseScriptUri|allowQueryConfig|warn|trace|timeEnd||time|profileEnd|profile|log|info|groupEnd|group|dirxml|dir|count|assert'.split('|'),0,{}); +var decompressedDojo = function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('if(V z=="1k"){(B(){if(V D["1o"]=="1k"){D.1o={}}if((!D["1z"])||(!1z["ca"])){D.1z={}}A cn=["rA","rz","1K","ry","rx","9f","rw","rv","ru","rt","rs","rr","rq","ro","rn","rm"];A i=0,24;1s(24=cn[i++]){if(!1z[24]){1z[24]=B(){}}}if(V D["z"]=="1k"){D.z={}}z.1W=D;A d3={im:U,rl:U,rk:"",rj:"",ri:"",rh:K,rg:U};R(A 8z in d3){if(V 1o[8z]=="1k"){1o[8z]=d3[8z]}}A jK=["rf","rd","rc","rb"];A t;1s(t=jK.3a()){z["is"+t]=U}})();z.8h=1o.8h;z.cY={jJ:0,jI:9,jH:0,jG:"",jF:2V("$ra: r9 $".1f(/[0-9]+/)[0]),2i:B(){4G(z.cY){C jJ+"."+jI+"."+jH+jG+" ("+jF+")"}}};z.d1=B(jE,jD,1V){A 2h=1V||z.1W;R(A i=0,p;2h&&(p=jE[i]);i++){2h=(p in 2h?2h[p]:(jD?2h[p]={}:1k))}C 2h};z.88=B(jC,jA,jB){A d2=jC.1A("."),p=d2.8q(),M=z.d1(d2,K,jB);C(M&&p?(M[p]=jA):1k)};z.6q=B(jz,jy,jx){C z.d1(jz.1A("."),jy,jx)};z.r8=B(jw,M){C!!z.6q(jw,U,M)};z["3u"]=B(d0){C z.1W.3u?z.1W.3u(d0):3u(d0)};z.ia=B(jv,cZ,cX){A 8y="r7: "+jv;if(cZ){8y+=" "+cZ}if(cX){8y+=" -- r6 be r5 in cY: "+cX}1z.1K(8y)};z.r4=B(ju,cW){A cV="r3: "+ju+" -- r2 r1 4F r0 qZ qY.";if(cW){cV+=" "+cW}1z.1K(cV)};(B(){A cR={53:{},6p:0,1h:{},8k:{z:{1p:"z",1Z:"."},cU:{1p:"cU",1Z:"../qX/cU"},cT:{1p:"cT",1Z:"cT"}},cN:B(cS){A mp=D.8k;C jp(mp[cS]&&mp[cS].1Z)},jk:B(8x){A mp=D.8k;if(D.cN(8x)){C mp[8x].1Z}C 8x},8v:[],6t:U,56:[],8t:[],8u:U};R(A cQ in cR){z[cQ]=cR[cQ]}})();z.jg=B(8w,cP,cb){A 1g=(((8w.2s(0)=="/"||8w.1f(/^\\w+:/)))?"":D.51)+8w;if(1o.jt&&z.c8){1g+="?"+67(1o.jt).2f(/\\W+/g,"")}1u{C!cP?D.cO(1g,cb):D.jq(1g,cP,cb)}1y(e){1z.1K(e);C U}};z.cO=B(1g,cb){if(D.8v[1g]){C K}A 6u=D.iR(1g,K);if(!6u){C U}D.8v[1g]=K;D.8v.Y(1g);if(cb){6u="("+6u+")"}A jr=z["3u"](6u+"\\r\\n//@ qW="+1g);if(cb){cb(jr)}C K};z.jq=B(1g,jo,cb){A ok=U;1u{ok=D.cO(1g,cb)}1y(e){1z.1K("qV je ",1g," 4G 9f: ",e)}C jp(ok&&D.53[jo])};z.6m=B(){D.8u=K;D.6t=K;A 57=D.56;D.56=[];R(A x=0;x<57.G;x++){57[x]()}D.8u=U;if(z.6t&&z.6p==0&&D.56.G>0){z.8s()}};z.ck=B(){A 57=D.8t;1s(57.G){(57.8q())()}};z.qU=B(M,jn){A d=z;if(P.G==1){d.56.Y(M)}I{if(P.G>1){d.56.Y(B(){M[jn]()})}}if(d.6t&&d.6p==0&&!d.8u){d.8s()}};z.dW=B(M,jm){A d=z;if(P.G==1){d.8t.Y(M)}I{if(P.G>1){d.8t.Y(B(){M[jm]()})}}};z.iM=B(){if(D.6t){C}if(D.6p>0){1z.1K("qT qS in qR!");C}z.8s()};z.8s=B(){if(V 5c=="8b"||(1o["qQ"]&&z.2M)){5c("z.6m();",0)}I{z.6m()}};z.cF=B(jl){A 4v=jl.1A(".");R(A i=4v.G;i>0;i--){A 8r=4v.2w(0,i).22(".");if((i==1)&&!D.cN(8r)){4v[0]="../"+4v[0]}I{A cM=D.jk(8r);if(cM!=8r){4v.3S(0,i,cM);3f}}}C 4v};z.jj=U;z.8m=B(2T,qP,55){55=D.jj||55;A 54=D.53[2T];if(54){C 54}A cL=2T.1A(".");A 3L=D.cF(2T);A jh=((3L[0].2s(0)!="/")&&!3L[0].1f(/^\\w+:/));A ji=3L[3L.G-1];A 3m;if(ji=="*"){2T=cL.2w(0,-1).22(".");3L.8q();3m=3L.22("/")+"/"+(1o["qO"]||"qN")+".js";if(jh&&3m.2s(0)=="/"){3m=3m.2w(1)}}I{3m=3L.22("/")+".js";2T=cL.22(".")}A jf=(!55)?2T:L;A ok=D.jg(3m,jf);if((!ok)&&(!55)){2m S 1O("qM 3O 4E \'"+2T+"\'; 72 qL \'"+3m+"\'")}if((!55)&&(!D["qK"])){54=D.53[2T];if(!54){2m S 1O("qJ \'"+2T+"\' is 3O qI a8 je \'"+3m+"\'")}}C 54};z.8c=z.8m;z.1Q=B(cK){A cJ=cK+"";A 8p=cJ;A 6s=cK.1A(/\\./);if(6s[6s.G-1]=="*"){6s.8q();8p=6s.22(".")}A 8o=z.6q(8p,K);D.53[cJ]=8o;D.53[8p]=8o;C 8o};z.qH=B(8n){A jd=8n["qG"]||[];A cI=jd.3U(8n[z.j4]||8n["aY"]||[]);R(A x=0;x0&&!(j==1&&1X[0]=="")&&1X[j]==".."&&1X[j-1]!=".."){if(j==(1X.G-1)){1X.3S(j,1);1X[j-1]=""}I{1X.3S(j-1,2);j-=2}}}}1t.28=1X.22("/")}}}}1g="";if(1t.4t){1g+=1t.4t+":"}if(1t.3l){1g+="//"+1t.3l}1g+=1t.28;if(1t.1r){1g+="?"+1t.1r}if(1t.52){1g+="#"+1t.52}}D.1g=1g.2i();A r=D.1g.1f(j7);D.4t=r[2]||(r[1]?"":n);D.3l=r[4]||(r[3]?"":n);D.28=r[5];D.1r=r[7]||(r[6]?"":n);D.52=r[9]||(r[8]?"":n);if(D.3l!=n){r=D.3l.1f(j6);D.8X=r[3]||n;D.8W=r[4]||n;D.qw=r[5];D.qv=r[7]||n}};z.4r.1C.2i=B(){C D.1g}})();z.qu=B(j5,2E){A 2B=z.cF(j5).22("/");if(!2B){C L}if(2B.31("/")!=2B.G-1){2B+="/"}A cE=2B.T(":");if(2B.2s(0)!="/"&&(cE==-1||cE>2B.T("/"))){2B=z.51+2B}C S z.4r(2B,2E)};if(V 26!="1k"){z.c8=K;z.j4="qt";(B(){A d=z;if(1q&&1q.4I){A 8j=1q.4I("ak");A j3=/z(\\.qs)?\\.js([\\?\\.]|$)/i;R(A i=0;i<8j.G;i++){A 4X=8j[i].5t("4X");if(!4X){6c}A m=4X.1f(j3);if(m){if(!1o["51"]){1o["51"]=4X.21(0,m.hK)}A cD=8j[i].5t("1o");if(cD){A cC=3u("({ "+cD+" })");R(A x in cC){1o[x]=cC[x]}}3f}}}d.51=1o["51"];A n=cq;A 8i=n.iL;A 4Z=n.qr;A 6r=2k(4Z);d.2M=(8i.T("qq")>=0)?6r:0;d.6B=(4Z.T("qo")>=0)||(4Z.T("j2")>=0)?6r:0;d.3o=(4Z.T("j2")>=0)?6r:0;A j1=8i.T("qn");d.gu=d.7B=((j1>=0)&&(!d.6B))?6r:0;d.j0=0;d.1l=0;d.iV=0;1u{if(d.7B){d.j0=2k(8i.1A("qm/")[1].1A(" ")[0])}if((1q.gx)&&(!d.2M)){d.1l=2k(4Z.1A("qk ")[1].1A(";")[0])}}1y(e){}if(z.1l&&(26.8f.cu==="9q:")){1o.iT=K}d.iX=B(){A 2A;A qj;A cB=d.6q("cz.cy");if(cB){C cB}if(V iZ!="1k"){2A=S iZ()}I{if(d.1l){1u{2A=S 9j("qi.qh")}1y(e){}}I{if(cq.qg["8Z/x-iY"]){2A=1q.a9("8b");2A.cA("Z","8Z/x-iY");2A.cA("3n",0);2A.cA("58",0);2A.1c.gq="7C";1q.5K.4c(2A)}}}if(!2A){C L}z.88("cz.cy.qf",2A);C z.6q("cz.cy")};A iW=d.iX();if(iW){d.iV=K}A cm=1q["aX"];d.qe=(cm=="aW")||(cm=="gr")||(d.1l<6);d.8h=1o.8h||(d.1l?n.qd:n.qc).1M();d.qb=1z.1K;d.cx=["iU.8g","em.8g","iU.8g.4.0"];d.9b=B(){A 4s=L;A cv=L;if(!z.1l||!1o.iT){1u{4s=S qa()}1y(e){}}if(!4s){R(A i=0;i<3;++i){A cw=z.cx[i];1u{4s=S 9j(cw)}1y(e){cv=e}if(4s){z.cx=[cw];3f}}}if(!4s){2m S 1O("8g 3O q9: "+cv)}C 4s};d.8Y=B(iS){A 4Y=iS.3N||0;C((4Y>=q8)&&(4Y0);d.iR=B(1g,iP){A 3K=D.9b();if(!iQ&&z.4r){1g=(S z.4r(26.8f,1g)).2i()}3K.dL("dD",1g,U);1u{3K.dI(L);if(!d.8Y(3K)){A 1G=1O("q2 4F 4E "+1g+" 3N:"+3K.3N);1G.3N=3K.3N;1G.2G=3K.2G;2m 1G}}1y(e){if(iP){C L}2m e}C 3K.2G}})();z.iO=U;z.6o=B(e){z.iO=K;A cr=(e&&e.Z)?e.Z.1M():"4E";if(P.2O.iN||(cr!="q1"&&cr!="4E")){C}P.2O.iN=K;if(V z["8e"]!="1k"){dX(z.8e);63 z.8e}if(z.6p==0){z.iM()}};if(1q.66){if(z.2M||(z.7B&&(1o["q0"]===K))){1q.66("pZ",z.6o,L)}26.66("4E",z.6o,L)}if(/(pY|pX)/i.6Z(cq.iL)){z.8e=dN(B(){if(/6m|iJ/.6Z(1q.6F)){z.6o()}},10)}(B(){A 3g=26;A 8d=B(cp,fp){A iK=3g[cp]||B(){};3g[cp]=B(){fp.14(3g,P);iK.14(3g,P)}};if(z.1l){1q.fJ(""+"");A co=K;8d("iG",B(){3g.5c(B(){co=U},0)});8d("pU",B(){if(co){z.ck()}});1u{1q.pT.2P("v","pS:pR-pQ-pP:pO");1q.pN().pM("v\\\\:*","pL:2E(#aY#pK)")}1y(e){}}I{8d("iG",B(){z.ck()})}})();z.pJ=B(){};z.1e=26["1q"]||L;z.3E=B(){C z.1e.3E||z.1e.4I("3E")[0]};z.ch=B(iF,iE){z.1W=iF;z.1e=iE};z.cf=B(4q,6n,iD){if((6n)&&((V 4q=="3c")||(4q 1N 67))){4q=6n[4q]}C(6n?4q.14(6n,iD||[]):4q())};z.pI=B(cj,iC,iB,iA){A cg;A iz=z.1W;A iy=z.1e;1u{z.ch(cj,cj.1q);cg=z.cf(iC,iB,iA)}ir{z.ch(iz,iy)}C cg};z.pH=B(ix,iw,iv,iu){A ce;A ip=z.1e;1u{z.1e=ix;ce=z.cf(iw,iv,iu)}ir{z.1e=ip}C ce};if(1o["cd"]){R(A cc in 1o["cd"]){z.io(cc,1o["cd"][cc])}}}if(1o.im){if(!1z.ca){z.8c("z.pG.ca")}}}if(!z.1h["z.X.c9"]){z.1h["z.X.c9"]=K;z.1Q("z.X.c9");z.1R=B(it){C(V it=="3c"||it 1N 67)};z.2l=B(it){C(it&&it 1N 4e||V it=="6a"||((V z["1H"]!="1k")&&(it 1N z.1H)))};if(z.c8&&z.3o){z.1Y=B(it){if((V(it)=="B")&&(it=="[8b 1H]")){C U}C(V it=="B"||it 1N bI)}}I{z.1Y=B(it){C(V it=="B"||it 1N bI)}}z.ib=B(it){if(V it=="1k"){C U}C(it===L||V it=="8b"||z.2l(it)||z.1Y(it))};z.pF=B(it){A d=z;if((!it)||(V it=="1k")){C U}if(d.1R(it)){C U}if(d.1Y(it)){C U}if(d.2l(it)){C K}if((it.5w)&&(it.5w.1M()=="3R")){C U}if(pE(it.G)){C K}C U};z.pD=B(it){if(!it){C U}C!z.1Y(it)&&/\\{\\s*\\[il 5h\\]\\s*\\}/.6Z(67(it))};z.c7=B(M,4W){A 8a={};R(A x in 4W){if((V 8a[x]=="1k")||(8a[x]!=4W[x])){M[x]=4W[x]}}if(z.1l){A p=4W.2i;if((V(p)=="B")&&(p!=M.2i)&&(p!=8a.2i)&&(p!="\\pC 2i() {\\n [il 5h]\\n}\\n")){M.2i=4W.2i}}C M};z.1x=B(M,pB){R(A i=1,l=P.G;i2){C z.ig.14(z,P)}if(!3k){3k=2z;2z=L}if(z.1R(3k)){2z=2z||z.1W;if(!2z[3k]){2m(["z.2p: ie[\\"",3k,"\\"] is L (ie=\\"",2z,"\\")"].22(""))}C B(){C 2z[3k].14(2z,P||[])}}I{C(!2z?3k:B(){C 3k.14(2z,P||[])})}};z.6j=B(M,c3){B c4(){};c4.1C=M;A c2=S c4();if(c3){z.1x(c2,c3)}C c2};z.7X=B(pz){A Q=[L];C z.2p.14(z,Q.3U(z.4d(P)))};z.4d=B(M,ic){A Q=[];R(A x=ic||0;x3)){z.ia("z.2r: R 9P \'"+6l+"\' py pw B as \'1P\' pv pu of as a pt i3.","","1.0");A c=3j;3j=P[3]||{};3j.1P=c}A dd=P.2O,4V=L;if(z.2l(4p)){4V=4p;4p=4V.3a()}if(4V){R(A i=0,m;i<4V.G;i++){m=4V[i];if(!m){2m("ps #"+i+" 4F pr of "+6l+" is L. pq\'s pp a po pl is 3O 6m.")}4p=dd.6j(4p,m)}}A i9=(3j||0).1P,6k=dd.6j(4p),fn;R(A i in 3j){if(z.1Y(fn=3j[i])&&(!0[i])){fn.i4=i}}z.4M(6k,{4o:6l,bY:i9,bZ:L},3j||0);6k.1C.1P=6k;C z.88(6l,6k)};z.1x(z.2r,{6j:B(c0,i8){A bp=(c0||0).1C,mp=(i8||0).1C;A 2S=z.2r.i7();z.1x(2S,{84:bp,1x:mp});if(c0){2S.1C=z.6j(bp)}z.4M(2S,z.2r.i6,mp||0,{bY:L});2S.1C.1P=2S;2S.1C.4o=(bp||0).4o+"pk"+(mp||0).4o;z.88(2S.1C.4o,2S);C 2S},i7:B(){C B(){D.i5(P)}},i6:{i5:B(86){A c=86.2O,s=c.84,ct=s&&s.1P,m=c.1x,87=m&&m.1P,a=86,ii,fn;if(a[0]){if((fn=a[0]["bZ"])){a=fn.14(D,a)||a}}if(fn=c.1C.bZ){a=fn.14(D,a)||a}if(ct&&ct.14){ct.14(D,a)}if(87&&87.14){87.14(D,a)}if(ii=c.1C.bY){ii.14(D,86)}},bX:B(85){A c=D.1P,p,m;1s(c){p=c.84;m=c.1x;if(m==85||(m 1N 85.1P)){C p}if(m&&(m=m.bX(85))){C m}c=p&&p.1P}},6h:B(83,82,bW,6i){A p=bW,c,m,f;do{c=p.1P;m=c.1x;if(m&&(m=D.6h(83,82,m,6i))){C m}if((f=p[83])&&(6i==(f==82))){C p}p=c.84}1s(p);C!6i&&(p=D.bX(bW))&&D.6h(83,82,p,6i)},bU:B(2R,4U,bV){A a=P;if(!z.1R(a[0])){bV=4U;4U=2R;2R=4U.2O.i4}A c=4U.2O,p=D.1P.1C,a=bV||4U,fn,mp;if(D[2R]!=c||p[2R]==c){mp=D.6h(2R,c,p,K);if(!mp){2m(D.4o+": 1p i3 (\\""+2R+"\\") 4F bU pj 1f 2O (2r.js)")}p=D.6h(2R,c,mp,U)}fn=p&&p[2R];if(!fn){1z.1K(mp.4o+": no bU \\""+2R+"\\" ph pg (2r.js)");C}C fn.14(D,a)}}})}if(!z.1h["z.X.2c"]){z.1h["z.X.2c"]=K;z.1Q("z.X.2c");z.3i={i2:B(){C B(){A ap=4e.1C,c=P.2O,ls=c.2b,t=c.5V;A r=t&&t.14(D,P);R(A i in ls){if(!(i in ap)){ls[i].14(D,P)}}C r}},2P:B(6g,bT,i1){6g=6g||z.1W;A f=6g[bT];if(!f||!f.2b){A d=z.3i.i2();d.5V=f;d.2b=[];f=6g[bT]=d}C f.2b.Y(i1)},3J:B(i0,hZ,bS){A f=(i0||z.1W)[hZ];if(f&&f.2b&&bS--){63 f.2b[bS]}}};z.2c=B(M,pd,pc,pa,p9){A a=P,F=[],i=0;F.Y(z.1R(a[0])?L:a[i++],a[i++]);A a1=a[i+1];F.Y(z.1R(a1)||z.1Y(a1)?a[i++]:L,a[i++]);R(A l=a.G;i2){6e=z.7X(6e,P,2)}C D.5k(6e,6e)},ef:B(cb,4T){A 7Y=z.2p(cb,4T);if(P.G>2){7Y=z.7X(7Y,P,2)}C D.5k(7Y,L)},ed:B(cb,4T){A 7W=z.2p(cb,4T);if(P.G>2){7W=z.7X(7W,P,2)}C D.5k(L,7W)},5k:B(cb,eb){D.bM.Y([cb,eb]);if(D.2y>=0){D.7U()}C D},7U:B(){A bL=D.bM;A 4n=D.2y;A 1v=D.4R[4n];A 4S=D;A cb=L;1s((bL.G>0)&&(D.3M==0)){A f=bL.3a()[4n];if(!f){6c}1u{1v=f(1v);4n=((1v 1N 1O)?1:0);if(1v 1N z.30){cb=B(1v){4S.7V(1v);4S.3M--;if((4S.3M==0)&&(4S.2y>=0)){4S.7U()}};D.3M++}}1y(1G){1z.1K(1G);4n=1;1v=1G}}D.2y=4n;D.4R[4n]=1v;if((cb)&&(D.3M)){1v.9e(cb)}}})}if(!z.1h["z.X.2e"]){z.1h["z.X.2e"]=K;z.1Q("z.X.2e");z.5m=B(2e){1u{C 3u("("+2e+")")}1y(e){1z.1K(e);C 2e}};z.bK=B(2H){C("\\""+2H.2f(/(["\\\\])/g,"\\\\$1")+"\\"").2f(/[\\f]/g,"\\\\f").2f(/[\\b]/g,"\\\\b").2f(/[\\n]/g,"\\\\n").2f(/[\\t]/g,"\\\\t").2f(/[\\r]/g,"\\\\r")};z.hM="\\t";z.eq=B(it,4l,4P){4P=4P||"";A 4k=(4l?4P+z.hM:"");A 6b=(4l?"\\n":"");A 4Q=V(it);if(4Q=="1k"){C"1k"}I{if((4Q=="4J")||(4Q=="p1")){C it+""}I{if(it===L){C"L"}}}if(4Q=="3c"){C z.bK(it)}A 6d=P.2O;A 4m;if(V it.hL=="B"){4m=it.hL();if(it!==4m){C 6d(4m,4l,4k)}}if(V it.2e=="B"){4m=it.2e();if(it!==4m){C 6d(4m,4l,4k)}}if(z.2l(it)){A 1v=[];R(A i=0;i>=7R;t[x]=7R==4?17*c:c});t.a=1;C t};z.7P=B(a,M){A t=M||S z.1J();t.bz(2V(a[0]),2V(a[1]),2V(a[2]),2V(a[3]));if(2L(t.a)){t.a=1}C t.7Q()};z.hq=B(2H,M){A a=z.1J.hp[2H];C a&&z.7P(a,M)||z.ho(2H,M)||z.hn(2H,M)}}if(!z.1h["z.X"]){z.1h["z.X"]=K;z.1Q("z.X")}if(!z.1h["z.X.5Z"]){z.1h["z.X.5Z"]=K;z.1Q("z.X.5Z");(B(){A 1j=z.b2={2P:B(E,68,fp){if(!E){C}68=1j.4O(68);fp=1j.7G(68,fp);E.66(68,fp,U);C fp},3J:B(E,hm,hl){(E)&&(E.oF(1j.4O(hm),hl,U))},4O:B(1p){C(1p.2w(0,2)=="on"?1p.2w(2):1p)},7G:B(1p,fp){C(1p!="4b"?fp:B(e){C fp.2d(D,1j.4i(e,D))})},4i:B(H,oE){4w(H.Z){2X"4b":1j.7K(H);3f}C H},7K:B(H){H.oD=(H.3h?67.oC(H.3h):"")}};z.oB=B(H,hk){C 1j.4i(H,hk)};z.gY=B(H){H.7J();H.7I()};A 7O=z.3i;z.by=B(M,bx,hh,hg,hi){A hj=M&&(M.2t||M.oA||M.66);A bw=!hj?0:(!hi?1:2),l=[z.3i,1j,7O][bw];A h=l.2P(M,bx,z.2p(hh,hg));C[M,bx,h,bw]};z.bv=B(M,he,hd,hf){([z.3i,1j,7O][hf]).3J(M,he,hd)};z.5W={oz:8,gV:9,oy:12,ox:13,ow:16,ov:17,ou:18,gG:19,ot:20,os:27,or:32,b5:33,b4:34,gE:35,gF:36,b7:37,b9:38,b6:39,b8:40,gD:45,8S:46,oq:47,oo:91,om:92,ol:93,oj:96,oi:97,oh:98,og:99,oe:6D,od:oc,ob:oa,o9:o8,o7:o6,o5:o4,o3:bi,o2:o1,o0:nZ,nY:nX,nW:nV,nU:bk,gS:nT,gR:nS,gQ:nR,gP:nQ,gO:nP,gN:nO,gM:nN,gL:nM,gK:nL,gJ:nK,gI:nJ,gH:nI,nH:nG,nF:nE,nD:nC,gB:nB,gC:nA};if(z.1l){bf=B(e,5h){1u{C(e.3I=5h)}1y(e){C 0}};A 61=z.3i;if(!1o.nz){7O=61=z.gy={b3:[],2P:B(64,bu,hc){64=64||z.1W;A f=64[bu];if(!f||!f.2b){A d=z.gz();d.5V=f&&(7M.Y(f)-1);d.2b=[];f=64[bu]=d}C f.2b.Y(7M.Y(hc)-1)},3J:B(hb,ha,7N){A f=(hb||z.1W)[ha],l=f&&f.2b;if(f&&l&&7N--){63 7M[l[7N]];63 l[7N]}}};A 7M=61.b3}z.1x(1j,{2P:B(E,62,fp){if(!E){C}62=1j.4O(62);if(62=="h3"){A kd=E.bs;if(!kd||!kd.2b||!kd.h9){1j.2P(E,"bs",1j.h4);E.bs.h9=K}}C 61.2P(E,62,1j.7G(fp))},3J:B(E,h8,h7){61.3J(E,1j.4O(h8),h7)},4O:B(7L){C(7L.2w(0,2)!="on"?"on"+7L:7L)},ny:B(){},4i:B(H,4N){if(!H){A w=(4N)&&((4N.aD||4N.1q||4N).nx)||26;H=w.5Z}if(!H){C(H)}H.5V=H.br;H.bh=(4N||H.br);H.nw=H.nv;H.nu=H.nr;A bq=H.br,1e=(bq&&bq.aD)||1q;A bn=((z.1l<6)||(1e["aX"]=="aW"))?1e.3E:1e.5K;A bm=z.aB();H.nq=H.np+z.aH(bn.5I||0)-bm.x;H.nn=H.nm+(bn.5G||0)-bm.y;if(H.Z=="fk"){H.h6=H.nl}if(H.Z=="fj"){H.h6=H.nk}H.7I=1j.bc;H.7J=1j.ba;C 1j.h5(H)},h5:B(H){4w(H.Z){2X"4b":A c=("3h"in H?H.3h:H.3I);if(c==10){c=0;H.3I=13}I{if(c==13||c==27){c=0}I{if(c==3){c=99}}}H.3h=c;1j.7K(H);3f}C H},gZ:{bi:42,bk:47,h2:59,nj:43,ni:44,nh:45,ng:46,nf:47,60:96,h1:91,nb:92,na:93,h0:39},h4:B(H){A kp=H.bh.h3;if(!kp||!kp.2b){C}A k=H.3I;A bj=(k!=13)&&(k!=32)&&(k!=27)&&(k<48||k>90)&&(k<96||k>bk)&&(k60)&&(kh0);if(bj||H.5Y){A c=(bj?0:k);if(H.5Y){if(k==3||k==13){C}I{if(c>95&&c=65&&c<=90)){c+=32}I{c=1j.gZ[c]||c}}}}A 2x=1j.7H(H,{Z:"4b",2x:K,3h:c});kp.2d(H.bh,2x);H.bg=2x.bg;H.bd=2x.bd;bf(H,2x.3I)}},bc:B(){D.bg=K},ba:B(){D.n9=D.3I;if(D.5Y){bf(D,0)}D.bd=U}});z.gY=B(H){H=H||26.5Z;1j.bc.2d(H);1j.ba.2d(H)}}1j.7H=B(H,gX){A 2x=z.1x({},H,gX);1j.7K(2x);2x.7J=B(){H.7J()};2x.7I=B(){H.7I()};C 2x};if(z.2M){z.1x(1j,{4i:B(H,n8){4w(H.Z){2X"4b":A c=H.n7;if(c==3){c=99}c=((c<41)&&(!H.5X)?0:c);if((H.5Y)&&(!H.5X)&&(c>=65)&&(c<=90)){c+=32}C 1j.7H(H,{3h:c})}C H}})}if(z.3o){z.1x(1j,{4i:B(H,n6){4w(H.Z){2X"4b":A c=H.3h,s=H.5X,k=H.3I;k=k||gA[H.gW]||0;if(H.gW=="n5"){c=0}I{if((H.5Y)&&(c>0)&&(c<27)){c+=96}I{if(c==z.5W.gU){c=z.5W.gV;s=K}I{c=(c>=32&&c gh",E).1n(B(i){i.1c.7E=i.1c.7E.2f(/gk:[^;]*;/i,"")})}}I{A o="mh(mg="+(7D*6D)+")";E.1c.3T=o}if(E.gj.1M()=="gi"){z.1r("> gh",E).1n(B(i){i.1c.3T=o})}C 7D}:B(E,gg){C E.1c.2W=gg});A 5Q={3n:K,58:K,2g:K,5J:K};A gd=B(E,Z,5P){Z=Z.1M();if(5Q[Z]===K){C z.4g(E,5P)}I{if(5Q[Z]===U){C 5P}I{if((Z.T("mf")>=0)||(Z.T("md")>=0)||(Z.T("3n")>=0)||(Z.T("58")>=0)||(Z.T("5q")>=0)||(Z.T("mc")>=0)||(Z.T("ma")>=0)){5Q[Z]=K;C z.4g(E,5P)}I{5Q[Z]=U;C 5P}}}};z.1c=B(E,5O,aT){A n=z.1D(E),F=P.G,op=(5O=="2W");if(F==3){C op?z.gf(n,aT):n.1c[5O]=aT}if(F==2&&op){C z.ge(n)}A s=z.3F(n);C(F==1)?s:gd(n,5O,s[5O])};z.7A=B(n,gc){A s=gc||1E(n),px=z.4g,l=px(n,s.m9),t=px(n,s.m8);C{l:l,t:t,w:l+px(n,s.m7),h:t+px(n,s.m6)}};z.5N=B(n,gb){A ne="7C",px=z.4g,s=gb||1E(n),bl=(s.m5!=ne?px(n,s.m4):0),bt=(s.m3!=ne?px(n,s.m2):0);C{l:bl,t:bt,w:bl+(s.m1!=ne?px(n,s.m0):0),h:bt+(s.lZ!=ne?px(n,s.lY):0)}};z.aN=B(n,ga){A s=ga||1E(n),p=z.7A(n,s),b=z.5N(n,s);C{l:p.l+b.l,t:p.t+b.t,w:p.w+b.w,h:p.h+b.h}};z.aM=B(n,g9){A s=g9||1E(n),px=z.4g,l=px(n,s.lX),t=px(n,s.lW),r=px(n,s.lV),b=px(n,s.lU);if(z.3o&&(s.ax!="fU")){r=l}C{l:l,t:t,w:l+r,h:t+b}};z.au=B(E,g8){A s=g8||1E(E),me=z.aM(E,s);A l=E.fT-me.l,t=E.fS-me.t;if(z.7B){A aS=2k(s.2g),aR=2k(s.5J);if(!2L(aS)&&!2L(aR)){l=aS,t=aR}I{A p=E.1L;if(p&&p.1c){A aQ=1E(p);if(aQ.lT!="lS"){A be=z.5N(p,aQ);l+=be.l,t+=be.t}}}}I{if(z.2M){A p=E.1L;if(p){A be=z.5N(p);l-=be.l,t-=be.t}}}C{l:l,t:t,w:E.6v+me.w,h:E.8D+me.h}};z.aK=B(E,g7){A s=g7||1E(E),pe=z.7A(E,s),be=z.5N(E,s),w=E.aF,h;if(!w){w=E.6v,h=E.8D}I{h=E.lR,be.w=be.h=0}if(z.2M){pe.l+=be.l;pe.t+=be.t}C{l:pe.l,t:pe.t,w:w-pe.w-be.w,h:h-pe.h-be.h}};z.lQ=B(E,g6){A s=g6||1E(E),pe=z.7A(E,s),cb=z.aK(E,s);C{l:cb.l-pe.l,t:cb.t-pe.t,w:cb.w+pe.w,h:cb.h+pe.h}};z.aL=B(E,l,t,w,h,u){u=u||"px";4G(E.1c){if(!2L(l)){2g=l+u}if(!2L(t)){5J=t+u}if(w>=0){3n=w+u}if(h>=0){58=h+u}}};z.aO=B(E){A n=E.5w;C(z.aP=="g5-3G")||(n=="lP")||(n=="lO")};z.fX=B(E,7z,7y,g4){A bb=z.aO(E);if(bb){A pb=z.aN(E,g4);if(7z>=0){7z+=pb.w}if(7y>=0){7y+=pb.h}}z.aL(E,g3,g3,7z,7y)};z.fY=B(E,g1,g0,5M,5L,g2){A s=g2||z.3F(E);A bb=z.aO(E),pb=bb?fZ:z.aN(E,s),mb=z.aM(E,s);if(5M>=0){5M=2Y.5q(5M-pb.w-mb.w,0)}if(5L>=0){5L=2Y.5q(5L-pb.h-mb.h,0)}z.aL(E,g1,g0,5M,5L)};A fZ={l:0,t:0,w:0,h:0};z.lN=B(E,3G){A n=z.1D(E),s=1E(n),b=3G;C!b?z.au(n,s):z.fY(n,b.l,b.t,b.w,b.h,s)};z.lM=B(E,3G){A n=z.1D(E),s=1E(n),b=3G;C!b?z.aK(n,s):z.fX(n,b.w,b.h,s)};A 5H=B(E,1a){if(!(E=(E||0).1L)){C 0}A 1U,aJ=0,2h=z.3E();1s(E&&E.1c){if(1E(E).ax=="lL"){C 0}1U=E[1a];if(1U){aJ+=1U-0;if(E==2h){3f}}E=E.1L}C aJ};z.fQ=B(){A 2h=z.3E();A 3g=z.1W;A de=z.1e.5K;C{y:(3g.lK||de.5G||2h.5G||0),x:(3g.lJ||z.aH(de.5I)||2h.5I||0)}};z.aG=B(){C V z.aI=="1k"?(z.aI=z.3F(z.3E()).lI=="lH"):z.aI};z.aB=B(){A de=z.1e.5K;if(z.1l>=7){C{x:de.aC().2g,y:de.aC().5J}}I{C{x:z.aG()||26.am==26?de.fW:de.6v-de.aF-de.fW,y:de.lG}}};z.aH=B(aE){if(z.1l&&!z.aG()){A de=z.1e.5K;C aE+de.aF-de.lF}C aE};z.fP=B(E,aw){A ay=E.aD;A J={x:0,y:0};A 7w=U;A db=z.3E();if(z.1l){A aA=E.aC();A az=z.aB();J.x=aA.2g-az.x;J.y=aA.5J-az.y}I{if(ay["fV"]){A bo=ay.fV(E);J.x=bo.x-5H(E,"5I");J.y=bo.y-5H(E,"5G")}I{if(E["fR"]){7w=K;A 7x;if(z.3o&&(1E(E).ax=="fU")&&(E.1L==db)){7x=db}I{7x=db.1L}if(E.1L!=db){A nd=E;if(z.2M){nd=db}J.x-=5H(nd,"5I");J.y-=5H(nd,"5G")}A 4f=E;do{A n=4f["fT"];if(!z.2M||n>0){J.x+=2L(n)?0:n}A m=4f["fS"];J.y+=2L(m)?0:m;4f=4f.fR}1s((4f!=7x)&&4f)}I{if(E["x"]&&E["y"]){J.x+=2L(E.x)?0:E.x;J.y+=2L(E.y)?0:E.y}}}}if(7w||aw){A av=z.fQ();A m=7w?(!aw?-1:0):1;J.y+=m*av.y;J.x+=m*av.x}C J};z.af=B(E,fO){A n=z.1D(E),s=1E(n),mb=z.au(n,s);A at=z.fP(n,fO);mb.x=at.x;mb.y=at.y;C mb}})();z.fL=B(E,fN){C((" "+E.3A+" ").T(" "+fN+" ")>=0)};z.7s=B(E,ar){A 7v=E.3A;if((" "+7v+" ").T(" "+ar+" ")<0){E.3A=7v+(7v?" ":"")+ar}};z.7r=B(E,fM){A t=z.7g((" "+E.3A+" ").2f(" "+fM+" "," "));if(E.3A!=t){E.3A=t}};z.lE=B(E,aq,7u){if(V 7u=="1k"){7u=!z.fL(E,aq)}z[7u?"7s":"7r"](E,aq)}}if(!z.1h["z.X.1H"]){z.1h["z.X.1H"]=K;z.1Q("z.X.1H");(B(){A d=z;z.1H=B(){A F=P;if((F.G==1)&&(V F[0]=="4J")){D.G=eK(F[0])}I{if(F.G){d.1n(F,B(i){D.Y(i)},D)}}};z.1H.1C=S 4e;if(d.1l){A fK=B(al){C("A a2 = am."+al+"; "+"A ap = 4e.1C; "+"A ao = a2.1C; "+"R(A x in ao){ ap[x] = ao[x]; } "+"am."+al+" = 4e; ")};A fI=fK("z.1H");A aj=26.lD();aj.1q.fJ(""+fI+"");aj.lC(1,1,1,1)}z.4M(z.1H,{T:B(fH,fG){C d.T(D,fH,fG)},31:B(lB,lA){A aa=d.4d(P);aa.ae(D);C d.31.14(d,aa)},ah:B(fF,fE){C d.ah(D,fF,fE)},ag:B(fD,fC){C d.ag(D,fD,fC)},1n:B(fB,fA){d.1n(D,fB,fA);C D},23:B(7t,M){C d.23(D,7t,M,d.1H)},af:B(){C d.23(D,d.af)},1c:B(lz,ly){A aa=d.4d(P);aa.ae(D[0]);A s=d.1c.14(d,aa);C(P.G>1)?D:s},lx:B(lw,lv){A aa=d.4d(P);aa.ae(L);A s=D.23(B(i){aa[0]=i;C d.1c.14(d,aa)});C(P.G>1)?D:s},7s:B(fz){C D.1n(B(i){z.7s(i,fz)})},7r:B(fy){C D.1n(B(i){z.7r(i,fy)})},5E:B(fw,7q){A 1m=d.1r(fw)[0];7q=7q||"72";R(A x=0;x=0){if(i[x]<1d){1d=i[x]}}}C(1d<0)?ql:1d};A 6X=B(7l){A i=2I(7l);if(i[0]!=-1){C 7l.21(i[0]+1,a0(7l,1))}I{C""}};A 5r=B(7k){A 5D;A i=2I(7k);if((i[0]==0)||(i[1]==0)){5D=0}I{5D=a0(7k,0)}C((5D>0)?7k.3b(0,5D).1M():"*")};A fg=B(Q){A J=-1;R(A x=0;x=0){if((1S>J)||(J==-1)){J=1S}}}C J};A 9H=B(7i){A i=2I(7i);if(-1==i[1]){C""}A di=i[1]+1;A 7j=fg(i.2w(2));if(di<7j){C 7i.21(di,7j)}I{if(-1==7j){C 7i.3b(di)}I{C""}}};A f3=[{1i:"|=",1f:B(15,fe){C"[5z(3U(\' \',@"+15+",\' \'), \' "+fe+"-\')]"}},{1i:"~=",1f:B(15,fd){C"[5z(3U(\' \',@"+15+",\' \'), \' "+fd+" \')]"}},{1i:"^=",1f:B(15,fb){C"[li-4G(@"+15+", \'"+fb+"\')]"}},{1i:"*=",1f:B(15,fa){C"[5z(@"+15+", \'"+fa+"\')]"}},{1i:"$=",1f:B(15,9Z){C"[21(@"+15+", 3c-G(@"+15+")-"+(9Z.G-1)+")=\'"+9Z+"\']"}},{1i:"!=",1f:B(15,f9){C"[3O(@"+15+"=\'"+f9+"\')]"}},{1i:"=",1f:B(15,f8){C"[@"+15+"=\'"+f8+"\']"}}];A 9C=B(9Y,3Z,f7,f6){A 49;A i=2I(3Z);if(i[2]>=0){A 4L=3Z.T("]",i[2]);A 29=3Z.21(i[2]+1,4L);1s(29&&29.G){if(29.2s(0)=="@"){29=29.2w(1)}49=L;R(A x=0;x<9Y.G;x++){A 1S=9Y[x];A 7h=29.T(1S.1i);if(7h>=0){A 15=29.21(0,7h);A 4a=29.21(7h+1S.1i.G);if((4a.2s(0)=="\\"")||(4a.2s(0)=="\'")){4a=4a.21(1,4a.G-1)}49=1S.1f(d.7g(15),d.7g(4a));3f}}if((!49)&&(29.G)){49=f7(29)}if(49){f6(49)}29=L;A 7f=3Z.T("[",4L);if(0<=7f){4L=3Z.T("]",7f);if(0<=4L){29=3Z.21(7f+1,4L)}}}}};A f0=B(f5){A 4K=".";A 7e=f5.1A(" ");1s(7e.G){A 2K=7e.3a();A 7d;if(2K==">"){7d="/";2K=7e.3a()}I{7d="//"}A f4=5r(2K);4K+=7d+f4;A id=6X(2K);if(id.G){4K+="[@id=\'"+id+"\'][1]"}A cn=9H(2K);if(cn.G){A 9X=" ";if(cn.2s(cn.G-1)=="*"){9X="";cn=cn.3b(0,cn.G-1)}4K+="[5z(3U(\' \',@9P,\' \'), \' "+cn+9X+"\')]"}9C(f3,2K,B(f2){C"[@"+f2+"]"},B(f1){4K+=f1})}C 4K};A 7a={};A eC=B(28){if(7a[28]){C 7a[28]}A 1e=d.1e;A 9W=f0(28);A 4H=B(9V){A J=[];A 7b;1u{7b=1e.9x(9W,9V,L,lh.lg,L)}1y(e){1z.1K("lf in le:",9W,"lc:",9V);1z.1K(e)}A 7c=7b.eZ();1s(7c){J.Y(7c);7c=7b.eZ()}C J};C 7a[28]=4H};A 5x={};A 9B={};A 3y=B(79,78){if(!79){C 78}if(!78){C 79}C B(){C 79.14(26,P)&&78.14(26,P)}};A 75=B(9U,3Y,5B,2J){A 2v=2J+1;A 76=(3Y.G==2v);A 2K=3Y[2J];if(2K==">"){A 77=9U.3W;if(!77.G){C}2v++;76=(3Y.G==2v);A 4H=6O(3Y[2J+1]);R(A x=0,11;x<77.G,11=77[x];x++){if(4H(11)){if(76){5B.Y(11)}I{75(11,3Y,5B,2v)}}}}A 5C=6U(2K)(9U);if(76){1s(5C.G){5B.Y(5C.3a())}}I{1s(5C.G){75(5C.3a(),3Y,5B,2v)}}};A eE=B(9T,eY){A J=[];A x=9T.G-1,11;1s(11=9T[x--]){75(11,eY,J,0)}C J};A 6O=B(3D){if(5x[3D]){C 5x[3D]}A ff=L;A 9S=5r(3D);if(9S!="*"){ff=3y(ff,B(N){C((N.2t==1)&&(9S==N.5w.1M()))})}A 9R=6X(3D);if(9R.G){ff=3y(ff,B(N){C((N.2t==1)&&(N.id==9R))})}if(2Y.5q.14(D,2I(3D).2w(1))>=0){ff=3y(ff,9z(3D))}C 5x[3D]=ff};A 5y=B(E){A pn=E.1L;A 9Q=pn.3W;A 2v=-1;A 3C=pn.5A;if(!3C){C 2v}A ci=E["eW"];A cl=pn["eX"];if(((V cl=="4J")&&(cl!=9Q.G))||(V ci!="4J")){pn["eX"]=9Q.G;A 2J=1;do{if(3C===E){2v=2J}if(3C.2t==1){3C["eW"]=2J;2J++}3C=3C.71}1s(3C)}I{2v=ci}C 2v};A lb=0;A 3X=B(N,15){A 74="";if(15=="9P"){C N.3A||74}if(15=="R"){C N.la||74}C N.5t(15,2)||74};A eH=[{1i:"|=",1f:B(15,9O){A eV=" "+9O+"-";C B(N){A ea=" "+(N.5t(15,2)||"");C((ea==9O)||(ea.T(eV)==0))}}},{1i:"^=",1f:B(15,eU){C B(N){C(3X(N,15).T(eU)==0)}}},{1i:"*=",1f:B(15,eT){C B(N){C(3X(N,15).T(eT)>=0)}}},{1i:"~=",1f:B(15,eS){A 9N=" "+eS+" ";C B(N){A ea=" "+3X(N,15)+" ";C(ea.T(9N)>=0)}}},{1i:"$=",1f:B(15,73){A 9N=" "+73;C B(N){A ea=" "+3X(N,15);C(ea.31(73)==(ea.G-73.G))}}},{1i:"!=",1f:B(15,eR){C B(N){C(3X(N,15)!=eR)}}},{1i:"=",1f:B(15,eQ){C B(N){C(3X(N,15)==eQ)}}}];A 9E=[{1i:"9M-9K",1f:B(1p,l9){C B(N){if(N.2t!=1){C U}A fc=N.eP;1s(fc&&(fc.2t!=1)){fc=fc.eP}C(!fc)}}},{1i:"72-9K",1f:B(1p,l8){C B(N){if(N.2t!=1){C U}A nc=N.71;1s(nc&&(nc.2t!=1)){nc=nc.71}C(!nc)}}},{1i:"l7",1f:B(1p,l6){C B(N){A cn=N.3W;A eO=N.3W.G;R(A x=eO-1;x>=0;x--){A nt=cn[x].2t;if((nt==1)||(nt==3)){C U}}C K}}},{1i:"5z",1f:B(1p,eN){C B(N){C(N.9L.T(eN)>=0)}}},{1i:"3O",1f:B(1p,eM){A eL=6O(eM);C B(N){C(!eL(N))}}},{1i:"l5-9K",1f:B(1p,2u){A pi=eK;if(2u=="l4"){C B(N){C(((5y(N))%2)==1)}}I{if((2u=="2n")||(2u=="l3")){C B(N){C((5y(N)%2)==0)}}I{if(2u.T("l2+")==0){A 70=pi(2u.3b(3));C B(N){C(N.1L.3W[70-1]===N)}}I{if((2u.T("n+")>0)&&(2u.G>3)){A 9J=2u.1A("n+",2);A eJ=pi(9J[0]);A 2J=pi(9J[1]);C B(N){C((5y(N)%eJ)==2J)}}I{if(2u.T("n")==-1){A 70=pi(2u);C B(N){C(5y(N)==70)}}}}}}}}];A 9z=B(3e){A 9I=(9B[3e]||5x[3e]);if(9I){C 9I}A ff=L;A i=2I(3e);if(i[0]>=0){A 24=5r(3e);if(24!="*"){ff=3y(ff,B(N){C(N.5w.1M()==24)})}}A 5u;A 3B=9H(3e);if(3B.G){A 9F=3B.2s(3B.G-1)=="*";if(9F){3B=3B.3b(0,3B.G-1)}A re=S 9G("(?:^|\\\\s)"+3B+(9F?".*":"")+"(?:\\\\s|$)");ff=3y(ff,B(N){C re.6Z(N.3A)})}if(i[3]>=0){A 3z=3e.3b(i[3]+1);A 9D="";A 5v=3z.T("(");A 6Y=3z.31(")");if((0<=5v)&&(0<=6Y)&&(6Y>5v)){9D=3z.21(5v+1,6Y);3z=3z.3b(0,5v)}5u=L;R(A x=0;x<9E.G;x++){A 1S=9E[x];if(1S.1i==3z){5u=1S.1f(3z,9D);3f}}if(5u){ff=3y(ff,5u)}}A eG=(d.1l)?B(5s){A eI=5s.1M();C B(N){C N[5s]||N[eI]}}:B(5s){C B(N){C(N&&N.5t&&N.l1(5s))}};9C(eH,3e,eG,B(eF){ff=3y(ff,eF)});if(!ff){ff=B(){C K}}C 9B[3e]=ff};A 6W={};A 6U=B(3d,1B){A 9A=6W[3d];if(9A){C 9A}A i=2I(3d);A id=6X(3d);if(i[0]==0){C 6W[3d]=B(1B){C[d.1D(id)]}}A 9y=9z(3d);A 5p;if(i[0]>=0){5p=B(1B){A 11=d.1D(id);if(9y(11)){C[11]}}}I{A 3V;A 24=5r(3d);if(2Y.5q.14(D,2I(3d))==-1){5p=B(1B){A J=[];A 11,x=0,3V=1B.4I(24);1s(11=3V[x++]){J.Y(11)}C J}}I{5p=B(1B){A J=[];A 11,x=0,3V=1B.4I(24);1s(11=3V[x++]){if(9y(11)){J.Y(11)}}C J}}}C 6W[3d]=5p};A l0={};A 5o={">":B(1B){A J=[];A 11,x=0,3V=1B.3W;1s(11=3V[x++]){if(11.2t==1){J.Y(11)}}C J}};A 9w=B(6V){if(0>6V.T(" ")){C 6U(6V)}A eD=B(1B){A 6S=6V.1A(" ");A 6T;if(6S[0]==">"){6T=[1B]}I{6T=6U(6S.3a())(1B)}C eE(6T,6S)};C eD};A 9v=((1q["9x"]&&!d.3o)?B(3x){A 6R=3x.1A(" ");if((1q["9x"])&&(3x.T(":")==-1)&&((K))){if(((6R.G>2)&&(3x.T(">")==-1))||(6R.G>3)||(3x.T("[")>=0)||((1==6R.G)&&(0<=3x.T(".")))){C eC(3x)}}C 9w(3x)}:9w);A ey=B(3w){if(5o[3w]){C 5o[3w]}if(0>3w.T(",")){C 5o[3w]=9v(3w)}I{A eB=3w.1A(/\\s*,\\s*/);A 4H=B(1B){A eA=0;A J=[];A 6Q;1s(6Q=eB[eA++]){J=J.3U(9v(6Q,6Q.T(" "))(1B))}C J};C 5o[3w]=4H}};A 5n=0;A ez=B(Q){A J=S d.1H();if(!Q){C J}if(Q[0]){J.Y(Q[0])}if(Q.G<2){C J}5n++;Q[0]["9u"]=5n;R(A x=1,11;11=Q[x];x++){if(Q[x]["9u"]!=5n){J.Y(11)}11["9u"]=5n}C J};d.1r=B(6P,1B){if(V 6P!="3c"){C S d.1H(6P)}if(V 1B=="3c"){1B=d.1D(1B)}C ez(ey(6P)(1B||d.1e))};d.9t=B(ex,9s){A 9r=S d.1H();A ff=(9s)?6O(9s):B(){C K};R(A x=0,11;11=ex[x];x++){if(ff(11)){9r.Y(11)}}C 9r}})()}if(!z.1h["z.X.1b"]){z.1h["z.X.1b"]=K;z.1Q("z.X.1b");z.6K=B(ew){A J={};A iq="kZ[Z!=9q][Z!=kY][Z!=et][Z!=kX][Z!=kW], kV, kU";z.1r(iq,ew).3T(B(E){C(!E.kT)}).1n(B(1m){A 3v=1m.1p;A Z=(1m.Z||"").1M();if((Z=="kS")||(Z=="kR")){if(1m.kQ){J[3v]=1m.1Z}}I{if(1m.kP){A ev=J[3v]=[];z.1r("kO[kN]",1m).1n(B(eu){ev.Y(eu.1Z)})}I{J[3v]=1m.1Z;if(Z=="et"){J[3v+".x"]=J[3v+".y"]=J[3v].x=J[3v].y=0}}}});C J};z.9h=B(23){A ec=kM;A J="";A es={};R(A x in 23){if(23[x]!=es[x]){if(z.2l(23[x])){R(A y=0;y<23[x].G;y++){J+=ec(x)+"="+ec(23[x][y])+"&"}}I{J+=ec(x)+"="+ec(23[x])+"&"}}}if((J.G)&&(J.2s(J.G-1)=="&")){J=J.3b(0,J.G-1)}C J};z.kL=B(er){C z.9h(z.6K(er))};z.kK=B(ep){C z.eq(z.6K(ep))};z.kJ=B(2H){A J={};A qp=2H.1A("&");A dc=kI;z.1n(qp,B(1m){if(1m.G){A 9p=1m.1A("=");A 1p=dc(9p.3a());A 1U=dc(9p.22("="));if(z.1R(J[1p])){J[1p]=[J[1p]]}if(z.2l(J[1p])){J[1p].Y(1U)}I{J[1p]=1U}}});C J};z.e1=U;z.e6={"9g":B(1b){C 1b.2G},"2e":B(1b){if(!1o.eo){1z.1K("kH kG kF a kE of 9g/2e-6M-9m"+" 4F kD kC kB kA 4G en kz"+" (ky 1o.eo=K 4F kx kw D kv)")}C z.5m(1b.2G)},"2e-6M-ku":B(1b){A 6N=1b.2G;A 9o=6N.T("/*");A 9n=6N.31("*/");if((9o==-1)||(9n==-1)){C z.5m(1b.2G)}C z.5m(6N.21(9o+2,9n))},"2e-6M-9m":B(1b){A 6L=1b.2G;A 9l=6L.T("/*");A 9k=6L.31("*/");if((9l==-1)||(9k==-1)){1z.1K("kt en ks\'t 6M 9m!");C""}C z.5m(6L.21(9l+2,9k))},"kr":B(1b){C z.3u(1b.2G)},"kq":B(1b){if(z.1l&&!1b.el){z.1n(["ko","em","kn","km"],B(i){1u{A 1e=S 9j(kl[i]+".kk");1e.kj=U;1e.ki(1b.2G);C 1e}1y(e){}})}I{C 1b.el}}};(B(){z.e5=B(F,ej,ei,eh){A 2F={};2F.F=F;A 6J=L;if(F.3R){A 3R=z.1D(F.3R);A 9i=3R.kh("kg");2F.2E=F.2E||(9i?9i.1Z:L);6J=z.6K(3R)}I{2F.2E=F.2E}A 5l=[{}];if(6J){5l.Y(6J)}if(F.5g){5l.Y(F.5g)}if(F.ek){5l.Y({"z.ek":S 5d().8O()})}2F.1r=z.9h(z.1x.14(L,5l));2F.9d=F.9d||"9g";A d=S z.30(ej);d.5k(ei,B(eg){C eh(eg,d)});A ld=F.4E;if(ld&&z.1Y(ld)){d.ef(B(ee){C ld.2d(F,ee,2F)})}A 1G=F.9f;if(1G&&z.1Y(1G)){d.ed(B(e9){C 1G.2d(F,e9,2F)})}A 6I=F.kf;if(6I&&z.1Y(6I)){d.9e(B(e8){C 6I.2d(F,e8,2F)})}d.1F=2F;C d};A e4=B(O){O.e0=K;A 1b=O.1F.1b;if(V 1b.e7=="B"){1b.e7()}};A e3=B(O){C z.e6[O.1F.9d](O.1F.1b)};A e2=B(9c,O){1z.1K(9c);C 9c};A 3Q=B(F){A O=z.e5(F,e4,e3,e2);O.1F.1b=z.9b(O.1F.F);C O};A 5j=L;A 3t=[];A 94=B(){A dZ=(S 5d()).dU();if(!z.e1){z.1n(3t,B(4D,6H){if(!4D){C}A O=4D.O;1u{if(!O||O.e0||!4D.dT(O)){3t.3S(6H,1);C}if(4D.dR(O)){3t.3S(6H,1);4D.dP(O)}I{if(O.9a){if(O.9a+(O.1F.F.6G||0)0){5c(z.2p(D,B(){D.5b(L,8R)}),d);C D}D.4A=S 5d().8O();if(D.2Z){D.4A-=D.8Q*D.2o}D.8N=D.4A+D.8Q;D.2D=K;D.2Z=U;A 8P=D.2C.4x(D.2o);if(!D.2o){if(!D.4y){D.4y=D.4z}D.3q("dt",[8P])}D.3q("ds",[8P]);D.8M();C D},jS:B(){5e(D.3r);if(!D.2D){C D}D.2Z=K;D.3q("dr",[D.2C.4x(D.2o)]);C D},jR:B(dq,dp){5e(D.3r);D.2D=D.2Z=K;D.2o=dq*6D;if(dp){D.5b()}C D},jQ:B(dn){if(!D.3r){C}5e(D.3r);if(dn){D.2o=1}D.3q("dm",[D.2C.4x(D.2o)]);D.2D=D.2Z=U;C D},3N:B(){if(D.2D){C D.2Z?"3M":"jP"}C"jO"},8M:B(){5e(D.3r);if(D.2D){A dl=S 5d().8O();A 2q=(dl-D.4A)/(D.8N-D.4A);if(2q>=1){2q=1}D.2o=2q;if(D.5a){2q=D.5a(2q)}D.3q("8B",[D.2C.4x(2q)]);if(2q<1){D.3r=5c(z.2p(D,"8M"),D.dj)}I{D.2D=U;if(D.4z>0){D.4z--;D.5b(L,K)}I{if(D.4z==-1){D.5b(L,K)}I{if(D.4y){D.4z=D.4y;D.4y=0}}}D.2o=0;D.3q("dh")}}C D}});(B(){A df=B(E){if(z.1l){A ns=E.1c;if(!ns.8L.G&&z.1c(E,"8L")=="dg"){ns.8L="1"}if(!ns.3n.G&&z.1c(E,"3n")=="8K"){ns.3n="8K"}}};z.6C=B(F){if(V F.1d=="1k"){2m S 1O("z.6C jN an 1d 1Z")}F.E=z.1D(F.E);A 3p=z.1x({6w:{}},F);A 8J=(3p.6w.2W={});8J.1w=(V 3p.1w=="1k")?B(){C 2V(z.1c(3p.E,"2W"))}:3p.1w;8J.1d=3p.1d;A 2U=z.6y(3p);z.2c(2U,"6x",L,B(){df(3p.E)});C 2U};z.8I=B(F){C z.6C(z.1x({1d:1},F))};z.8H=B(F){C z.6C(z.1x({1d:0},F))};if(z.6B&&!z.3o){z.8E=B(n){C 2k("0.5")+((2Y.da((n+2k("1.5"))*2Y.d9))/2)}}I{z.8E=B(n){C 0.5+((2Y.da((n+1.5)*2Y.d9))/2)}}A d4=B(6A){D.8G=6A;R(A p in 6A){A 1a=6A[p];if(1a.1w 1N z.1J){1a.d7=S z.1J()}}D.4x=B(r){A J={};R(A p in D.8G){A 1a=D.8G[p];A 6z=L;if(1a.1w 1N z.1J){6z=z.d8(1a.1w,1a.1d,r,1a.d7).8F()}I{if(!z.2l(1a.1w)){6z=((1a.1d-1a.1w)*r)+1a.1w+(p!="2W"?1a.jM||"px":"")}}J[p]=6z}C J}};z.6y=B(F){F.E=z.1D(F.E);if(!F.5a){F.5a=z.8E}A 2U=S z.d6(F);z.2c(2U,"6x",2U,B(){A pm={};R(A p in D.6w){A 1a=pm[p]=z.1x({},D.6w[p]);if(z.1Y(1a.1w)){1a.1w=1a.1w()}if(z.1Y(1a.1d)){1a.1d=1a.1d()}A d5=(p.1M().T("jL")>=0);B 8C(E,p){4w(p){2X"58":C E.8D;2X"3n":C E.6v}A v=z.1c(E,p);C(p=="2W")?2V(v):2k(v)};if(V 1a.1d=="1k"){1a.1d=8C(D.E,p)}I{if(V 1a.1w=="1k"){1a.1w=8C(D.E,p)}}if(d5){1a.1w=S z.1J(1a.1w);1a.1d=S z.1J(1a.1d)}I{1a.1w=(p=="2W")?2V(1a.1w):2k(1a.1w)}}D.2C=S d4(pm)});z.2c(2U,"8B",2U,B(8A){R(A s in 8A){z.1c(D.E,s,8A[s])}});C 2U}})()}',62,1711,'|||||||||||||||||||||||||||||||||||dojo|var|function|return|this|node|args|length|evt|else|ret|true|null|obj|elem|dfd|arguments|arr|for|new|indexOf|false|typeof||_base|push|type||te|||apply|attr|||||prop|xhr|style|end|doc|match|uri|_hasResource|key|del|undefined|isIE|item|forEach|djConfig|name|document|query|while|_66|try|res|start|mixin|catch|console|split|root|prototype|byId|gcs|ioArgs|err|NodeList|_p|Color|debug|parentNode|toLowerCase|instanceof|Error|constructor|provide|isString|ta|255|val|_a|global|_69|isFunction|value||substring|join|map|tn||window||path|_343|_220|_listeners|connect|call|json|replace|left|_b|toString|128|parseFloat|isArray|throw||_percent|hitch|step|declare|charAt|nodeType|_3c3|nidx|slice|faux|fired|_c4|_7e|loc|curve|_active|url|_44c|responseText|str|_312|idx|tqp|isNaN|isOpera|_22d|callee|add|_18b|_f8|_e2|_41|anim|Number|opacity|case|Math|_paused|Deferred|lastIndexOf|||||||||shift|substr|string|_3e7|_3ce|break|_w|charCode|_listener|_d5|_c5|authority|_49|width|isSafari|_49e|fire|_timer|_47b|_465|eval|_in|_40c|_409|_362|_3d9|className|_3d5|_386|_37a|body|getComputedStyle|box|_221|keyCode|remove|_8d|_46|paused|status|not|_478|_461|form|splice|filter|concat|tret|childNodes|_38b|_367|_33d||||||||||_340|_348|keypress|appendChild|_toArray|Array|_2b0|_toPixelValue|ref|_fixEvent|_19f|_14c|_14a|_150|_141|declaredClass|_d4|_99|_Url|_83|scheme|_67|_3d|switch|getValue|_startRepeatCount|repeat|_startTime|_47e|cancel|tif|load|to|with|tf|getElementsByTagName|number|_34c|_342|extend|_1e3|_normalizeEventName|_14b|_14e|results|self|cbfn|_f9|_d8|_b2|src|_88|dav||baseUrl|fragment|_loadedModules|_44|_43|_loaders|mll|height||easing|play|setTimeout|Date|clearTimeout|hdr|content|code|errback|_464|addCallbacks|_450|fromJson|_413|_3fc|_3ee|max|_31e|cond|getAttribute|_3d4|obi|tagName|_360|_381|contains|firstChild|_368|_372|_320|place|_2fa|scrollTop|_299|scrollLeft|top|documentElement|_288|_287|_getBorderExtents|_23f|_23d|_239|_218|_216|_211|eles|target|keys|shiftKey|ctrlKey|event|192|iel|_1db|delete|_1cf||addEventListener|String|_1af|_157|array|_14d|continue|_14f|_137|_11f|_106|_findMethod|has|_delegate|_dc|_d3|loaded|_9a|_loadInit|_inFlightCount|getObject|tv|_4f|_postLoad|_2d|offsetWidth|properties|beforeBegin|animateProperty|_4ad|_4a6|isKhtml|_fade|100|headers|readyState|timeout|_469|_457|_44d|formToObject|_441|comment|_43d|_36f|_419|tp|_40a|_406|_407|_373|_403|_3e6|_31b|cbi|test|_3c7|nextSibling|last|_3a1|_38e|_365|_36b|ecn|_364|_363|_356|_35e|_35f|_34f|_34d|_349|trim|tci|_328|_32b|_31f|_31c|_anim|_300|_2ff|_2f5|_2e7|removeClass|addClass|func|_2c4|cls|_2a9|_2ae|_280|_27f|_getPadExtents|isMoz|none|_233|cssText|_214|_fixCallback|_synthesizeEvent|stopPropagation|preventDefault|_setKeyChar|_1e1|ieh|_1d7|_1be|colorFromArray|sanitize|bits|rgb|_156|_fire|_resback|_13d|partial|_13a|silentlyCancelled|_topics|_127|_f1|_f0|superclass|_ec|_e3|mct|setObject|_bf|_b3|object|require|_92|_khtmlTimer|location|XMLHTTP|locale|dua|_71|_modulePrefixes|_55|_loadModule|_51|_50|_4e|pop|_3f|_callLoaded|_unloaders|_loadNotifying|_loadedUrls|_27|_24|_1d|_5|_4b7|onAnimate|getStyle|offsetHeight|_defaultEasing|toCss|_properties|fadeOut|fadeIn|_49f|auto|zoom|_cycle|_endTime|valueOf|_494|duration|_492|DELETE|_ioAddQueryToUrl|putData|contentType|password|user|_isDocumentOk|application|||||_466||||||startTime|_xhrObj|_45f|handleAs|addBoth|error|text|objectToQuery|_44f|ActiveXObject|_443|_442|filtered|_43f|_43e|_437|file|tnl|_41c|_filterQueryResult|_zipIdx|_408|_402|evaluate|_3ed|_380|fHit|_361|_33b|_3da|_3ab|_3d6|RegExp|_327|_3cf|_3c9|child|innerHTML|first|tval|_391|class|pnc|_37e|_37c|_375|_366|_35c|_35a|_353|_33c|_336|_314|||_315|_oe|_307|_309|cloneNode|after|createElement||_2f8|_2ef|_2ee|unshift|coords|some|every||_2cb|script|_2c9|parent||a2p||_2c3|_2bd||abs|_getMarginBox|_2b3|_2a6|position|_2a7|_2ac|_2ab|_getIeDocumentElementOffset|getBoundingClientRect|ownerDocument|_2a3|clientWidth|_isBodyLtr|_fixIeBiDiScrollLeft|_bodyLtr|_29d|_getContentBox|_setBox|_getMarginExtents|_getPadBorderExtents|_usesBorderBox|boxModel|pcs|st|sl|_240|runtimeStyle|_dcm|BackCompat|compatMode|default|_21b|_d|html|_event_listener|handlers|PAGE_DOWN|PAGE_UP|RIGHT_ARROW|LEFT_ARROW|DOWN_ARROW|UP_ARROW|_preventDefault||_stopPropagation|returnValue||_trySetKeyCode|cancelBubble|currentTarget|106|_1ee|111||_1e8|_1e7|||se|srcElement|onkeydown||_1d0|_disconnect|lid|_1c0|_connect|_set|_195|_185|_183|_17d|_everyOrSome|_16b|_172|_15b|Function|_154|_escapeString|_140|chain|_check|canceller|_12d|_124|_11a|_10d|_107|inherited|_fa|_f2|_findMixin|_constructor|preamble|_de|clone|tmp|_c7|TMP|_be|_ba|_mixin|isBrowser|lang|firebug||param|modulePaths|_a7|_fireCallback|_a0|setContext||_9c|unloaded||||_96|_93|navigator|_90|_89||protocol|_84|_86|_XMLHTTP_PROGIDS|gears|google|setAttribute|_80|_77|cfg|_6f|_getModuleSymbols|_5a|_58|_53|_4d|_4c|_45|_40|_moduleHasPrefix|_loadUri|_28|_26|_21|_22|tests|doh|_20|_1f|_1c|version|_1b|_19|_getProp|_11|_4|_4a5|_4b3|_Animation|tempColor|blendColors|PI|sin|||||_49a|normal|onEnd||rate||curr|onStop|_497||_496|pct|onPause|onPlay|onBegin|delay||_491|_Line|_48b|wrapForm|PUT|_487|POST|GET|_476|_474|_472|_ioWatch|send|_471|setRequestHeader|open|callback|setInterval|_470|resHandle|_46f|ioCheck|_46e|validCheck|getTime|_ioCancelAll|addOnUnload|clearInterval|dojoType|now|canceled|_blockAsync|_45e|_45c|_459|_ioSetArgs|_contentHandlers|abort|_458|_456||||addErrback|_454|addCallback|_452|_44b|_44a|_449|preventCache|responseXML|Microsoft|JSON|usePlainJson|_431|toJson|_430|_42d|image|opt|ria|_421|_41b|_40b|_zip|_410|_40d|_357|sqf|_374|_3e5|_3df|_38f|clc|pred|parseInt|ntf|_3bf|_3bc|cnl|previousSibling|_3a9|_3a6|_39c|_399|_396|_392|__cachedIndex|__cachedLength|_376|iterateNext|_34a|_355|_354|_32c|_350|_34b|_33f|_33e|_33a|_338|_334|_332||_330|_32e||_322|_316|mousemove|mouseout|mouseover|_305|lastChild||_2f9||_2f2|_2f1|removeChild|_2ec|_2eb|_2ea|_2e6||_2e4|_2e2|_2d6|_2d5|_2d4|_2d3|_2d2|_2d1|_2cd|_2cc|scs|write|_2c8|hasClass|_2c0|_2bb|_2b5|_abs|_docScroll|offsetParent|offsetTop|offsetLeft|absolute|getBoxObjectFor|clientLeft|_setContentSize|_setMarginBox|_28d|_286|_285|_289|NaN|_281|border|_272|_26b|_260|_258|_253|_24c|_246|_23a|_getOpacity|_setOpacity|_238|td|tr|nodeName|FILTER|_22f|_22e|currentStyle|_22c|_22b|display|QuirksMode|unselectable|_217|isMozilla|getElementById|attributes|all|_ie_listener|_getIeDispatcher|_1fd|NUM_LOCK|SCROLL_LOCK|INSERT|END|HOME|PAUSE|F12|F11|F10|F9|F8|F7|F6|F5|F4|F3|F2|F1|63232|SHIFT_TAB|TAB|keyIdentifier|_1f3|stopEvent|_punctMap|222|219|186|onkeypress|_stealthKeyDown|_fixKeys|relatedTarget|_1e0|_1df|_stealthKeydown|_1d6|_1d5|_1d1|_1ca|_1c9|_1cb|_1c2|_1c1|_1c3|_1c4|_1bc|_1b3|_1b2|colorFromHex|colorFromRgb|named|colorFromString|mask|rgba|_19c|_197|_192|setColor|_180|_178|_177|_175|_174|_16d|_166|_164|_163|_162|_15c|_15d|_15e|index|__json__|toJsonIndentStr|_nextId|_12f|_12b|publish|_128|_126|_125|_122|_121|_123|_11c|_11b|_10c|_10b|_108|getDispatcher|argument|nom|_construct|_core|_makeCtor|_df|_db|deprecated|isObject|_cc||scope||_hitchArgs|_c2||pre|_c1|native|isDebug||registerModulePath|_a8||finally|||_a6|_a5|_a4|_a3|_a2|_a1|_9f|_9e|_9d|_9b|_98|_97|onbeforeunload|ipt|scr|complete|_95|userAgent|_modulesLoaded|initialized|_initFired|_8c|_8a|_getText|_87|ieForceActiveXXhr|Msxml2|isGears|_81|_gearsObject|googlegears|GearsFactory|isFF|_7d|Safari|_72|_name|_6c|ire|ore|_68|i18n|_5b|requireIf|_56|_52|loading|_4a|_loadPath|_47|_48|_global_omit_module_check|_getModulePrefix|_3c|_3a|_37|_30|Boolean|_loadUriAndCheck|_2e||cacheBust|_1e|_1a|_17|_16|_15|_14|_f|_10|_e|_9|_8|revision|flag|patch|minor|major|_6|color|units|needs|stopped|playing|stop|gotoPercent|pause|1000|implemented|yet|_48a|xhrDelete|rawXhrPut|xhrPut|postData|rawXhrPost|xhrPost|xhrGet|Type|Content|sync|response|http|bad|urlencoded|www|_watchInFlightError||exceeded|handle|action|getAttributeNode|loadXML|async|XMLDOM|prefixes|MSXML3|MSXML|MSXML2||xml|javascript|wasn|your|optional|message|off|turn|use|endpoints|issues|security|potential|avoid|mimetype|using|consider|please|decodeURIComponent|queryToObject|formToJson|formToQuery|encodeURIComponent|selected|option|multiple|checked|checkbox|radio|disabled|textarea|select|button|reset|submit|input|_3fb|hasAttribute|0n|even|odd|nth|_3b5|empty|_3b1|_3ad|htmlFor|_38a|under||exprssion|failure|ANY_TYPE|XPathResult|starts|keyup|keydown|mouseup|mousedown|blur|click|combine|span|addContent||adopt|orphan|_2de|_2dd|styles|_2da|_2d9|_2cf|_2ce|show|createPopup|toggleClass|scrollWidth|clientTop|ltr|direction|pageXOffset|pageYOffset|fixed|contentBox|marginBox|BUTTON|TABLE|_getBorderBox|clientHeight|visible|overflow|marginBottom|marginRight|marginTop|marginLeft|borderBottomWidth|borderBottomStyle|borderRightWidth|borderRightStyle|borderTopWidth|borderTopStyle|borderLeftWidth|borderLeftStyle|paddingBottom|paddingRight|paddingTop|paddingLeft|offset||min|padding||margin|Opacity|Alpha|alpha|filters|pixelLeft|medium|_22a|defaultView|before||insertBefore|KhtmlUserSelect|MozUserSelect|setSelectable|isDescendant|div|_destroyElement|BackgroundImageCache|execCommand|PageDown|PageUp|Right|Left|Down|Up|63289|63249|63248|PRINT_SCREEN|63302|63277|63276|63275|63273|63272|63250|63247|63246|63245|63244|63243|63242|63241|63240|63239|63238|63237|63236|63235|63234|63233|Enter|_1f9|which|_1f6|bubbledKeyCode|221|220||||191|190|189|188|187|toElement|fromElement|clientY|pageY||clientX|pageX|offsetY|||layerY|offsetX|layerX|parentWindow|_nop|_allow_leaks|145|144|126|F15|125|F14|124|F13|123|122|121|120|119|118|117|116|115|114|113|112|NUMPAD_DIVIDE|110|NUMPAD_PERIOD|109|NUMPAD_MINUS|108|NUMPAD_ENTER|107|NUMPAD_PLUS|NUMPAD_MULTIPLY|105|NUMPAD_9|104|NUMPAD_8|103|NUMPAD_7|102|NUMPAD_6|101|NUMPAD_5|NUMPAD_4||NUMPAD_3|NUMPAD_2|NUMPAD_1|NUMPAD_0||SELECT|RIGHT_WINDOW||LEFT_WINDOW||HELP|SPACE|ESCAPE|CAPS_LOCK|ALT|CTRL|SHIFT|ENTER|CLEAR|BACKSPACE|attachEvent|fixEvent|fromCharCode|keyChar|_1b9|removeEventListener|0x|round|toHex|toRgba|toRgb|aqua|teal|blue|navy|yellow|olive|lime|green|fuchsia|purple|red|maroon|white|gray|silver|black|boolean|called|already|Cancelled|connectPublisher|unsubscribe|subscribe|disconnect|_113|_112||_111|_110|||found|was||must|_|module|||required|likely|It|declaration|Mixin|separate|instead|property|initializer||pass|_c9|_bb|_b7|nfunction|isAlien|isFinite|isArrayLike|_firebug|withDoc|withGlobal|_writeIncludes|VML|behavior|addRule|createStyleSheet|vml|com|microsoft|schemas|urn|namespaces|onunload|onreadystatechange|defer|khtml|WebKit|DOMContentLoaded|enableMozDomContentLoaded|domcontentloaded|Unable|base|chrome|1223|304|300|200|available|XMLHttpRequest|_println|language|userLanguage|isQuirks|factory|mimeTypes|Factory|Gears|_7f|MSIE||Firefox|Gecko|Konqueror||Opera|appVersion|xd|browser|moduleUrl|port|host|hostenv|_requireLocalization|_5f|_5e|_5d|_5c|requireLocalization|requireAfterIf|_57|common|platformRequire|defined|symbol|_isXDomain|tried|Could|__package__|packageFileName|_42|useXDomain|flight|still|files|addOnLoad|failed|sourceURL|util|notice|without|change|subject|APIs|EXPERIMENTAL|experimental|removed|will|DEPRECATED|exists|10315|Rev|Mobile|Spidermonkey|Rhino||Browser|delayMozLoadingFix|preventBackButtonFix|libraryScriptUri|baseRelativePath|baseScriptUri|allowQueryConfig|warn|trace|timeEnd||time|profileEnd|profile|log|info|groupEnd|group|dirxml|dir|count|assert'.split('|'),0,{}); /* diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build index 4222e94234..1020105433 100644 --- a/js/src/jsapi-tests/moz.build +++ b/js/src/jsapi-tests/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -GoannaProgram('jsapi-tests', linkage=None) +GeckoProgram('jsapi-tests', linkage=None) UNIFIED_SOURCES += [ 'selfTest.cpp', diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index 0d9872a23b..0722b49717 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -571,7 +571,7 @@ JS_ShutDown(void) "JS_ShutDown must only be called after JS_Init and can't race with it"); #ifdef DEBUG if (JSRuntime::hasLiveRuntimes()) { - // Goanna is too buggy to assert this just yet. + // Gecko is too buggy to assert this just yet. fprintf(stderr, "WARNING: YOU ARE LEAKING THE WORLD (at least one JSRuntime " "and everything alive inside it, that is) AT JS_ShutDown " @@ -1107,7 +1107,7 @@ JS_TransplantObject(JSContext* cx, HandleObject origobj, HandleObject target) /* * Recompute all cross-compartment wrappers for an object, resetting state. - * Goanna uses this to clear Xray wrappers when doing a navigation that reuses + * Gecko uses this to clear Xray wrappers when doing a navigation that reuses * the inner window and global object. */ JS_PUBLIC_API(bool) diff --git a/js/src/jsapi.h b/js/src/jsapi.h index acf88f2390..d67be667f1 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h @@ -1330,7 +1330,7 @@ class JS_PUBLIC_API(ContextOptions) { // JS_ReportError* functions that eventually report the error even when dontReportUncaught is // set, if script is not running. We want a way to indicate that the embedder will always // handle any exceptions, and that SpiderMonkey should just leave them on the context. This is - // the way we want to do all future error handling in Goanna - stealing the exception explicitly + // the way we want to do all future error handling in Gecko - stealing the exception explicitly // from the context and handling it as per the situation. This will eventually become the // default and these 2 flags should go away. bool autoJSAPIOwnsErrorReporting_ : 1; diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp index b46d88690b..3048fce873 100644 --- a/js/src/jscntxt.cpp +++ b/js/src/jscntxt.cpp @@ -1047,12 +1047,12 @@ ComputeIsJITBroken() // Check for the known-bad kernel version (2.6.29). std::ifstream osrelease("/proc/sys/kernel/osrelease"); std::getline(osrelease, line); - __android_log_print(ANDROID_LOG_INFO, "Goanna", "Detected osrelease `%s'", + __android_log_print(ANDROID_LOG_INFO, "Gecko", "Detected osrelease `%s'", line.c_str()); if (line.npos == line.find("2.6.29")) { // We're using something other than 2.6.29, so the JITs should work. - __android_log_print(ANDROID_LOG_INFO, "Goanna", "JITs are not broken"); + __android_log_print(ANDROID_LOG_INFO, "Gecko", "JITs are not broken"); return false; } @@ -1073,7 +1073,7 @@ ComputeIsJITBroken() }; for (const char* const* hw = &blacklist[0]; *hw; ++hw) { if (line.npos != line.find(*hw)) { - __android_log_print(ANDROID_LOG_INFO, "Goanna", + __android_log_print(ANDROID_LOG_INFO, "Gecko", "Blacklisted device `%s'", *hw); broken = true; break; @@ -1084,7 +1084,7 @@ ComputeIsJITBroken() std::getline(cpuinfo, line); } while(!cpuinfo.fail() && !cpuinfo.eof()); - __android_log_print(ANDROID_LOG_INFO, "Goanna", "JITs are %sbroken", + __android_log_print(ANDROID_LOG_INFO, "Gecko", "JITs are %sbroken", broken ? "" : "not "); return broken; diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h index b2752274b7..a4807e2500 100644 --- a/js/src/jsfriendapi.h +++ b/js/src/jsfriendapi.h @@ -2410,7 +2410,7 @@ SET_JITINFO(JSFunction * func, const JSJitInfo* info) /* * Engine-internal extensions of jsid. This code is here only until we - * eliminate Goanna's dependencies on it! + * eliminate Gecko's dependencies on it! */ static MOZ_ALWAYS_INLINE jsid @@ -2638,7 +2638,7 @@ typedef long // This would be wrong if there was an outer __try block that expected to handle // the fault, but this is not generally allowed. // -// Goanna must call SetJitExceptionFilter before any JIT code is compiled and +// Gecko must call SetJitExceptionFilter before any JIT code is compiled and // only once per process. extern JS_FRIEND_API(void) SetJitExceptionHandler(JitExceptionHandler handler); diff --git a/js/src/jstypes.h b/js/src/jstypes.h index 16dce30d8d..0eea6bfd91 100644 --- a/js/src/jstypes.h +++ b/js/src/jstypes.h @@ -30,7 +30,7 @@ // So include them here. // XXX: including them in js/RequiredDefines.h should be a better option, since // that is by definition the header file that should be included in all -// SpiderMonkey code. However, Goanna doesn't do this! See bug 909576. +// SpiderMonkey code. However, Gecko doesn't do this! See bug 909576. #include "js-config.h" #include "jsversion.h" diff --git a/js/src/moz.build b/js/src/moz.build index ceb1a51c97..077e5165c2 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -442,7 +442,7 @@ HostSimplePrograms([ # JS shell would like to link to the static library. if CONFIG['JS_SHARED_LIBRARY']: - GoannaSharedLibrary('js', linkage=None) + GeckoSharedLibrary('js', linkage=None) SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME'] SDK_LIBRARY = True else: diff --git a/js/src/octane/mandreel.js b/js/src/octane/mandreel.js index 862d51b4b0..82ebd23d36 100644 --- a/js/src/octane/mandreel.js +++ b/js/src/octane/mandreel.js @@ -443,7 +443,7 @@ var mandreel_BrowserDetect = { }, { string: navigator.userAgent, - subString: "Goanna", + subString: "Gecko", identity: "Mozilla", versionSearch: "rv" }, diff --git a/js/src/octane/pdfjs.js b/js/src/octane/pdfjs.js index 53476a0cd5..79537541df 100644 --- a/js/src/octane/pdfjs.js +++ b/js/src/octane/pdfjs.js @@ -14538,7 +14538,7 @@ var FontLoader = { // following code is a dirty hack to 'guess' when a font is // ready. This code will be obsoleted by Mozilla bug 471915. // - // The only reliable way to know if a font is loaded in Goanna + // The only reliable way to know if a font is loaded in Gecko // (at the moment) is document.onload in a document with // a @font-face rule defined in a "static" stylesheet. We use a // subdocument in an
    characterGoannaIE7(C)IE7(N)Opera9.2(C)Opera9.2(N)
    characterGeckoIE7(C)IE7(N)Opera9.2(C)Opera9.2(N)
    characterGoannaIE7(C)IE7(N)Opera9.2(C)Opera9.2(N)
    characterGeckoIE7(C)IE7(N)Opera9.2(C)Opera9.2(N)
    0x21!AA