Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-bmo256180.patch
branchfirefox60
changeset 1090 554cd9503f75
parent 1027 7071f6ebfda6 
--- a/mozilla-bmo256180.patch	Mon Dec 10 22:33:01 2018 +0100
+++ b/mozilla-bmo256180.patch	Tue Mar 19 09:49:20 2019 +0100
@@ -1,11 +1,25 @@
---- a/layout/generic/nsIFrame.h.old	2016-07-11 13:41:39.688276559 +0200
-+++ b/layout/generic/nsIFrame.h	2016-07-11 13:42:12.791406976 +0200
-@@ -13,7 +13,7 @@
+# HG changeset patch
+# Parent  1f4171c3a5ca8a659154b0a846f9b9158c7f7923
+
+diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
+--- a/layout/generic/nsIFrame.h
++++ b/layout/generic/nsIFrame.h
+@@ -8,17 +8,17 @@
+ 
+ #ifndef nsIFrame_h___
+ #define nsIFrame_h___
+ 
+ #ifndef MOZILLA_INTERNAL_API
  #error This header/class should only be used within Mozilla code. It should not be used by extensions.
  #endif
  
 -#define MAX_REFLOW_DEPTH 200
 +#define MAX_REFLOW_DEPTH 1000
  
- /* nsIFrame is in the process of being deCOMtaminated, i.e., this file is eventually
-    going to be eliminated, and all callers will use nsFrame instead.  At the moment
+ /* nsIFrame is in the process of being deCOMtaminated, i.e., this file is
+    eventually going to be eliminated, and all callers will use nsFrame instead.
+    At the moment we're midway through this process, so you will see inlined
+    functions and member variables in this file.  -dwh */
+ 
+ #include <algorithm>
+ #include <stdio.h>
mozilla