From ecf0a07d125e6d5dc32a9eaeb485c1f554100381 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 28 Feb 2020 12:05:19 -0500 Subject: [PATCH 01/12] Issue #1319 - Remove EARLY_BETA_OR_EARLIER condition --- build/defines.sh | 3 --- media/mtransport/nr_socket_prsock.cpp | 17 +---------------- old-configure.in | 13 ------------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 build/defines.sh diff --git a/build/defines.sh b/build/defines.sh deleted file mode 100644 index cf98c3d8bf..0000000000 --- a/build/defines.sh +++ /dev/null @@ -1,3 +0,0 @@ -# Define indicating that this build is prior to one of the early betas. To be -# unset mid-way through the beta cycle. -EARLY_BETA_OR_EARLIER= diff --git a/media/mtransport/nr_socket_prsock.cpp b/media/mtransport/nr_socket_prsock.cpp index f22229df86..a95ef10292 100644 --- a/media/mtransport/nr_socket_prsock.cpp +++ b/media/mtransport/nr_socket_prsock.cpp @@ -760,15 +760,7 @@ static int ShouldDrop(size_t len) { nr_socket_short_term_violation_time = TimeStamp::Now(); #endif -// Bug 1013007 -#if !EARLY_BETA_OR_EARLIER return R_WOULDBLOCK; -#else - MOZ_ASSERT(false, - "Short term global rate limit for STUN requests exceeded. Go " - "bug bcampen@mozilla.com if you weren't intentionally " - "spamming ICE candidates, or don't know what that means."); -#endif } if (sustained.getTokens(UINT32_MAX) < len) { @@ -777,15 +769,8 @@ static int ShouldDrop(size_t len) { #ifdef MOZILLA_INTERNAL_API nr_socket_long_term_violation_time = TimeStamp::Now(); #endif -// Bug 1013007 -#if !EARLY_BETA_OR_EARLIER + return R_WOULDBLOCK; -#else - MOZ_ASSERT(false, - "Long term global rate limit for STUN requests exceeded. Go " - "bug bcampen@mozilla.com if you weren't intentionally " - "spamming ICE candidates, or don't know what that means."); -#endif } // Take len tokens from both buckets. diff --git a/old-configure.in b/old-configure.in index 0af3e356b4..72b97bf8a8 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2236,19 +2236,6 @@ else AC_MSG_RESULT([no]) fi -# Allow influencing configure with a defines.sh script. -. "${srcdir}/build/defines.sh" - -# If we're not building a release build, define EARLY_BETA_OR_EARLIER if it is -# set in defines.sh -if test "$BUILDING_RELEASE"; then - # Override value in defines.sh, if any - EARLY_BETA_OR_EARLIER= -elif test "$EARLY_BETA_OR_EARLIER"; then - AC_DEFINE(EARLY_BETA_OR_EARLIER) -fi -AC_SUBST(EARLY_BETA_OR_EARLIER) - # Allow someone to change MOZ_APP_NAME and MOZ_APP_BASENAME in mozconfig MOZ_ARG_WITH_STRING(app-name, [--with-app-name=APPNAME sets MOZ_APP_NAME to APPNAME], From 8dbd3045dcfe507b5d0dc54baffeb003fc26ca5d Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 28 Feb 2020 15:01:13 -0500 Subject: [PATCH 02/12] Correct typo in mailnews/base/src/moz.build --- mailnews/base/src/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailnews/base/src/moz.build b/mailnews/base/src/moz.build index 69090b3b39..034d2e9bbf 100644 --- a/mailnews/base/src/moz.build +++ b/mailnews/base/src/moz.build @@ -75,7 +75,7 @@ if CONFIG['MOZ_MAILNEWS_OAUTH2']: EXTRA_COMPONENTS += ['msgOAuth2Module.js'] EXTRA_PP_COMPONENTS += [ - 'msgBase.manifest' + 'msgBase.manifest', 'nsMailNewsCommandLineHandler.js', ] From dad2b31c839cb72bd09c780e6c78a3a236a4b658 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 28 Feb 2020 15:01:37 -0500 Subject: [PATCH 03/12] Mork is not dependent on dbm and never was. --- db/mork/moz.build | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/db/mork/moz.build b/db/mork/moz.build index a4cc91c194..25d1281226 100644 --- a/db/mork/moz.build +++ b/db/mork/moz.build @@ -3,9 +3,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -if not CONFIG['NSS_DISABLE_DBM'] and CONFIG['MOZ_MORK']: - DIRS += [ - 'public', - 'src', - 'build', - ] +DIRS += [ + 'public', + 'src', + 'build', +] From 2bc74563e15cb0bf9c469558b3d767f8f455fde2 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 28 Feb 2020 15:11:25 -0500 Subject: [PATCH 04/12] Remove unused mailnews.mozbuild --- mailnews/mailnews.mozbuild | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 mailnews/mailnews.mozbuild diff --git a/mailnews/mailnews.mozbuild b/mailnews/mailnews.mozbuild deleted file mode 100644 index 12ae6cd2e4..0000000000 --- a/mailnews/mailnews.mozbuild +++ /dev/null @@ -1,16 +0,0 @@ -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -if CONFIG['MOZ_LDAP_XPCOM']: - DIRS += [ - '/ldap', - '/ldap/xpcom', - ] - -if CONFIG['MOZ_MORK']: - DIRS += ['/db'] - -DIRS += ['/mailnews'] - From 57552faa1ddfde0e954edcf1119e6cbac5de9cbd Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 28 Feb 2020 16:21:05 -0500 Subject: [PATCH 05/12] Issue #251 - Move --disable-dbm to ac configure Also Tag #1467 --- build/moz.configure/old.configure | 1 + old-configure.in | 17 +++++++++++++++++ toolkit/moz.configure | 2 -- toolkit/nss.configure | 16 ---------------- 4 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 toolkit/nss.configure diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index c9154ce71f..e48d67a47f 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -166,6 +166,7 @@ def old_configure_options(*options): '--enable-cookies', '--enable-cpp-rtti', '--enable-crashreporter', + '--enable-dbm', '--enable-dbus', '--enable-debug-js-modules', '--enable-jetpack', diff --git a/old-configure.in b/old-configure.in index 72b97bf8a8..2123d9f3d3 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2168,6 +2168,7 @@ MOZ_PLACES=1 MOZ_SERVICES_HEALTHREPORT=1 MOZ_SERVICES_SYNC=1 MOZ_USERINFO=1 +NSS_DISABLE_DBM= MOZ_MAILNEWS= MOZ_MAILNEWS_OAUTH2= MOZ_LDAP_XPCOM= @@ -2708,6 +2709,22 @@ x86_64 | arm | aarch64 | x86 | ppc* | ia64) esac +dnl ========================================================= +dnl = NSS DBM (BerkeleyDB) Support +dnl = NOTE: Because we don't expressly control the name of +dnl = this var --disable-dbm means NSS_DISABLE_DBM=1 +dnl ========================================================= +MOZ_ARG_DISABLE_BOOL(dbm, +[ --disable-dbm Disable DBM support in nss], + NSS_DISABLE_DBM=1, + NSS_DISABLE_DBM=) + +if test -n "$NSS_DISABLE_DBM"; then + AC_DEFINE(NSS_DISABLE_DBM) +fi + +AC_SUBST(NSS_DISABLE_DBM) + dnl ========================================================= dnl = Don't fold mailnews related comps into libXUL dnl ========================================================= diff --git a/toolkit/moz.configure b/toolkit/moz.configure index ca7f91e6e4..128402257f 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -559,8 +559,6 @@ option('--enable-ipdl-tests', help='Enable expensive IPDL tests') set_config('MOZ_IPDL_TESTS', depends_if('--enable-ipdl-tests')(lambda _: True)) -include('nss.configure') - # Network protocol support # ============================================================== @depends(check_build_environment, '--help') diff --git a/toolkit/nss.configure b/toolkit/nss.configure deleted file mode 100644 index 0febafb34a..0000000000 --- a/toolkit/nss.configure +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - -# DBM support in NSS -# ============================================================== -@depends(build_project, '--help') -def dbm_default(build_project, _): - return True - -option('--enable-dbm', default=dbm_default, help='Enable building DBM') - -set_config('NSS_DISABLE_DBM', depends('--enable-dbm')(lambda x: not x)) From 56f64bd775dc8577dac4d8eead0e978b2d665d7e Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 28 Feb 2020 16:51:00 -0500 Subject: [PATCH 06/12] Issue #1053 - Remove android support from nsNSSComponent.cpp --- security/manager/ssl/nsNSSComponent.cpp | 78 ++++++------------------- 1 file changed, 17 insertions(+), 61 deletions(-) diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp index 4d6c3963f3..dfff59da98 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp @@ -1267,26 +1267,19 @@ nsNSSComponent::InitializePIPNSSBundle() nsresult rv; nsCOMPtr bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv)); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv)); - MOZ_RELEASE_ASSERT(bundleService); -#endif + if (NS_FAILED(rv) || !bundleService) return NS_ERROR_FAILURE; bundleService->CreateBundle("chrome://pipnss/locale/pipnss.properties", getter_AddRefs(mPIPNSSBundle)); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(mPIPNSSBundle); -#endif + if (!mPIPNSSBundle) rv = NS_ERROR_FAILURE; bundleService->CreateBundle("chrome://pipnss/locale/nsserrors.properties", getter_AddRefs(mNSSErrorsBundle)); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(mNSSErrorsBundle); -#endif + if (!mNSSErrorsBundle) rv = NS_ERROR_FAILURE; @@ -1488,9 +1481,7 @@ CipherSuiteChangeObserver::StartObserve() if (!sObserver) { RefPtr observer = new CipherSuiteChangeObserver(); nsresult rv = Preferences::AddStrongObserver(observer.get(), "security."); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv)); -#endif + if (NS_FAILED(rv)) { sObserver = nullptr; return rv; @@ -1724,9 +1715,7 @@ GetNSSProfilePath(nsAutoCString& aProfilePath) #else rv = profileFile->GetNativePath(aProfilePath); #endif -#ifdef ANDROID - MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv)); -#endif + if (NS_FAILED(rv)) { MOZ_LOG(gPIPNSSLog, LogLevel::Error, ("Could not get native path for profile directory.\n")); @@ -1754,9 +1743,6 @@ nsNSSComponent::InitializeNSS() MutexAutoLock lock(mutex); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(!mNSSInitialized); -#endif if (mNSSInitialized) { // We should never try to initialize NSS more than once in a process. MOZ_ASSERT_UNREACHABLE("Trying to initialize NSS twice"); @@ -1775,9 +1761,7 @@ nsNSSComponent::InitializeNSS() nsAutoCString profileStr; nsresult rv = GetNSSProfilePath(profileStr); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv)); -#endif + if (NS_FAILED(rv)) { return NS_ERROR_NOT_AVAILABLE; } @@ -1791,9 +1775,7 @@ nsNSSComponent::InitializeNSS() // modules will be loaded). if (runtime) { rv = runtime->GetInSafeMode(&inSafeMode); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv)); -#endif + if (NS_FAILED(rv)) { return rv; } @@ -1818,14 +1800,9 @@ nsNSSComponent::InitializeNSS() // pref has been set to "true", attempt to initialize with no DB. if (nocertdb || init_rv != SECSuccess) { init_rv = NSS_NoDB_Init(nullptr); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(init_rv == SECSuccess); -#endif } + if (init_rv != SECSuccess) { -#ifdef ANDROID - MOZ_RELEASE_ASSERT(false); -#endif MOZ_LOG(gPIPNSSLog, LogLevel::Error, ("could not initialize NSS - panicking\n")); return NS_ERROR_NOT_AVAILABLE; } @@ -1847,9 +1824,7 @@ nsNSSComponent::InitializeNSS() SSL_OptionSetDefault(SSL_V2_COMPATIBLE_HELLO, false); rv = setEnabledTLSVersions(); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv)); -#endif + if (NS_FAILED(rv)) { return NS_ERROR_UNEXPECTED; } @@ -1858,9 +1833,7 @@ nsNSSComponent::InitializeNSS() LoadLoadableRoots(); rv = LoadExtendedValidationInfo(); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv)); -#endif + if (NS_FAILED(rv)) { MOZ_LOG(gPIPNSSLog, LogLevel::Error, ("failed to load EV info")); return rv; @@ -1900,18 +1873,14 @@ nsNSSComponent::InitializeNSS() ENABLED_0RTT_DATA_DEFAULT)); if (NS_FAILED(InitializeCipherSuite())) { -#ifdef ANDROID - MOZ_RELEASE_ASSERT(false); -#endif + MOZ_LOG(gPIPNSSLog, LogLevel::Error, ("Unable to initialize cipher suite settings\n")); return NS_ERROR_FAILURE; } // ensure the CertBlocklist is initialised nsCOMPtr certList = do_GetService(NS_CERTBLOCKLIST_CONTRACTID); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(certList); -#endif + if (!certList) { return NS_ERROR_FAILURE; } @@ -1928,9 +1897,7 @@ nsNSSComponent::InitializeNSS() // Initialize the site security service nsCOMPtr sssService = do_GetService(NS_SSSERVICE_CONTRACTID); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(sssService); -#endif + if (!sssService) { MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("Cannot initialize site security service\n")); return NS_ERROR_FAILURE; @@ -1939,9 +1906,7 @@ nsNSSComponent::InitializeNSS() // Initialize the cert override service nsCOMPtr coService = do_GetService(NS_CERTOVERRIDE_CONTRACTID); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(coService); -#endif + if (!coService) { MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("Cannot initialize cert override service\n")); return NS_ERROR_FAILURE; @@ -2010,9 +1975,7 @@ nsNSSComponent::Init() MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("Beginning NSS initialization\n")); rv = InitializePIPNSSBundle(); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv)); -#endif + if (NS_FAILED(rv)) { MOZ_LOG(gPIPNSSLog, LogLevel::Error, ("Unable to create pipnss bundle.\n")); return rv; @@ -2033,9 +1996,7 @@ nsNSSComponent::Init() rv = InitializeNSS(); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv)); -#endif + if (NS_FAILED(rv)) { MOZ_LOG(gPIPNSSLog, LogLevel::Error, ("nsNSSComponent::InitializeNSS() failed\n")); @@ -2197,9 +2158,7 @@ nsNSSComponent::RegisterObservers() nsCOMPtr observerService( do_GetService("@mozilla.org/observer-service;1")); -#ifdef ANDROID - MOZ_RELEASE_ASSERT(observerService); -#endif + if (!observerService) { MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("nsNSSComponent: couldn't get observer service\n")); @@ -2421,9 +2380,6 @@ InitializeCipherSuite() NS_ASSERTION(NS_IsMainThread(), "InitializeCipherSuite() can only be accessed in main thread"); if (NSS_SetDomesticPolicy() != SECSuccess) { -#ifdef ANDROID - MOZ_RELEASE_ASSERT(false); -#endif return NS_ERROR_FAILURE; } From 3f4ebb1c7c5e8920ad1d7fc2ff69c951e90b6146 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 28 Feb 2020 17:19:05 -0500 Subject: [PATCH 07/12] Issue #1053 - Remove android-only skia-npapi --- other-licenses/skia-npapi/ANPCanvas.cpp | 199 --------------------- other-licenses/skia-npapi/ANPPaint.cpp | 208 ---------------------- other-licenses/skia-npapi/ANPTypeface.cpp | 110 ------------ other-licenses/skia-npapi/SkANP.cpp | 107 ----------- other-licenses/skia-npapi/SkANP.h | 79 -------- other-licenses/skia-npapi/moz.build | 31 ---- 6 files changed, 734 deletions(-) delete mode 100644 other-licenses/skia-npapi/ANPCanvas.cpp delete mode 100644 other-licenses/skia-npapi/ANPPaint.cpp delete mode 100644 other-licenses/skia-npapi/ANPTypeface.cpp delete mode 100644 other-licenses/skia-npapi/SkANP.cpp delete mode 100644 other-licenses/skia-npapi/SkANP.h delete mode 100644 other-licenses/skia-npapi/moz.build diff --git a/other-licenses/skia-npapi/ANPCanvas.cpp b/other-licenses/skia-npapi/ANPCanvas.cpp deleted file mode 100644 index dd227eca8d..0000000000 --- a/other-licenses/skia-npapi/ANPCanvas.cpp +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright 2008, The Android Open Source Project - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -// must include config.h first for webkit to fiddle with new/delete -#include "SkANP.h" -#include "SkRect.h" - -static ANPCanvas* anp_newCanvas(const ANPBitmap* bitmap) { - SkBitmap bm; - return new ANPCanvas(*SkANP::SetBitmap(&bm, *bitmap)); -} - -static void anp_deleteCanvas(ANPCanvas* canvas) { - delete canvas; -} - -static void anp_save(ANPCanvas* canvas) { - canvas->skcanvas->save(); -} - -static void anp_restore(ANPCanvas* canvas) { - canvas->skcanvas->restore(); -} - -static void anp_translate(ANPCanvas* canvas, float tx, float ty) { - canvas->skcanvas->translate(SkFloatToScalar(tx), SkFloatToScalar(ty)); -} - -static void anp_scale(ANPCanvas* canvas, float sx, float sy) { - canvas->skcanvas->scale(SkFloatToScalar(sx), SkFloatToScalar(sy)); -} - -static void anp_rotate(ANPCanvas* canvas, float degrees) { - canvas->skcanvas->rotate(SkFloatToScalar(degrees)); -} - -static void anp_skew(ANPCanvas* canvas, float kx, float ky) { - canvas->skcanvas->skew(SkFloatToScalar(kx), SkFloatToScalar(ky)); -} - -static void anp_clipRect(ANPCanvas* canvas, const ANPRectF* rect) { - SkRect r; - canvas->skcanvas->clipRect(*SkANP::SetRect(&r, *rect)); -} - -static void anp_clipPath(ANPCanvas* canvas, const ANPPath* path) { - canvas->skcanvas->clipPath(*path); -} -static void anp_concat(ANPCanvas* canvas, const ANPMatrix* matrix) { - canvas->skcanvas->concat(*matrix); -} - -static void anp_getTotalMatrix(ANPCanvas* canvas, ANPMatrix* matrix) { - const SkMatrix& src = canvas->skcanvas->getTotalMatrix(); - *matrix = *reinterpret_cast(&src); -} - -static bool anp_getLocalClipBounds(ANPCanvas* canvas, ANPRectF* r, - bool antialias) { - SkRect bounds; - if (canvas->skcanvas->getClipBounds(&bounds)) { - SkANP::SetRect(r, bounds); - return true; - } - return false; -} - -static bool anp_getDeviceClipBounds(ANPCanvas* canvas, ANPRectI* r) { - SkIRect bounds; - if (canvas->skcanvas->getClipDeviceBounds(&bounds)) { - SkANP::SetRect(r, bounds); - return true; - } - return false; -} - -static void anp_drawColor(ANPCanvas* canvas, ANPColor color) { - canvas->skcanvas->drawColor(color); -} - -static void anp_drawPaint(ANPCanvas* canvas, const ANPPaint* paint) { - canvas->skcanvas->drawPaint(*paint); -} - -static void anp_drawLine(ANPCanvas* canvas, float x0, float y0, - float x1, float y1, const ANPPaint* paint) { - canvas->skcanvas->drawLine(SkFloatToScalar(x0), SkFloatToScalar(y0), - SkFloatToScalar(x1), SkFloatToScalar(y1), *paint); -} - -static void anp_drawRect(ANPCanvas* canvas, const ANPRectF* rect, - const ANPPaint* paint) { - SkRect r; - canvas->skcanvas->drawRect(*SkANP::SetRect(&r, *rect), *paint); -} - -static void anp_drawOval(ANPCanvas* canvas, const ANPRectF* rect, - const ANPPaint* paint) { - SkRect r; - canvas->skcanvas->drawOval(*SkANP::SetRect(&r, *rect), *paint); -} - -static void anp_drawPath(ANPCanvas* canvas, const ANPPath* path, - const ANPPaint* paint) { - canvas->skcanvas->drawPath(*path, *paint); -} - -static void anp_drawText(ANPCanvas* canvas, const void* text, uint32_t length, - float x, float y, const ANPPaint* paint) { - canvas->skcanvas->drawText(text, length, - SkFloatToScalar(x), SkFloatToScalar(y), - *paint); -} - -static void anp_drawPosText(ANPCanvas* canvas, const void* text, - uint32_t byteLength, const float xy[], const ANPPaint* paint) { - canvas->skcanvas->drawPosText(text, byteLength, - reinterpret_cast(xy), *paint); -} - -static void anp_drawBitmap(ANPCanvas* canvas, const ANPBitmap* bitmap, - float x, float y, const ANPPaint* paint) { - SkBitmap bm; - canvas->skcanvas->drawBitmap(*SkANP::SetBitmap(&bm, *bitmap), - SkFloatToScalar(x), SkFloatToScalar(y), - paint); -} - -static void anp_drawBitmapRect(ANPCanvas* canvas, const ANPBitmap* bitmap, - const ANPRectI* src, const ANPRectF* dst, - const ANPPaint* paint) { - SkBitmap bm; - SkRect dstR; - SkIRect srcR; - - if (src) { - canvas->skcanvas->drawBitmapRect(*SkANP::SetBitmap(&bm, *bitmap), - *SkANP::SetRect(&srcR, *src), - *SkANP::SetRect(&dstR, *dst), - paint); - } else { - canvas->skcanvas->drawBitmapRect(*SkANP::SetBitmap(&bm, *bitmap), - *SkANP::SetRect(&dstR, *dst), - paint); - } -} - -/////////////////////////////////////////////////////////////////////////////// - -#define ASSIGN(obj, name) (obj)->name = anp_##name - -void InitCanvasInterface(ANPCanvasInterfaceV0* i) { - ASSIGN(i, newCanvas); - ASSIGN(i, deleteCanvas); - ASSIGN(i, save); - ASSIGN(i, restore); - ASSIGN(i, translate); - ASSIGN(i, scale); - ASSIGN(i, rotate); - ASSIGN(i, skew); - ASSIGN(i, clipRect); - ASSIGN(i, clipPath); - ASSIGN(i, concat); - ASSIGN(i, getTotalMatrix); - ASSIGN(i, getLocalClipBounds); - ASSIGN(i, getDeviceClipBounds); - ASSIGN(i, drawColor); - ASSIGN(i, drawPaint); - ASSIGN(i, drawLine); - ASSIGN(i, drawRect); - ASSIGN(i, drawOval); - ASSIGN(i, drawPath); - ASSIGN(i, drawText); - ASSIGN(i, drawPosText); - ASSIGN(i, drawBitmap); - ASSIGN(i, drawBitmapRect); -} diff --git a/other-licenses/skia-npapi/ANPPaint.cpp b/other-licenses/skia-npapi/ANPPaint.cpp deleted file mode 100644 index cc67e1dd85..0000000000 --- a/other-licenses/skia-npapi/ANPPaint.cpp +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright 2008, The Android Open Source Project - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -// must include config.h first for webkit to fiddle with new/delete -#include "SkANP.h" - -static ANPPaint* anp_newPaint() { - return new ANPPaint; -} - -static void anp_deletePaint(ANPPaint* paint) { - delete paint; -} - -static ANPPaintFlags anp_getFlags(const ANPPaint* paint) { - return paint->getFlags(); -} - -static void anp_setFlags(ANPPaint* paint, ANPPaintFlags flags) { - paint->setFlags(flags); -} - -static ANPColor anp_getColor(const ANPPaint* paint) { - return paint->getColor(); -} - -static void anp_setColor(ANPPaint* paint, ANPColor color) { - paint->setColor(color); -} - -static ANPPaintStyle anp_getStyle(const ANPPaint* paint) { - return paint->getStyle(); -} - -static void anp_setStyle(ANPPaint* paint, ANPPaintStyle style) { - paint->setStyle(static_cast(style)); -} - -static float anp_getStrokeWidth(const ANPPaint* paint) { - return SkScalarToFloat(paint->getStrokeWidth()); -} - -static float anp_getStrokeMiter(const ANPPaint* paint) { - return SkScalarToFloat(paint->getStrokeMiter()); -} - -static ANPPaintCap anp_getStrokeCap(const ANPPaint* paint) { - return paint->getStrokeCap(); -} - -static ANPPaintJoin anp_getStrokeJoin(const ANPPaint* paint) { - return paint->getStrokeJoin(); -} - -static void anp_setStrokeWidth(ANPPaint* paint, float width) { - paint->setStrokeWidth(SkFloatToScalar(width)); -} - -static void anp_setStrokeMiter(ANPPaint* paint, float miter) { - paint->setStrokeMiter(SkFloatToScalar(miter)); -} - -static void anp_setStrokeCap(ANPPaint* paint, ANPPaintCap cap) { - paint->setStrokeCap(static_cast(cap)); -} - -static void anp_setStrokeJoin(ANPPaint* paint, ANPPaintJoin join) { - paint->setStrokeJoin(static_cast(join)); -} - -static ANPTextEncoding anp_getTextEncoding(const ANPPaint* paint) { - return paint->getTextEncoding(); -} - -static ANPPaintAlign anp_getTextAlign(const ANPPaint* paint) { - return paint->getTextAlign(); -} - -static float anp_getTextSize(const ANPPaint* paint) { - return SkScalarToFloat(paint->getTextSize()); -} - -static float anp_getTextScaleX(const ANPPaint* paint) { - return SkScalarToFloat(paint->getTextScaleX()); -} - -static float anp_getTextSkewX(const ANPPaint* paint) { - return SkScalarToFloat(paint->getTextSkewX()); -} - -static ANPTypeface* anp_getTypeface(const ANPPaint* paint) { - return reinterpret_cast(paint->getTypeface()); -} - -static void anp_setTextEncoding(ANPPaint* paint, ANPTextEncoding encoding) { - paint->setTextEncoding(static_cast(encoding)); -} - -static void anp_setTextAlign(ANPPaint* paint, ANPPaintAlign align) { - paint->setTextAlign(static_cast(align)); -} - -static void anp_setTextSize(ANPPaint* paint, float textSize) { - paint->setTextSize(SkFloatToScalar(textSize)); -} - -static void anp_setTextScaleX(ANPPaint* paint, float scaleX) { - paint->setTextScaleX(SkFloatToScalar(scaleX)); -} - -static void anp_setTextSkewX(ANPPaint* paint, float skewX) { - paint->setTextSkewX(SkFloatToScalar(skewX)); -} - -static void anp_setTypeface(ANPPaint* paint, ANPTypeface* tf) { - paint->setTypeface(sk_ref_sp(tf)); -} - -static float anp_measureText(ANPPaint* paint, const void* text, - uint32_t byteLength, ANPRectF* bounds) { - SkScalar w = paint->measureText(text, byteLength, - reinterpret_cast(bounds)); - return SkScalarToFloat(w); -} - -/** Return the number of unichars specifed by the text. - If widths is not null, returns the array of advance widths for each - unichar. - If bounds is not null, returns the array of bounds for each unichar. - */ -static int anp_getTextWidths(ANPPaint* paint, const void* text, - uint32_t byteLength, float widths[], ANPRectF bounds[]) { - return paint->getTextWidths(text, byteLength, widths, - reinterpret_cast(bounds)); -} - -static float anp_getFontMetrics(ANPPaint* paint, ANPFontMetrics* metrics) { - SkPaint::FontMetrics fm; - SkScalar spacing = paint->getFontMetrics(&fm); - if (metrics) { - metrics->fTop = SkScalarToFloat(fm.fTop); - metrics->fAscent = SkScalarToFloat(fm.fAscent); - metrics->fDescent = SkScalarToFloat(fm.fDescent); - metrics->fBottom = SkScalarToFloat(fm.fBottom); - metrics->fLeading = SkScalarToFloat(fm.fLeading); - } - return SkScalarToFloat(spacing); -} - -/////////////////////////////////////////////////////////////////////////////// - -#define ASSIGN(obj, name) (obj)->name = anp_##name - -void InitPaintInterface(ANPPaintInterfaceV0* i) { - ASSIGN(i, newPaint); - ASSIGN(i, deletePaint); - ASSIGN(i, getFlags); - ASSIGN(i, setFlags); - ASSIGN(i, getColor); - ASSIGN(i, setColor); - ASSIGN(i, getStyle); - ASSIGN(i, setStyle); - ASSIGN(i, getStrokeWidth); - ASSIGN(i, getStrokeMiter); - ASSIGN(i, getStrokeCap); - ASSIGN(i, getStrokeJoin); - ASSIGN(i, setStrokeWidth); - ASSIGN(i, setStrokeMiter); - ASSIGN(i, setStrokeCap); - ASSIGN(i, setStrokeJoin); - ASSIGN(i, getTextEncoding); - ASSIGN(i, getTextAlign); - ASSIGN(i, getTextSize); - ASSIGN(i, getTextScaleX); - ASSIGN(i, getTextSkewX); - ASSIGN(i, getTypeface); - ASSIGN(i, setTextEncoding); - ASSIGN(i, setTextAlign); - ASSIGN(i, setTextSize); - ASSIGN(i, setTextScaleX); - ASSIGN(i, setTextSkewX); - ASSIGN(i, setTypeface); - ASSIGN(i, measureText); - ASSIGN(i, getTextWidths); - ASSIGN(i, getFontMetrics); -} diff --git a/other-licenses/skia-npapi/ANPTypeface.cpp b/other-licenses/skia-npapi/ANPTypeface.cpp deleted file mode 100644 index 48e3f898de..0000000000 --- a/other-licenses/skia-npapi/ANPTypeface.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 2008, The Android Open Source Project - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -// must include config.h first for webkit to fiddle with new/delete -#include "SkANP.h" -#include "SkStream.h" -#include - -static ANPTypeface* anp_createFromName(const char name[], ANPTypefaceStyle s) { - sk_sp tf = SkTypeface::MakeFromName(name, - SkFontStyle::FromOldStyle(s)); - return reinterpret_cast(tf.release()); -} - -static ANPTypeface* anp_createFromTypeface(const ANPTypeface* family, - ANPTypefaceStyle s) { - sk_sp tf = SkTypeface::MakeFromTypeface(const_cast(family), - static_cast(s)); - return reinterpret_cast(tf.release()); -} - -static int32_t anp_getRefCount(const ANPTypeface* tf) { - return tf ? tf->getRefCnt() : 0; -} - -static void anp_ref(ANPTypeface* tf) { - SkSafeRef(tf); -} - -static void anp_unref(ANPTypeface* tf) { - SkSafeUnref(tf); -} - -static ANPTypefaceStyle anp_getStyle(const ANPTypeface* tf) { - SkTypeface::Style s = tf ? tf->style() : SkTypeface::kNormal; - return static_cast(s); -} - -static int32_t anp_getFontPath(const ANPTypeface* tf, char fileName[], - int32_t length, int32_t* index) { - return 0; - /* - SkStream* stream = tf->openStream(index); - if (stream->getFileName()) { - strcpy(fileName, stream->getFileName()); - } else { - return 0; - } - - return strlen(fileName); - */ -} - -static const char* gFontDir; -#define FONT_DIR_SUFFIX "/fonts/" - -static const char* anp_getFontDirectoryPath() { - if (NULL == gFontDir) { - const char* root = getenv("ANDROID_ROOT"); - size_t len = strlen(root); - char* storage = (char*)malloc(len + sizeof(FONT_DIR_SUFFIX)); - if (NULL == storage) { - return NULL; - } - memcpy(storage, root, len); - memcpy(storage + len, FONT_DIR_SUFFIX, sizeof(FONT_DIR_SUFFIX)); - // save this assignment for last, so that if multiple threads call us - // (which should never happen), we never return an incomplete global. - // At worst, we would allocate storage for the path twice. - gFontDir = storage; - } - return gFontDir; -} - -/////////////////////////////////////////////////////////////////////////////// - -#define ASSIGN(obj, name) (obj)->name = anp_##name - -void InitTypeFaceInterface(ANPTypefaceInterfaceV0* i) { - ASSIGN(i, createFromName); - ASSIGN(i, createFromTypeface); - ASSIGN(i, getRefCount); - ASSIGN(i, ref); - ASSIGN(i, unref); - ASSIGN(i, getStyle); - ASSIGN(i, getFontPath); - ASSIGN(i, getFontDirectoryPath); -} diff --git a/other-licenses/skia-npapi/SkANP.cpp b/other-licenses/skia-npapi/SkANP.cpp deleted file mode 100644 index db9302bcdf..0000000000 --- a/other-licenses/skia-npapi/SkANP.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2008, The Android Open Source Project - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -// must include config.h first for webkit to fiddle with new/delete -#include "SkANP.h" - -SkRect* SkANP::SetRect(SkRect* dst, const ANPRectF& src) { - dst->set(SkFloatToScalar(src.left), - SkFloatToScalar(src.top), - SkFloatToScalar(src.right), - SkFloatToScalar(src.bottom)); - return dst; -} - -SkIRect* SkANP::SetRect(SkIRect* dst, const ANPRectI& src) { - dst->set(src.left, src.top, src.right, src.bottom); - return dst; -} - -ANPRectI* SkANP::SetRect(ANPRectI* dst, const SkIRect& src) { - dst->left = src.fLeft; - dst->top = src.fTop; - dst->right = src.fRight; - dst->bottom = src.fBottom; - return dst; -} - -ANPRectF* SkANP::SetRect(ANPRectF* dst, const SkRect& src) { - dst->left = SkScalarToFloat(src.fLeft); - dst->top = SkScalarToFloat(src.fTop); - dst->right = SkScalarToFloat(src.fRight); - dst->bottom = SkScalarToFloat(src.fBottom); - return dst; -} - -SkBitmap* SkANP::SetBitmap(SkBitmap* dst, const ANPBitmap& src) { - SkColorType colorType = kUnknown_SkColorType; - - switch (src.format) { - case kRGBA_8888_ANPBitmapFormat: - // Let Skia choose the correct colour type for us based on its - // endianness. This should be correct. - colorType = kN32_SkColorType; - break; - case kRGB_565_ANPBitmapFormat: - colorType = kRGB_565_SkColorType; - break; - default: - break; - } - - SkImageInfo info = SkImageInfo::Make(src.width, src.height, colorType, kPremul_SkAlphaType); - dst->setInfo(info, src.rowBytes); - dst->setPixels(src.baseAddr); - return dst; -} - -bool SkANP::SetBitmap(ANPBitmap* dst, const SkBitmap& src) { - if (!(dst->baseAddr = src.getPixels())) { - SkDebugf("SkANP::SetBitmap - getPixels() returned null\n"); - return false; - } - - switch (src.colorType()) { - case SkColorType::kRGBA_8888_SkColorType: - dst->format = kRGBA_8888_ANPBitmapFormat; - break; - case SkColorType::kRGB_565_SkColorType: - dst->format = kRGB_565_ANPBitmapFormat; - break; - default: - SkDebugf("SkANP::SetBitmap - unsupported src.colorType %d\n", src.colorType()); - return false; - } - - dst->width = src.width(); - dst->height = src.height(); - dst->rowBytes = src.rowBytes(); - return true; -} - -void SkANP::InitEvent(ANPEvent* event, ANPEventType et) { - event->inSize = sizeof(ANPEvent); - event->eventType = et; -} diff --git a/other-licenses/skia-npapi/SkANP.h b/other-licenses/skia-npapi/SkANP.h deleted file mode 100644 index 5c2a936501..0000000000 --- a/other-licenses/skia-npapi/SkANP.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2008, The Android Open Source Project - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SkANP_DEFINED -#define SkANP_DEFINED - -#include "android_npapi.h" -#include "SkCanvas.h" -#include "SkMatrix.h" -#include "SkPaint.h" -#include "SkPath.h" -#include "SkTypeface.h" - -struct ANPMatrix : SkMatrix { -}; - -struct ANPPath : SkPath { -}; - -struct ANPPaint : SkPaint { -}; - -struct ANPTypeface : SkTypeface { -}; - -struct ANPCanvas { - SkCanvas* skcanvas; - - // draw into the specified bitmap - explicit ANPCanvas(const SkBitmap& bm) { - skcanvas = new SkCanvas(bm); - } - - // redirect all drawing to the specific SkCanvas - explicit ANPCanvas(SkCanvas* other) { - skcanvas = other; - skcanvas->ref(); - } - - ~ANPCanvas() { - skcanvas->unref(); - } -}; - -class SkANP { -public: - static SkRect* SetRect(SkRect* dst, const ANPRectF& src); - static SkIRect* SetRect(SkIRect* dst, const ANPRectI& src); - static ANPRectI* SetRect(ANPRectI* dst, const SkIRect& src); - static ANPRectF* SetRect(ANPRectF* dst, const SkRect& src); - static SkBitmap* SetBitmap(SkBitmap* dst, const ANPBitmap& src); - static bool SetBitmap(ANPBitmap* dst, const SkBitmap& src); - - static void InitEvent(ANPEvent* event, ANPEventType et); -}; - -#endif diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build deleted file mode 100644 index e53c2ef22d..0000000000 --- a/other-licenses/skia-npapi/moz.build +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -EXPORTS += [ - 'SkANP.h', -] - -UNIFIED_SOURCES += [ - 'ANPCanvas.cpp', - 'ANPPaint.cpp', - 'ANPTypeface.cpp', - 'SkANP.cpp', -] - -# We allow warnings for third-party code that can be updated from upstream. -ALLOW_COMPILER_WARNINGS = True - -FINAL_LIBRARY = 'xul' - -DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True - -LOCAL_INCLUDES += [ - '/dom/plugins/base', - '/dom/plugins/base/android', - '/gfx/gl', - '/gfx/skia/skia/include/config', - '/gfx/skia/skia/include/core', -] From 9532e6f02e24b406af4aa4d4f897384a71f6491c Mon Sep 17 00:00:00 2001 From: New Tobin Paradigm Date: Wed, 4 Mar 2020 13:03:27 -0500 Subject: [PATCH 08/12] Remove exposed bug from UpdateUtils.jsm --- toolkit/modules/UpdateUtils.jsm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm index a84125be5d..397f7e33a8 100644 --- a/toolkit/modules/UpdateUtils.jsm +++ b/toolkit/modules/UpdateUtils.jsm @@ -164,12 +164,6 @@ XPCOMUtils.defineLazyGetter(this, "gSystemCapabilities", function aus_gSC() { lib.close(); return instructionSet; -#elifdef XP_LINUX - let instructionSet = "unknown"; - if (navigator.cpuHasSSE2) { - instructionSet = "SSE2"; - } - return instructionSet; #else return "NA" #endif From 9f19a67fcb8657616ea50a5dabf03aa442069136 Mon Sep 17 00:00:00 2001 From: JustOff Date: Sat, 29 Feb 2020 19:36:36 +0200 Subject: [PATCH 09/12] [Pale-Moon] Issue #1730 - Add 1.25x play speed to the html player context menu --- application/palemoon/base/content/browser-context.inc | 6 ++++++ application/palemoon/base/content/nsContextMenu.js | 2 ++ .../palemoon/locales/en-US/chrome/browser/browser.dtd | 2 ++ 3 files changed, 10 insertions(+) diff --git a/application/palemoon/base/content/browser-context.inc b/application/palemoon/base/content/browser-context.inc index 38c4725082..33ea7b1351 100644 --- a/application/palemoon/base/content/browser-context.inc +++ b/application/palemoon/base/content/browser-context.inc @@ -85,6 +85,12 @@ name="playbackrate" checked="true" oncommand="gContextMenu.mediaCommand('playbackRate', 1.0);"/> + + +