libre/iceweasel: updated to 56.0

7 files changed, 15 insertions, 331 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 0f88f24b7..0b96a0a8e 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -19,8 +19,8 @@ _oldname=firefox
 pkgname=iceweasel
 
 epoch=1
-pkgver=55.0.3
-pkgrel=3.1
+pkgver=56.0
+pkgrel=1
 _brandingver=54.0
 _brandingrel=1
 _parabolarepo=https://repo.parabola.nu/other/iceweasel
@@ -32,7 +32,7 @@ license=(MPL GPL LGPL)
 
 depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell 'icu=59.1' libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
 makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
-makedepends_i686=(rust)
+makedepends_i686=(rust clang llvm)
 makedepends_x86_64=("${makedepends_i686[@]}")
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
@@ -57,20 +57,16 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname
         distribution.ini
         enable-object-directory-paths.patch
         mozilla-1253216.patch
-        mozilla-1373988.patch
-        mozilla-1384655.patch
         no-crmf.patch
         mozilla-build-arm.patch
         wifi-disentangle.patch
         wifi-fix-interface.patch
-        glibc-2.26-fix.diff
-        harmony-fix.diff
-        clip-ft-glyph.diff)
-sha256sums=('891836df85f8798c49f7b25661820f64d1311d59703c716eda471819b93ccda2'
+        glibc-2.26-fix.diff)
+sha256sums=('0d8b7e91429f622c25509b7e73530807506ef3ff9f749d962251a35ed2bfed7e'
             '03191fa14ab599695b26361f2de6e93fbb518f24142689496480d78976cc52cb'
             'SKIP'
-            'baaa0665f81f7722a32c23f92c18aaf3203f0346acbe6c5bab45e01e69691bd8'
-            'edb33b378420836ab4990768c395a961aa71c3dad807480ae7e958574f5835a5'
+            'f448c1857a954b3b7e7af07c4dcea43e2bc73ff88dd8f2eada0ad16a40cb4eb6'
+            'ca7c59ca3c4f4240e0614562286085ede667986b2d1ffba044b29b0e310e626b'
             '32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
@@ -80,15 +76,11 @@ sha256sums=('891836df85f8798c49f7b25661820f64d1311d59703c716eda471819b93ccda2'
             'd28b14a870aa100273243039d08ab9e64d325c28b6291413441146ebdf5d38ee'
             'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484'
             'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65'
-            '644ec78361bc9fc64df706e9393a630e155c219202d0d557e424556820e30dcf'
-            'ce24a6532179aa2b772a6ae7cf186e226a4aaffcc234f1b62e9aadbf4f668e0a'
             '2f8064a67c025d306f14fdd83c0ecae8d256231ec76a98150acd89162d40c3e1'
             '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a'
             'f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed'
             'e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1'
-            'cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8'
-            '16bb776e9f3039321db747b2eaece0cda1320f3711fb853a68d67247b0aa065d'
-            'd5e5580a96ecc4a66ce12dde0737c1ed5cb31017a6ec488ffe372192ed893e1b')
+            'cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8')
 validpgpkeys=(
               'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin
 )
