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

Backed out changeset 5b80055fba93 (bug 949104) for Android 4.0 Debug Test failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-11-19 17:08:09 +01:00
parent fc8903218e
commit 02addf9eca
2 changed files with 38 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,13 +4,12 @@
#include "nsThreadUtils.h"
#include "nsAndroidHistory.h"
#include "nsComponentManagerUtils.h"
#include "AndroidBridge.h"
#include "Link.h"
#include "nsIURI.h"
#include "mozilla/Services.h"
#include "nsIObserverService.h"
#include "mozilla/Services.h"
#include "mozilla/Preferences.h"
#define NS_LINK_VISITED_EVENT_TOPIC "link-visited"
@ -19,9 +18,6 @@
// Note that we don't yet observe this pref at runtime.
#define PREF_HISTORY_ENABLED "places.history.enabled"
// Time we wait to see if a pending visit is really a redirect
#define PENDING_REDIRECT_TIMEOUT 3000
using namespace mozilla;
using mozilla::dom::Link;
@ -46,8 +42,6 @@ nsAndroidHistory::nsAndroidHistory()
: mHistoryEnabled(true)
{
LoadPrefs();
mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
}
NS_IMETHODIMP
@ -164,76 +158,11 @@ nsAndroidHistory::IsEmbedURI(nsIURI* aURI) {
return equals;
}
inline bool
nsAndroidHistory::RemovePendingVisitURI(nsIURI* aURI) {
// Remove the first pending URI that matches. Return a boolean to
// let the caller know if we removed a URI or not.
bool equals = false;
PendingVisitArray::index_type i;
for (i = 0; i < mPendingVisitURIs.Length(); ++i) {
aURI->Equals(mPendingVisitURIs.ElementAt(i), &equals);
if (equals) {
mPendingVisitURIs.RemoveElementAt(i);
return true;
}
}
return false;
}
NS_IMETHODIMP
nsAndroidHistory::Notify(nsITimer *timer)
{
// Any pending visits left in the queue have exceeded our threshold for
// redirects, so save them
PendingVisitArray::index_type i;
for (i = 0; i < mPendingVisitURIs.Length(); ++i) {
SaveVisitURI(mPendingVisitURIs.ElementAt(i));
}
mPendingVisitURIs.Clear();
return NS_OK;
}
void
nsAndroidHistory::SaveVisitURI(nsIURI* aURI) {
// Add the URI to our cache so we can take a fast path later
AppendToRecentlyVisitedURIs(aURI);
if (AndroidBridge::HasEnv()) {
// Save this URI in our history
nsAutoCString spec;
(void)aURI->GetSpec(spec);
mozilla::widget::android::GeckoAppShell::MarkURIVisited(NS_ConvertUTF8toUTF16(spec));
}
// Finally, notify that we've been visited.
nsCOMPtr<nsIObserverService> obsService = mozilla::services::GetObserverService();
if (obsService) {
obsService->NotifyObservers(aURI, NS_LINK_VISITED_EVENT_TOPIC, nullptr);
}
}
NS_IMETHODIMP
nsAndroidHistory::VisitURI(nsIURI *aURI, nsIURI *aLastVisitedURI, uint32_t aFlags)
{
if (!aURI) {
if (!aURI)
return NS_OK;
}
if (!(aFlags & VisitFlags::TOP_LEVEL)) {
return NS_OK;
}
if (aFlags & VisitFlags::UNRECOVERABLE_ERROR) {
return NS_OK;
}
if (aFlags & VisitFlags::REDIRECT_SOURCE || aFlags & VisitFlags::REDIRECT_PERMANENT || aFlags & VisitFlags::REDIRECT_TEMPORARY) {
// aLastVisitedURI redirected to aURI. We want to ignore aLastVisitedURI,
// so remove the pending visit. We want to give aURI a chance to be saved,
// so don't return early.
RemovePendingVisitURI(aLastVisitedURI);
}
// Silently return if URI is something we shouldn't add to DB.
bool canAdd;
@ -251,17 +180,35 @@ nsAndroidHistory::VisitURI(nsIURI *aURI, nsIURI *aLastVisitedURI, uint32_t aFlag
// Do not save refresh visits if we have visited this URI recently.
return NS_OK;
}
// Since we have a last visited URI and we were not redirected, it is
// safe to save the visit if it's still pending.
if (RemovePendingVisitURI(aLastVisitedURI)) {
SaveVisitURI(aLastVisitedURI);
}
}
// Let's wait and see if this visit is not a redirect.
mPendingVisitURIs.AppendElement(aURI);
mTimer->InitWithCallback(this, PENDING_REDIRECT_TIMEOUT, nsITimer::TYPE_ONE_SHOT);
if (!(aFlags & VisitFlags::TOP_LEVEL)) {
AppendToEmbedURIs(aURI);
return NS_OK;
}
if (aFlags & VisitFlags::REDIRECT_SOURCE)
return NS_OK;
if (aFlags & VisitFlags::UNRECOVERABLE_ERROR)
return NS_OK;
if (AndroidBridge::HasEnv()) {
nsAutoCString uri;
rv = aURI->GetSpec(uri);
if (NS_FAILED(rv)) return rv;
NS_ConvertUTF8toUTF16 uriString(uri);
mozilla::widget::android::GeckoAppShell::MarkURIVisited(uriString);
}
AppendToRecentlyVisitedURIs(aURI);
// Finally, notify that we've been visited.
nsCOMPtr<nsIObserverService> obsService =
mozilla::services::GetObserverService();
if (obsService) {
obsService->NotifyObservers(aURI, NS_LINK_VISITED_EVENT_TOPIC, nullptr);
}
return NS_OK;
}
@ -297,7 +244,7 @@ nsAndroidHistory::NotifyVisited(nsIURI *aURI)
if (aURI && sHistory) {
nsAutoCString spec;
(void)aURI->GetSpec(spec);
sHistory->mPendingLinkURIs.Push(NS_ConvertUTF8toUTF16(spec));
sHistory->mPendingURIs.Push(NS_ConvertUTF8toUTF16(spec));
NS_DispatchToMainThread(sHistory);
}
return NS_OK;
@ -306,8 +253,8 @@ nsAndroidHistory::NotifyVisited(nsIURI *aURI)
NS_IMETHODIMP
nsAndroidHistory::Run()
{
while (! mPendingLinkURIs.IsEmpty()) {
nsString uriString = mPendingLinkURIs.Pop();
while (! mPendingURIs.IsEmpty()) {
nsString uriString = mPendingURIs.Pop();
nsTArray<Link*>* list = sHistory->mListeners.Get(uriString);
if (list) {
for (unsigned int i = 0; i < list->Length(); i++) {

31
mobile/android/components/build/nsAndroidHistory.h
View File

@ -11,8 +11,6 @@
#include "nsTPriorityQueue.h"
#include "nsIRunnable.h"
#include "nsIURI.h"
#include "nsITimer.h"
#define NS_ANDROIDHISTORY_CID \
{0xCCAA4880, 0x44DD, 0x40A7, {0xA1, 0x3F, 0x61, 0x56, 0xFC, 0x88, 0x2C, 0x0B}}
@ -23,15 +21,12 @@
// Max size of History::mEmbedURIs
#define EMBED_URI_SIZE 128
class nsAndroidHistory MOZ_FINAL : public mozilla::IHistory,
public nsIRunnable,
public nsITimerCallback
class nsAndroidHistory MOZ_FINAL : public mozilla::IHistory, public nsIRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_IHISTORY
NS_DECL_NSIRUNNABLE
NS_DECL_NSITIMERCALLBACK
/**
* Obtains a pointer that has had AddRef called on it. Used by the service
@ -49,33 +44,19 @@ private:
// Will mimic the value of the places.history.enabled preference.
bool mHistoryEnabled;
nsDataHashtable<nsStringHashKey, nsTArray<mozilla::dom::Link *> *> mListeners;
nsTPriorityQueue<nsString> mPendingURIs;
void LoadPrefs();
bool ShouldRecordHistory();
nsresult CanAddURI(nsIURI* aURI, bool* canAdd);
/**
* We need to manage data used to determine a:visited status.
*/
nsDataHashtable<nsStringHashKey, nsTArray<mozilla::dom::Link *> *> mListeners;
nsTPriorityQueue<nsString> mPendingLinkURIs;
/**
* Redirection (temporary and permanent) flags are sent with the redirected
* URI, not the original URI. Since we want to ignore the original URI, we
* need to cache the pending visit and make sure it doesn't redirect.
*/
nsRefPtr<nsITimer> mTimer;
typedef nsAutoTArray<nsCOMPtr<nsIURI>, RECENTLY_VISITED_URI_SIZE> PendingVisitArray;
PendingVisitArray mPendingVisitURIs;
bool RemovePendingVisitURI(nsIURI* aURI);
void SaveVisitURI(nsIURI* aURI);
/**
* mRecentlyVisitedURIs remembers URIs which are recently added to the DB,
* to avoid saving these locations repeatedly in a short period.
*/
typedef nsAutoTArray<nsCOMPtr<nsIURI>, RECENTLY_VISITED_URI_SIZE> RecentlyVisitedArray;
typedef nsAutoTArray<nsCOMPtr<nsIURI>, RECENTLY_VISITED_URI_SIZE>
RecentlyVisitedArray;
RecentlyVisitedArray mRecentlyVisitedURIs;
RecentlyVisitedArray::index_type mRecentlyVisitedURIsNextIndex;