mozilla-release: changeset 77094:36e5a31b8f88980a4cb7c3bd081916f2c47b2efa

author	Daniel Holbert <dholbert@cs.stanford.edu>
	Tue, 23 Aug 2011 15:17:30 -0700
changeset 77094	36e5a31b8f88980a4cb7c3bd081916f2c47b2efa
parent 77093	0432558816ac53af208768975ffe1f6b0c70a13f
child 77095	0ec58fce2e952929c4b255a491f26372bd86475c
push id	78
push user	clegnitto@mozilla.com
push date	Fri, 16 Dec 2011 17:32:24 +0000
treeherder	mozilla-release@79d24e644fdd [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	gavin, biesi
bugs	570341
milestone	9.0a1
first release with	nightly linux32 e58e98a89827 / 9.0a1 / 20110825030823 / files nightly linux64 e58e98a89827 / 9.0a1 / 20110825030823 / files nightly mac e58e98a89827 / 9.0a1 / 20110825030823 / files nightly win32 e58e98a89827 / 9.0a1 / 20110825030823 / files nightly win64 e58e98a89827 / 9.0a1 / 20110825030823 / files
last release without	nightly linux32 7eb1a56eaaf1 / 9.0a1 / 20110823030804 / files nightly linux64 7eb1a56eaaf1 / 9.0a1 / 20110823030804 / files nightly mac 7eb1a56eaaf1 / 9.0a1 / 20110823030804 / files nightly win32 7eb1a56eaaf1 / 9.0a1 / 20110823030804 / files nightly win64 7eb1a56eaaf1 / 9.0a1 / 20110823030804 / files

--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -718,21 +718,21 @@ nsDocShell::nsDocShell():
     nsDocLoader(),
     mDefaultScrollbarPref(Scrollbar_Auto, Scrollbar_Auto),
     mTreeOwner(nsnull),
     mChromeEventHandler(nsnull),
     mCharsetReloadState(eCharsetReloadInit),
     mChildOffset(0),
     mBusyFlags(BUSY_FLAGS_NONE),
     mAppType(nsIDocShell::APP_TYPE_UNKNOWN),
+    mLoadType(0),
     mMarginWidth(-1),
     mMarginHeight(-1),
     mItemType(typeContent),
     mPreviousTransIndex(-1),
-    mLoadType(0),
     mLoadedTransIndex(-1),
     mCreated(PR_FALSE),
     mAllowSubframes(PR_TRUE),
     mAllowPlugins(PR_TRUE),
     mAllowJavascript(PR_TRUE),
     mAllowMetaRedirects(PR_TRUE),
     mAllowImages(PR_TRUE),
     mAllowDNSPrefetch(PR_TRUE),