Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 935604 - Part 1: Fix graphical corruption on page load. r=lucasr

Browse Source
This commit is contained in:
Michael Comella 2013-11-15 09:42:58 -08:00
parent 1de8bbe632
commit acfe8f85ed
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mobile/android/base/BrowserApp.java
View File

@ -1454,6 +1454,19 @@ abstract public class BrowserApp extends GeckoApp
final String url = mBrowserToolbar.commitEdit();
// HACK: We don't know the url that will be loaded when hideHomePager is initially called
// in BrowserToolbar's onStopEditing listener so on the awesomescreen, hideHomePager will
// use the url "about:home" and return without taking any action. hideBrowserSearch is
// then called, but since hideHomePager changes both HomePager and LayerView visibility
// and exited without taking an action, no Views are displayed and graphical corruption is
// visible instead.
//
// Here we call hideHomePager for the second time with the URL to be loaded so that
// hideHomePager is called with the correct state for the upcoming page load.
//
// Expected to be fixed by bug 915825.
hideHomePager(url);
// Don't do anything if the user entered an empty URL.
if (TextUtils.isEmpty(url)) {
return;
@ -1644,13 +1657,23 @@ abstract public class BrowserApp extends GeckoApp
mLayerView.setVisibility(View.INVISIBLE);
}
/**
* Hides the HomePager, using the url of the currently selected tab as the url to be
* loaded.
*/
private void hideHomePager() {
if (!isHomePagerVisible()) {
return;
}
final Tab selectedTab = Tabs.getInstance().getSelectedTab();
final String url = (selectedTab != null) ? selectedTab.getURL() : null;
final Tab tab = Tabs.getInstance().getSelectedTab();
if (tab != null && isAboutHome(tab)) {
hideHomePager(url);
}
/**
* Hides the HomePager. The given url should be the url of the page to be loaded, or null
* if a new page is not being loaded.
*/
private void hideHomePager(final String url) {
if (!isHomePagerVisible() || TextUtils.equals(url, ABOUT_HOME)) {
return;
}