Bug 547267 followup - rename nsPresContext::GetLanguage to GetLanguageFromCharset for clarity. r=dbaron

content/canvas/src/nsCanvasRenderingContext2D.cpp

@@ -1932,7 +1932,7 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
       return NS_ERROR_FAILURE;
     nsIDocument* document = presShell->GetDocument();
 
-    nsIAtom *language = presShell->GetPresContext()->GetLanguage();
+    nsIAtom *language = presShell->GetPresContext()->GetLanguageFromCharset();
 
     nsCOMArray<nsIStyleRule> rules;
 

layout/base/nsPresContext.h

@@ -538,7 +538,7 @@ public:
 
   nsIDeviceContext* DeviceContext() { return mDeviceContext; }
   nsIEventStateManager* EventStateManager() { return mEventManager; }
-  nsIAtom* GetLanguage() { return mLanguage; }
+  nsIAtom* GetLanguageFromCharset() { return mLanguage; }
 
   float TextZoom() { return mTextZoom; }
   void SetTextZoom(float aZoom) {

layout/style/nsStyleStruct.cpp

@@ -1960,9 +1960,9 @@ nsStyleVisibility::nsStyleVisibility(nsPresContext* aPresContext)
       language.FindChar(PRUnichar(',')) == kNotFound) {
     mLanguage = do_GetAtom(language);
   } else {
-    // we didn't find a (usable) Content-Language,
-    // so fall back to the presContext's language
-    mLanguage = aPresContext->GetLanguage();
+    // we didn't find a (usable) Content-Language, so we fall back
+    // to whatever the presContext guessed from the charset
+    mLanguage = aPresContext->GetLanguageFromCharset();
   }
 
   mVisible = NS_STYLE_VISIBILITY_VISIBLE;