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 697987 - Remove race conditions from Runnables [r=sriram]

Browse Source 
Eliminate various race conditions when using runnables,
specifically when doing things to global UI state based on
the selected tab. Since the selected tab might change
between a particular non-UI action and the corresponding
UI-thread update, we have to ensure that the selected tab
is still correct on the UI runnable.
This commit is contained in:
Kartikaya Gupta 2011-11-01 13:14:37 -04:00
parent 6f94edd8c5
commit f1d78e3e5c
2 changed files with 35 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
embedding/android/GeckoApp.java
View File

@ -581,9 +581,6 @@ abstract public class GeckoApp
String oldBaseURI = tab.getURL();
tab.updateURL(uri);
if (!Tabs.getInstance().isSelectedTab(tab))
return;
String baseURI = uri;
if (baseURI.indexOf('#') != -1)
baseURI = uri.substring(0, uri.indexOf('#'));
@ -594,11 +591,14 @@ abstract public class GeckoApp
if (baseURI.equals(oldBaseURI))
return;
tab.updateFavicon(null);
mMainHandler.post(new Runnable() {
public void run() {
mBrowserToolbar.setTitle(uri);
mBrowserToolbar.setFavicon(null);
tab.updateFavicon(null);
if (Tabs.getInstance().isSelectedTab(tab)) {
mBrowserToolbar.setTitle(uri);
mBrowserToolbar.setFavicon(null);
}
}
});
}
@ -835,24 +835,25 @@ abstract public class GeckoApp
});
}
void handleSelectTab(final int tabId) {
void handleSelectTab(int tabId) {
final Tab tab = Tabs.getInstance().selectTab(tabId);
if (tab == null)
return;
mMainHandler.post(new Runnable() {
public void run() {
mBrowserToolbar.setTitle(tab.getDisplayTitle());
mBrowserToolbar.setFavicon(tab.getFavicon());
mBrowserToolbar.setProgressVisibility(tab.isLoading());
mDoorHanger.updateForTab(tabId);
if (Tabs.getInstance().isSelectedTab(tab)) {
mBrowserToolbar.setTitle(tab.getDisplayTitle());
mBrowserToolbar.setFavicon(tab.getFavicon());
mBrowserToolbar.setProgressVisibility(tab.isLoading());
mDoorHanger.updateForTab(tab.getId());
}
}
});
}
void handleDocumentStart(final int tabId) {
Tab tab = Tabs.getInstance().getTab(tabId);
void handleDocumentStart(int tabId) {
final Tab tab = Tabs.getInstance().getTab(tabId);
if (tab == null)
return;
@ -860,41 +861,26 @@ abstract public class GeckoApp
mMainHandler.post(new Runnable() {
public void run() {
if (Tabs.getInstance().isSelectedTab(tab))
mBrowserToolbar.setProgressVisibility(true);
onTabsChanged();
}
});
if (!Tabs.getInstance().isSelectedTab(tab))
return;
mMainHandler.post(new Runnable() {
public void run() {
mBrowserToolbar.setProgressVisibility(true);
}
});
}
void handleDocumentStop(final int tabId) {
Tab tab = Tabs.getInstance().getTab(tabId);
void handleDocumentStop(int tabId) {
final Tab tab = Tabs.getInstance().getTab(tabId);
if (tab == null)
return;
tab.setLoading(false);
tab.setLoading(false);
mMainHandler.post(new Runnable() {
public void run() {
onTabsChanged();
}
});
if (!Tabs.getInstance().isSelectedTab(tab))
return;
mMainHandler.post(new Runnable() {
public void run() {
mBrowserToolbar.setProgressVisibility(false);
if (Tabs.getInstance().isSelectedTab(tab))
mBrowserToolbar.setProgressVisibility(false);
surfaceView.hideStartupBitmap();
onTabsChanged();
}
});
}
@ -912,46 +898,36 @@ abstract public class GeckoApp
});
}
void handleContentLoaded(final int tabId, final String uri, final String title) {
void handleContentLoaded(int tabId, String uri, String title) {
final Tab tab = Tabs.getInstance().getTab(tabId);
if (tab == null)
return;
tab.updateTitle(title);
mMainHandler.post(new Runnable() {
public void run() {
onTabsChanged();
}
});
if (tab.getFavicon() == null)
downloadDefaultFavicon(tabId);
if (!Tabs.getInstance().isSelectedTab(tab))
return;
mMainHandler.post(new Runnable() {
public void run() {
mBrowserToolbar.setTitle(tab.getDisplayTitle());
if (Tabs.getInstance().isSelectedTab(tab))
mBrowserToolbar.setTitle(tab.getDisplayTitle());
onTabsChanged();
}
});
}
void handleTitleChanged(final int tabId, final String title) {
void handleTitleChanged(int tabId, String title) {
final Tab tab = Tabs.getInstance().getTab(tabId);
if (tab == null)
return;
tab.updateTitle(title);
if (!Tabs.getInstance().isSelectedTab(tab))
return;
mMainHandler.post(new Runnable() {
mMainHandler.post(new Runnable() {
public void run() {
if (Tabs.getInstance().isSelectedTab(tab))
mBrowserToolbar.setTitle(tab.getDisplayTitle());
onTabsChanged();
mBrowserToolbar.setTitle(tab.getDisplayTitle());
}
});
}

8
embedding/android/GeckoPreferences.java
View File

@ -110,15 +110,13 @@ public class GeckoPreferences
if (mPreferenceScreen == null)
return;
final String[] homepageValues = sContext.getResources().getStringArray(R.array.pref_homepage_values);
// set the current page URL for the "Home page" preference
Tab tab = Tabs.getInstance().getSelectedTab();
String currentUrl = tab.getURL();
final String[] homepageValues = sContext.getResources().getStringArray(R.array.pref_homepage_values);
final Preference homepagePref = mPreferenceScreen.findPreference("browser.startup.homepage");
homepageValues[2] = currentUrl;
GeckoAppShell.getMainHandler().post(new Runnable() {
public void run() {
Tab tab = Tabs.getInstance().getSelectedTab();
homepageValues[2] = tab.getURL();
((ListPreference)homepagePref).setEntryValues(homepageValues);
}
});