mozilla-bmo256180.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Tue, 19 Mar 2019 09:56:49 +0100
branchfirefox60
changeset 1091 cbed5671ff47
parent 1090 554cd9503f75
permissions -rw-r--r--
60.6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1090
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
     1
# HG changeset patch
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
     2
# Parent  1f4171c3a5ca8a659154b0a846f9b9158c7f7923
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
     3
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
     4
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
     5
--- a/layout/generic/nsIFrame.h
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
     6
+++ b/layout/generic/nsIFrame.h
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
     7
@@ -8,17 +8,17 @@
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
     8
 
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
     9
 #ifndef nsIFrame_h___
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
    10
 #define nsIFrame_h___
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
    11
 
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
    12
 #ifndef MOZILLA_INTERNAL_API
1027
7071f6ebfda6 CSD functionality
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
 #error This header/class should only be used within Mozilla code. It should not be used by extensions.
7071f6ebfda6 CSD functionality
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
 #endif
7071f6ebfda6 CSD functionality
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 
7071f6ebfda6 CSD functionality
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
-#define MAX_REFLOW_DEPTH 200
7071f6ebfda6 CSD functionality
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
+#define MAX_REFLOW_DEPTH 1000
7071f6ebfda6 CSD functionality
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
 
1090
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
    19
 /* nsIFrame is in the process of being deCOMtaminated, i.e., this file is
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
    20
    eventually going to be eliminated, and all callers will use nsFrame instead.
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
    21
    At the moment we're midway through this process, so you will see inlined
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
    22
    functions and member variables in this file.  -dwh */
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
    23
 
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
    24
 #include <algorithm>
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1027
diff changeset
    25
 #include <stdio.h>