wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 778489 - Don't show progress when entering about:reader (r=mfinkle)

Browse Source
This commit is contained in:
Lucas Rocha 2012-09-11 18:51:44 +01:00
parent 50882023e0
commit e94e2f877c
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/base/GeckoApp.java
View File

@ -1086,7 +1086,7 @@ abstract public class GeckoApp
if (tab == null)
return;
tab.setState("about:home".equals(uri) ? Tab.STATE_SUCCESS : Tab.STATE_LOADING);
tab.setState(shouldShowProgress(uri) ? Tab.STATE_SUCCESS : Tab.STATE_LOADING);
tab.updateIdentityData(null);
tab.setReaderEnabled(false);
if (Tabs.getInstance().isSelectedTab(tab))
@ -2672,6 +2672,10 @@ abstract public class GeckoApp
return false;
}
public static boolean shouldShowProgress(String url) {
return "about:home".equals(url) || ReaderModeUtils.isAboutReader(url);
}
public static void assertOnUiThread() {
Thread uiThread = mAppContext.getMainLooper().getThread();
assertOnThread(uiThread);

8
mobile/android/base/ReaderModeUtils.java
View File

@ -5,10 +5,18 @@
package org.mozilla.gecko;
import android.net.Uri;
import android.text.TextUtils;
public class ReaderModeUtils {
private static final String LOGTAG = "ReaderModeUtils";
public static boolean isAboutReader(String url) {
if (url == null)
return false;
return url.startsWith("about:reader");
}
public static String getAboutReaderForUrl(String url, boolean inReadingList) {
return getAboutReaderForUrl(url, -1, inReadingList);
}

2
mobile/android/base/Tab.java
View File

@ -94,7 +94,7 @@ public final class Tab {
mZoomConstraints = new ZoomConstraints(false);
mPluginViews = new ArrayList<View>();
mPluginLayers = new HashMap<Object, Layer>();
mState = "about:home".equals(url) ? STATE_SUCCESS : STATE_LOADING;
mState = GeckoApp.shouldShowProgress(url) ? STATE_SUCCESS : STATE_LOADING;
mContentResolver = Tabs.getInstance().getContentResolver();
mContentObserver = new ContentObserver(GeckoAppShell.getHandler()) {
public void onChange(boolean selfChange) {

10
mobile/android/chrome/content/browser.js
View File

@ -117,6 +117,10 @@ function resolveGeckoURI(aURI) {
return aURI;
}
function shouldShowProgress(url) {
return (url != "about:home" && !/^about:reader/.test(url));
}
/**
* Cache of commonly used string bundles.
*/
@ -311,7 +315,7 @@ var BrowserApp = {
// Start the restore
ss.restoreLastSession(restoreToFront, restoreMode == 1);
} else {
loadParams.showProgress = (url != "about:home");
loadParams.showProgress = shouldShowProgress(url);
loadParams.pinned = pinned;
this.addTab(url, loadParams);
@ -1056,8 +1060,8 @@ var BrowserApp = {
}
}
// Don't show progress throbber for about:home
if (url == "about:home")
// Don't show progress throbber for about:home or about:reader
if (!shouldShowProgress(url))
params.showProgress = false;
if (aTopic == "Tab:Add")