mozilla-system-nspr.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Sun, 29 Dec 2013 22:45:13 +0100
changeset 691 18c2dc922e51
permissions -rw-r--r--
update to Firefox 27.0b2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
691
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# Parent 59d243709baef41e90fe91254a620c4f5215bb1e
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# User Wolfgang Rosenauer <wr@rosenauer.org>
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
diff --git a/content/media/Latency.cpp b/content/media/Latency.cpp
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
--- a/content/media/Latency.cpp
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
+++ b/content/media/Latency.cpp
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
@@ -4,17 +4,17 @@
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
  * License, v. 2.0. If a copy of the MPL was not distributed with this
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
 
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
 // We want this available in opt builds
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
 #define FORCE_PR_LOG
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
 
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 #include "Latency.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
 #include "nsThreadUtils.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
-#include <prlog.h>
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
+#include "prlog.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
 #include <cmath>
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
 #include <algorithm>
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
 
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
 #include <mozilla/Services.h>
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
 #include <mozilla/StaticPtr.h>
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
 #include "nsContentUtils.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
 
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
 using namespace mozilla;
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
diff --git a/content/media/Latency.h b/content/media/Latency.h
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
--- a/content/media/Latency.h
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
+++ b/content/media/Latency.h
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
@@ -3,17 +3,17 @@
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    31
 /* This Source Code Form is subject to the terms of the Mozilla Public
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
  * License, v. 2.0. If a copy of the MPL was not distributed with this
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
 
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
 #ifndef MOZILLA_LATENCY_H
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
 #define MOZILLA_LATENCY_H
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
 
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
 #include "mozilla/TimeStamp.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
-#include "nspr/prlog.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
+#include "prlog.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
 #include "nsCOMPtr.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
 #include "nsIThread.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
 #include "mozilla/Monitor.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
 #include "nsISupportsImpl.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
 #include "nsObserverService.h"
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
 
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
 class AsyncLatencyLogger;
18c2dc922e51 update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
 class LogEvent;