Spanked to collapse inline-reflow with line-layout into line-layout; fixed bugs #1278, #1990, #3527, #1670, etc.

git-svn-id: svn://10.0.0.236/trunk@24321 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/layout/generic/nsImageMap.cpp

@@ -77,8 +77,8 @@ public:
   nsString mAltText;
   nscoord* mCoords;
   PRInt32 mNumCoords;
-  PRBool mHasURL;
   PRBool mSuppressFeedback;
+  PRBool mHasURL;
 };
 
 Area::Area(const nsString& aBaseURL, const nsString& aHREF,
@@ -753,7 +753,7 @@ nsImageMap::UpdateAreas()
   // Get rid of old area data
   FreeAreas();
 
-  nsresult rv;
+  nsresult rv = NS_OK;
   nsIContent* child;
   PRInt32 i, n;
   PRBool containsBlock = PR_FALSE, containsArea = PR_FALSE;