corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 959237 - Add AndroidBridge::HasEnv checks; r=blassey

Browse Source 
For certain tests, the AndroidBridge is not initialized, but some GeckoAppShell functions are still called indirectly. For now, this patch adds checks to skip these calls if there's no AndroidBridge. However, in the future, most of the affected code should be refactored to not require these checks.
This commit is contained in:
Jim Chen
2014-01-17 23:32:24 -06:00
parent d1f525e06a
commit c41d2e45c6
5 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mobile/android/components/build/nsAndroidHistory.cpp
View File

@@ -62,7 +62,9 @@ nsAndroidHistory::RegisterVisitedCallback(nsIURI *aURI, Link *aContent)
}
list->AppendElement(aContent);
GeckoAppShell::CheckURIVisited(uriString);
if (AndroidBridge::HasEnv()) {
GeckoAppShell::CheckURIVisited(uriString);
}
return NS_OK;
}
@@ -173,11 +175,13 @@ nsAndroidHistory::VisitURI(nsIURI *aURI, nsIURI *aLastVisitedURI, uint32_t aFlag
if (aFlags & VisitFlags::UNRECOVERABLE_ERROR)
return NS_OK;
nsAutoCString uri;
rv = aURI->GetSpec(uri);
if (NS_FAILED(rv)) return rv;
NS_ConvertUTF8toUTF16 uriString(uri);
GeckoAppShell::MarkURIVisited(uriString);
if (AndroidBridge::HasEnv()) {
nsAutoCString uri;
rv = aURI->GetSpec(uri);
if (NS_FAILED(rv)) return rv;
NS_ConvertUTF8toUTF16 uriString(uri);
GeckoAppShell::MarkURIVisited(uriString);
}
AppendToRecentlyVisitedURIs(aURI);
@@ -206,7 +210,7 @@ nsAndroidHistory::SetURITitle(nsIURI *aURI, const nsAString& aTitle)
return NS_OK;
}
if (AndroidBridge::Bridge()) {
if (AndroidBridge::HasEnv()) {
nsAutoCString uri;
nsresult rv = aURI->GetSpec(uri);
if (NS_FAILED(rv)) return rv;