@@ -145,12 +137,6 @@ prepare() {
   patch -Np1 -i ../wifi-disentangle.patch
   patch -Np1 -i ../wifi-fix-interface.patch
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1393467
-  patch -Np1 -i ../clip-ft-glyph.diff
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1400721
-  patch -Np1 -i ../harmony-fix.diff
-
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
   patch -Np1 -i "$srcdir/no-crmf.patch"
 
@@ -158,12 +144,6 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1394149
   patch -Np1 -i ../glibc-2.26-fix.diff
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1373988
-  patch -Np1 -i "$srcdir/mozilla-1373988.patch"
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1384655
-  patch -Np1 -i "$srcdir/mozilla-1384655.patch"
-
   mkdir "$srcdir/path"
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
diff --git a/libre/iceweasel/clip-ft-glyph.diff b/libre/iceweasel/clip-ft-glyph.diff
deleted file mode 100644
index 4ca703504..000000000
--- a/libre/iceweasel/clip-ft-glyph.diff
+++ /dev/null
@@ -1,162 +0,0 @@
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1504120456 14400
-#      Wed Aug 30 15:14:16 2017 -0400
-# Node ID 708d52f954b6d7ca2497fcb5b5084c6483300e89
-# Parent  33224536ce20d942576cd4b9ffb350d6dce397bc
-clip FreeType glyph bitmap to mask in Skia
-
-MozReview-Commit-ID: 9NqLj9SkHFo
-
-diff --git a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
---- a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
-+++ b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
-@@ -390,65 +390,131 @@ void SkScalerContext_FreeType_Base::gene
-     const SkMatrix& bitmapTransform)
- {
-     const bool doBGR = SkToBool(fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag);
-     const bool doVert = SkToBool(fRec.fFlags & SkScalerContext::kLCD_Vertical_Flag);
- 
-     switch ( face->glyph->format ) {
-         case FT_GLYPH_FORMAT_OUTLINE: {
-             FT_Outline* outline = &face->glyph->outline;
--            FT_BBox     bbox;
--            FT_Bitmap   target;
- 
-             int dx = 0, dy = 0;
-             if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) {
-                 dx = SkFixedToFDot6(glyph.getSubXFixed());
-                 dy = SkFixedToFDot6(glyph.getSubYFixed());
-                 // negate dy since freetype-y-goes-up and skia-y-goes-down
-                 dy = -dy;
-             }
--            FT_Outline_Get_CBox(outline, &bbox);
--            /*
--                what we really want to do for subpixel is
--                    offset(dx, dy)
--                    compute_bounds
--                    offset(bbox & !63)
--                but that is two calls to offset, so we do the following, which
--                achieves the same thing with only one offset call.
--            */
--            FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63),
--                                          dy - ((bbox.yMin + dy) & ~63));
-+
-+            memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight);
- 
-             if (SkMask::kLCD16_Format == glyph.fMaskFormat) {
-+                FT_Outline_Translate(outline, dx, dy);
-                 FT_Error err = FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V :
-                                                                      FT_RENDER_MODE_LCD);
-                 if (err) {
-                     SK_TRACEFTR(err, "Could not render glyph.");
--                    sk_bzero(glyph.fImage, glyph.computeImageSize());
-                     return;
-                 }
-+
-                 SkMask mask;
-                 glyph.toMask(&mask);
-+#ifdef SK_SHOW_TEXT_BLIT_COVERAGE
-+                memset(mask.fImage, 0x80, mask.fBounds.height() * mask.fRowBytes);
-+#endif
-+                FT_GlyphSlotRec& ftGlyph = *face->glyph;
-+
-+                if (!SkIRect::Intersects(mask.fBounds,
-+                                         SkIRect::MakeXYWH( ftGlyph.bitmap_left,
-+                                                           -ftGlyph.bitmap_top,
-+                                                            ftGlyph.bitmap.width,
-+                                                            ftGlyph.bitmap.rows)))
-+                {
-+                    return;
-+                }
-+
-+                // If the FT_Bitmap extent is larger, discard bits of the bitmap outside the mask.
-+                // If the SkMask extent is larger, shrink mask to fit bitmap (clearing discarded).
-+                unsigned char* origBuffer = ftGlyph.bitmap.buffer;
-+                // First align the top left (origin).
-+                if (-ftGlyph.bitmap_top < mask.fBounds.fTop) {
-+                    int32_t topDiff = mask.fBounds.fTop - (-ftGlyph.bitmap_top);
-+                    ftGlyph.bitmap.buffer += ftGlyph.bitmap.pitch * topDiff;
-+                    ftGlyph.bitmap.rows -= topDiff;
-+                    ftGlyph.bitmap_top = -mask.fBounds.fTop;
-+                }
-+                if (ftGlyph.bitmap_left < mask.fBounds.fLeft) {
-+                    int32_t leftDiff = mask.fBounds.fLeft - ftGlyph.bitmap_left;
-+                    ftGlyph.bitmap.buffer += leftDiff;
-+                    ftGlyph.bitmap.width -= leftDiff;
-+                    ftGlyph.bitmap_left = mask.fBounds.fLeft;
-+                }
-+                if (mask.fBounds.fTop < -ftGlyph.bitmap_top) {
-+                    mask.fImage += mask.fRowBytes * (-ftGlyph.bitmap_top - mask.fBounds.fTop);
-+                    mask.fBounds.fTop = -ftGlyph.bitmap_top;
-+                }
-+                if (mask.fBounds.fLeft < ftGlyph.bitmap_left) {
-+                    mask.fImage += sizeof(uint16_t) * (ftGlyph.bitmap_left - mask.fBounds.fLeft);
-+                    mask.fBounds.fLeft = ftGlyph.bitmap_left;
-+                }
-+                // Origins aligned, clean up the width and height.
-+                int ftVertScale = (doVert ? 3 : 1);
-+                int ftHoriScale = (doVert ? 1 : 3);
-+                if (mask.fBounds.height() * ftVertScale < SkToInt(ftGlyph.bitmap.rows)) {
-+                    ftGlyph.bitmap.rows = mask.fBounds.height() * ftVertScale;
-+                }
-+                if (mask.fBounds.width() * ftHoriScale < SkToInt(ftGlyph.bitmap.width)) {
-+                    ftGlyph.bitmap.width = mask.fBounds.width() * ftHoriScale;
-+                }
-+                if (SkToInt(ftGlyph.bitmap.rows) < mask.fBounds.height() * ftVertScale) {
-+                    mask.fBounds.fBottom = mask.fBounds.fTop + ftGlyph.bitmap.rows / ftVertScale;
-+                }
-+                if (SkToInt(ftGlyph.bitmap.width) < mask.fBounds.width() * ftHoriScale) {
-+                    mask.fBounds.fRight = mask.fBounds.fLeft + ftGlyph.bitmap.width / ftHoriScale;
-+                }
-                 if (fPreBlend.isApplicable()) {
--                    copyFT2LCD16<true>(face->glyph->bitmap, mask, doBGR,
-+                    copyFT2LCD16<true>(ftGlyph.bitmap, mask, doBGR,
-                                        fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
-                 } else {
--                    copyFT2LCD16<false>(face->glyph->bitmap, mask, doBGR,
-+                    copyFT2LCD16<false>(ftGlyph.bitmap, mask, doBGR,
-                                         fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
-                 }
-+                // Restore the buffer pointer so FreeType can properly free it.
-+                ftGlyph.bitmap.buffer = origBuffer;
-             } else {
-+                FT_BBox     bbox;
-+                FT_Bitmap   target;
-+                FT_Outline_Get_CBox(outline, &bbox);
-+                /*
-+                    what we really want to do for subpixel is
-+                        offset(dx, dy)
-+                        compute_bounds
-+                        offset(bbox & !63)
-+                    but that is two calls to offset, so we do the following, which
-+                    achieves the same thing with only one offset call.
-+                */
-+                FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63),
-+                                              dy - ((bbox.yMin + dy) & ~63));
-+
-                 target.width = glyph.fWidth;
-                 target.rows = glyph.fHeight;
-                 target.pitch = glyph.rowBytes();
-                 target.buffer = reinterpret_cast<uint8_t*>(glyph.fImage);
-                 target.pixel_mode = compute_pixel_mode( (SkMask::Format)fRec.fMaskFormat);
-                 target.num_grays = 256;
- 
--                memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight);
-                 FT_Outline_Get_Bitmap(face->glyph->library, outline, &target);
-+#ifdef SK_SHOW_TEXT_BLIT_COVERAGE
-+                for (int y = 0; y < glyph.fHeight; ++y) {
-+                    for (int x = 0; x < glyph.fWidth; ++x) {
-+                        uint8_t& a = ((uint8_t*)glyph.fImage)[(glyph.rowBytes() * y) + x];
-+                        a = SkTMax<uint8_t>(a, 0x20);
-+                    }
-+                }
-+#endif
-             }
-         } break;
- 
-         case FT_GLYPH_FORMAT_BITMAP: {
-             FT_Pixel_Mode pixel_mode = static_cast<FT_Pixel_Mode>(face->glyph->bitmap.pixel_mode);
-             SkMask::Format maskFormat = static_cast<SkMask::Format>(glyph.fMaskFormat);
- 
-             // Assume that the other formats do not exist.
diff --git a/libre/iceweasel/harmony-fix.diff b/libre/iceweasel/harmony-fix.diff
deleted file mode 100644
index 7f62fd480..000000000
--- a/libre/iceweasel/harmony-fix.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git i/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp w/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
-index 42da19280fce8235..2c221c32d097b462 100644
---- i/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
-+++ w/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
-@@ -666,10 +666,7 @@ void SkScalerContext_CairoFT::generateMetrics(SkGlyph* glyph)
-         glyph->fTop    = -SkToS16(SkFDot6Floor(bbox.yMax));
-         glyph->fLeft   = SkToS16(SkFDot6Floor(bbox.xMin));
- 
--        if (isLCD(fRec) &&
--            gSetLcdFilter &&
--            (fLcdFilter == FT_LCD_FILTER_DEFAULT ||
--             fLcdFilter == FT_LCD_FILTER_LIGHT)) {
-+        if (isLCD(fRec)) {
-             if (fRec.fFlags & kLCD_Vertical_Flag) {
-                 glyph->fTop -= 1;
-                 glyph->fHeight += 2;
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 46a0c9e65..ac2694740 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -27,9 +27,9 @@ index c0b02e257..dc726d41a 100644
    display: block;
    position: absolute;
    top: 12px;
-   right: 12px;
--  width: 70px;
--  height: 20px;
+   offset-inline-end: 12px;
+-  width: 67px;
+-  height: 19px;
 +  width: 200px;
 +  height: 110px;
 +}
@@ -65,13 +65,13 @@ index 50f3e01cd..5df008555 100644
  //   * add an entry here in the proper ordering (based on spans)
  // The <a/> part of the snippet will be linked to the corresponding url.
 -const DEFAULT_SNIPPETS_URLS = [
--  "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet"
--, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons"
+-  "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet",
+-  "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons"
 -];
 +const DEFAULT_SNIPPETS_URLS = [ "" ];
  
 -const SNIPPETS_UPDATE_INTERVAL_MS = 14400000; // 4 hours.
-+const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
++const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 day.
  
  // IndexedDB storage constants.
  const DATABASE_NAME = "abouthome";
diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig
index 89ccc6200..c38c05444 100644
--- a/libre/iceweasel/mozconfig
+++ b/libre/iceweasel/mozconfig
@@ -28,6 +28,7 @@ ac_add_options --enable-startup-notification
 ac_add_options --enable-alsa
 ac_add_options --disable-updater
 ac_add_options --disable-crashreporter
+ac_add_options --disable-stylo
 
 STRIP_FLAGS="--strip-debug"
 
diff --git a/libre/iceweasel/mozilla-1373988.patch b/libre/iceweasel/mozilla-1373988.patch
deleted file mode 100644
index 0a29024e2..000000000
--- a/libre/iceweasel/mozilla-1373988.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/media/webrtc/trunk/gtest/moz.build b/media/webrtc/trunk/gtest/moz.build
---- a/media/webrtc/trunk/gtest/moz.build
-+++ b/media/webrtc/trunk/gtest/moz.build
-@@ -25,30 +25,38 @@ LOCAL_INCLUDES += [
-     '/media/libopus/include',
-     '/media/libopus/src',
- ]
- 
- USE_LIBS += [
-     '/media/webrtc/trunk/third_party/gflags/gflags_gflags/gflags',
-     '/testing/gtest/gtest',
--    'media_libjpeg',
-     'media_libopus',
--    'media_libvpx',
-     'mozglue',
-     'speex',
-     'webrtc',
-     'webrtc_common',
-     'webrtc_i420',
-     'webrtc_lib',
-     'webrtc_utility',
-     'webrtc_vp8',
-     'webrtc_vp9',
-     'yuv',
- ]
- 
-+if CONFIG['MOZ_SYSTEM_JPEG']:
-+    OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
-+else:
-+    USE_LIBS += ['media_libjpeg']
-+
-+if CONFIG['MOZ_SYSTEM_LIBVPX']:
-+    OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
-+else:
-+    USE_LIBS += ['media_libvpx']
-+
- if CONFIG['OS_TARGET'] in ['Darwin', 'Linux', 'WINNT']:
-     if CONFIG['OS_TARGET'] == 'Linux':
-         DEFINES['WEBRTC_LINUX'] = True
-         DEFINES['WEBRTC_POSIX'] = True
- 
-         LOCAL_INCLUDES += [
-             '../third_party/gflags/gen/posix/include',
diff --git a/libre/iceweasel/mozilla-1384655.patch b/libre/iceweasel/mozilla-1384655.patch
deleted file mode 100644
index 576ae15d9..000000000
--- a/libre/iceweasel/mozilla-1384655.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
---- a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
-+++ b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
-@@ -12,24 +12,16 @@
- 
- #include "webrtc/base/logging.h"
- #include "webrtc/modules/audio_device/audio_device_config.h"
- #include "webrtc/modules/audio_device/linux/audio_device_alsa_linux.h"
- 
- #include "webrtc/system_wrappers/include/event_wrapper.h"
- #include "webrtc/system_wrappers/include/sleep.h"
- #include "webrtc/system_wrappers/include/trace.h"
-- 
--#include "Latency.h"
--
--#define LOG_FIRST_CAPTURE(x) LogTime(AsyncLatencyLogger::AudioCaptureBase, \
--                                     reinterpret_cast<uint64_t>(x), 0)
--#define LOG_CAPTURE_FRAMES(x, frames) LogLatency(AsyncLatencyLogger::AudioCapture, \
--                                                 reinterpret_cast<uint64_t>(x), frames)
--
- 
- webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable;
- 
- // Accesses ALSA functions through our late-binding symbol table instead of
- // directly. This way we don't have to link to libasound, which means our binary
- // will work on systems that don't have it.
- #define LATE(sym) \
-   LATESYM_GET(webrtc_adm_linux_alsa::AlsaSymbolTable, &AlsaSymbolTable, sym)
-@@ -2138,20 +2130,18 @@ bool AudioDeviceLinuxALSA::RecThreadProc
-                buffer, size);
-         _recordingFramesLeft -= frames;
- 
-         if (!_recordingFramesLeft)
-         { // buf is full
-             _recordingFramesLeft = _recordingFramesIn10MS;
- 
-             if (_firstRecord) {
--              LOG_FIRST_CAPTURE(this);
-               _firstRecord = false;
-             }
--            LOG_CAPTURE_FRAMES(this, _recordingFramesIn10MS);
-             // store the recorded buffer (no action will be taken if the
-             // #recorded samples is not a full buffer)
-             _ptrAudioBuffer->SetRecordedBuffer(_recordingBuffer,
-                                                _recordingFramesIn10MS);
- 
-             uint32_t currentMicLevel = 0;
-             uint32_t newMicLevel = 0;
- 
-diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc b/media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc
---- a/media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc
-+++ b/media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc
-@@ -13,22 +13,16 @@
- 
- #include "webrtc/modules/audio_device/audio_device_config.h"
- #include "webrtc/modules/audio_device/sndio/audio_device_sndio.h"
- 
- #include "webrtc/system_wrappers/include/event_wrapper.h"
- #include "webrtc/system_wrappers/include/sleep.h"
- #include "webrtc/system_wrappers/include/trace.h"
- 
--#include "Latency.h"
--
--#define LOG_FIRST_CAPTURE(x) LogTime(AsyncLatencyLogger::AudioCaptureBase, \
--                                     reinterpret_cast<uint64_t>(x), 0)
--#define LOG_CAPTURE_FRAMES(x, frames) LogLatency(AsyncLatencyLogger::AudioCapture, \
--                                                 reinterpret_cast<uint64_t>(x), frames)
- extern "C"
- {
-     static void playOnmove(void *arg, int delta)
-     {
-         static_cast<webrtc::AudioDeviceSndio *>(arg)->_playDelay -= delta;
-     }
- 
-     static void recOnmove(void *arg, int delta)
-