fix build bustage from decomification of nsIDocument

camino/Chimera.pbproj/project.pbxproj

@@ -2005,7 +2005,6 @@
 				3FB2BAD80545EAA2002B9691,
 			);
 			buildSettings = {
-				OPTIMIZATION_CFLAGS = "";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";

camino/src/browser/BrowserWrapper.mm

@@ -648,8 +648,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged";
   nsCOMPtr<nsIDocument> pageDoc(do_QueryInterface(htmlDoc));
   if (pageDoc)
   {
-    nsCOMPtr<nsIURI> url;
-    pageDoc->GetDocumentURL(getter_AddRefs(url));
+    nsIURI* url = pageDoc->GetDocumentURL();
     nsCAutoString spec;
     url->GetSpec(spec);
     *outHrefString = [NSString stringWithUTF8String:spec.get()];

camino/src/browser/KeychainService.mm

@@ -781,8 +781,7 @@ KeychainFormSubmitObserver::Notify(nsIContent* node, nsIDOMWindowInternal* windo
     if (!doc)
       return NS_OK;
     
-    nsCOMPtr<nsIURI> docURL;
-    rv = doc->GetDocumentURL(getter_AddRefs(docURL));
+    nsIURI* docURL = doc->GetDocumentURL();
     if (NS_FAILED(rv) || !docURL)
       return NS_OK;
 
@@ -950,8 +949,7 @@ KeychainFormSubmitObserver::CheckChangeDataYN(nsIDOMWindowInternal* window)
       // a username/password stored in the keychain for this host and
       // pre-fill the fields if that's the case.
       //
-      nsCOMPtr<nsIURI> docURL;
-      rv = doc->GetDocumentURL(getter_AddRefs(docURL));
+      nsIURI* docURL = doc->GetDocumentURL();
       if (NS_FAILED(rv) || !docURL)
         return;
   

camino/src/embedding/CHBrowserView.mm

@@ -1238,9 +1238,8 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1";
     wind->GetDocument(getter_AddRefs(domDoc));
     nsCOMPtr<nsIDocument> doc ( do_QueryInterface(domDoc) );
     if ( doc ) {
-      nsCAutoString charset;
-      doc->GetDocumentCharacterSet(charset);
-      return [NSString stringWithCString:charset.get()];
+      const nsACString & charset = doc->GetDocumentCharacterSet();
+      return [NSString stringWithCString:PromiseFlatCString(charset).get()];
     }
   }
   return nil;

camino/src/embedding/CHClickListener.mm

@@ -200,8 +200,7 @@ CHClickListener::MouseDown(nsIDOMEvent* aEvent)
     // I'm going to assume that if we got a mousedown for a content node,
     // it's actually in a document.
 
-    nsCOMPtr<nsIScriptGlobalObject> sgo;
-    doc->GetScriptGlobalObject(getter_AddRefs(sgo));
+    nsIScriptGlobalObject* sgo = doc->GetScriptGlobalObject();
     nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(sgo);
     PRInt32 scrollX, scrollY;
     window->GetScrollX(&scrollX);