mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Backout Bug 516728 to fix orange
This commit is contained in:
commit
63570b1944
@ -52,7 +52,7 @@ namespace mozilla {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#define IHISTORY_IID \
|
#define IHISTORY_IID \
|
||||||
{0x6f733924, 0x6321, 0x4384, {0x01, 0xee, 0x8e, 0x7d, 0xfb, 0xde, 0xe7, 0xa8}}
|
{0x6f736049, 0x6370, 0x4376, {0xb7, 0x17, 0xfa, 0xfc, 0x0b, 0x4f, 0xd0, 0xf1}}
|
||||||
|
|
||||||
class IHistory : public nsISupports
|
class IHistory : public nsISupports
|
||||||
{
|
{
|
||||||
@ -71,7 +71,7 @@ public:
|
|||||||
* UnregisterVisitedCallback.
|
* UnregisterVisitedCallback.
|
||||||
*
|
*
|
||||||
* @pre aURI must not be null.
|
* @pre aURI must not be null.
|
||||||
* @pre aLink may be null only in the MOZ_IPC parent process.
|
* @pre aLink must not be null.
|
||||||
*
|
*
|
||||||
* @param aURI
|
* @param aURI
|
||||||
* The URI to check.
|
* The URI to check.
|
||||||
|
@ -54,10 +54,6 @@
|
|||||||
#include "nsXULAppAPI.h"
|
#include "nsXULAppAPI.h"
|
||||||
#include "nsWeakReference.h"
|
#include "nsWeakReference.h"
|
||||||
|
|
||||||
#include "History.h"
|
|
||||||
#include "nsDocShellCID.h"
|
|
||||||
#include "nsNetUtil.h"
|
|
||||||
|
|
||||||
#include "base/message_loop.h"
|
#include "base/message_loop.h"
|
||||||
#include "base/task.h"
|
#include "base/task.h"
|
||||||
|
|
||||||
@ -66,7 +62,6 @@
|
|||||||
|
|
||||||
using namespace mozilla::ipc;
|
using namespace mozilla::ipc;
|
||||||
using namespace mozilla::net;
|
using namespace mozilla::net;
|
||||||
using namespace mozilla::places;
|
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
namespace dom {
|
namespace dom {
|
||||||
@ -348,14 +343,5 @@ ContentChild::RecvNotifyRemotePrefObserver(const nsCString& aPref)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
|
||||||
ContentChild::RecvNotifyVisited(const IPC::URI& aURI)
|
|
||||||
{
|
|
||||||
nsCOMPtr<nsIURI> newURI = aURI;
|
|
||||||
nsRefPtr<History> history = History::GetSingleton();
|
|
||||||
history->NotifyVisited(newURI);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace dom
|
} // namespace dom
|
||||||
} // namespace mozilla
|
} // namespace mozilla
|
||||||
|
@ -88,8 +88,6 @@ public:
|
|||||||
|
|
||||||
virtual bool RecvSetOffline(const PRBool& offline);
|
virtual bool RecvSetOffline(const PRBool& offline);
|
||||||
|
|
||||||
virtual bool RecvNotifyVisited(const IPC::URI& aURI);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Notify |aObserver| of changes to |aPrefRoot|.|aDomain|. If
|
* Notify |aObserver| of changes to |aPrefRoot|.|aDomain|. If
|
||||||
* |aHoldWeak|, only a weak reference to |aObserver| is held.
|
* |aHoldWeak|, only a weak reference to |aObserver| is held.
|
||||||
|
@ -40,7 +40,6 @@
|
|||||||
#include "ContentParent.h"
|
#include "ContentParent.h"
|
||||||
|
|
||||||
#include "TabParent.h"
|
#include "TabParent.h"
|
||||||
#include "History.h"
|
|
||||||
#include "mozilla/ipc/TestShellParent.h"
|
#include "mozilla/ipc/TestShellParent.h"
|
||||||
#include "mozilla/net/NeckoParent.h"
|
#include "mozilla/net/NeckoParent.h"
|
||||||
#include "nsIPrefBranch.h"
|
#include "nsIPrefBranch.h"
|
||||||
@ -56,7 +55,6 @@
|
|||||||
|
|
||||||
using namespace mozilla::ipc;
|
using namespace mozilla::ipc;
|
||||||
using namespace mozilla::net;
|
using namespace mozilla::net;
|
||||||
using namespace mozilla::places;
|
|
||||||
using mozilla::MonitorAutoEnter;
|
using mozilla::MonitorAutoEnter;
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
@ -432,12 +430,6 @@ ContentParent::RequestRunToCompletion()
|
|||||||
return !!mRunToCompletionDepth;
|
return !!mRunToCompletionDepth;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
|
||||||
ContentParent::RecvStartVisitedQuery(const IPC::URI& aURI)
|
|
||||||
{
|
|
||||||
nsCOMPtr<nsIURI> newURI = aURI;
|
|
||||||
IHistory *history = nsContentUtils::GetHistory();
|
|
||||||
history->RegisterVisitedCallback(newURI, nsnull);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -451,9 +443,6 @@ ContentParent::RecvVisitURI(const IPC::URI& uri,
|
|||||||
nsCOMPtr<nsIURI> ourReferrer = referrer;
|
nsCOMPtr<nsIURI> ourReferrer = referrer;
|
||||||
IHistory *history = nsContentUtils::GetHistory();
|
IHistory *history = nsContentUtils::GetHistory();
|
||||||
history->VisitURI(ourURI, ourReferrer, flags);
|
history->VisitURI(ourURI, ourReferrer, flags);
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* void onDispatchedEvent (in nsIThreadInternal thread); */
|
/* void onDispatchedEvent (in nsIThreadInternal thread); */
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
ContentParent::OnDispatchedEvent(nsIThreadInternal *thread)
|
ContentParent::OnDispatchedEvent(nsIThreadInternal *thread)
|
||||||
|
@ -146,12 +146,10 @@ private:
|
|||||||
void EnsurePrefService();
|
void EnsurePrefService();
|
||||||
void EnsurePermissionService();
|
void EnsurePermissionService();
|
||||||
|
|
||||||
virtual bool RecvStartVisitedQuery(const IPC::URI& uri);
|
|
||||||
|
|
||||||
virtual bool RecvVisitURI(const IPC::URI& uri,
|
virtual bool RecvVisitURI(const IPC::URI& uri,
|
||||||
const IPC::URI& referrer,
|
const IPC::URI& referrer,
|
||||||
const PRUint32& flags);
|
const PRUint32& flags);
|
||||||
|
|
||||||
mozilla::Monitor mMonitor;
|
mozilla::Monitor mMonitor;
|
||||||
|
|
||||||
GeckoChildProcessHost* mSubprocess;
|
GeckoChildProcessHost* mSubprocess;
|
||||||
|
@ -79,7 +79,6 @@ include $(topsrcdir)/config/rules.mk
|
|||||||
LOCAL_INCLUDES += \
|
LOCAL_INCLUDES += \
|
||||||
-I$(srcdir)/../../content/base/src \
|
-I$(srcdir)/../../content/base/src \
|
||||||
-I$(srcdir)/../../content/events/src \
|
-I$(srcdir)/../../content/events/src \
|
||||||
-I$(srcdir)/../../toolkit/components/places/src \
|
|
||||||
-I$(srcdir)/../src/geolocation \
|
-I$(srcdir)/../src/geolocation \
|
||||||
-I$(topsrcdir)/chrome/src \
|
-I$(topsrcdir)/chrome/src \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
@ -68,8 +68,6 @@ child:
|
|||||||
|
|
||||||
async SetOffline(PRBool offline);
|
async SetOffline(PRBool offline);
|
||||||
|
|
||||||
async NotifyVisited(URI uri);
|
|
||||||
|
|
||||||
NotifyRemotePrefObserver(nsCString aDomain);
|
NotifyRemotePrefObserver(nsCString aDomain);
|
||||||
|
|
||||||
parent:
|
parent:
|
||||||
@ -77,9 +75,7 @@ parent:
|
|||||||
|
|
||||||
// Services remoting
|
// Services remoting
|
||||||
|
|
||||||
async StartVisitedQuery(URI uri);
|
|
||||||
async VisitURI(URI uri, URI referrer, PRUint32 flags);
|
async VisitURI(URI uri, URI referrer, PRUint32 flags);
|
||||||
|
|
||||||
// PrefService messages
|
// PrefService messages
|
||||||
sync GetPrefType(nsCString prefName) returns (PRInt32 retValue, nsresult rv);
|
sync GetPrefType(nsCString prefName) returns (PRInt32 retValue, nsresult rv);
|
||||||
sync GetBoolPref(nsCString prefName) returns (PRBool retValue, nsresult rv);
|
sync GetBoolPref(nsCString prefName) returns (PRBool retValue, nsresult rv);
|
||||||
|
@ -37,12 +37,6 @@
|
|||||||
*
|
*
|
||||||
* ***** END LICENSE BLOCK ***** */
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
#ifdef MOZ_IPC
|
|
||||||
#include "mozilla/dom/ContentChild.h"
|
|
||||||
#include "mozilla/dom/ContentParent.h"
|
|
||||||
#include "nsXULAppAPI.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef MOZ_IPC
|
#ifdef MOZ_IPC
|
||||||
#include "mozilla/dom/ContentChild.h"
|
#include "mozilla/dom/ContentChild.h"
|
||||||
#include "nsXULAppAPI.h"
|
#include "nsXULAppAPI.h"
|
||||||
@ -166,18 +160,6 @@ public:
|
|||||||
{
|
{
|
||||||
NS_PRECONDITION(aURI, "Null URI");
|
NS_PRECONDITION(aURI, "Null URI");
|
||||||
|
|
||||||
#ifdef MOZ_IPC
|
|
||||||
// If we are a content process, always remote the request to the
|
|
||||||
// parent process.
|
|
||||||
if (XRE_GetProcessType() == GeckoProcessType_Content) {
|
|
||||||
mozilla::dom::ContentChild * cpc =
|
|
||||||
mozilla::dom::ContentChild::GetSingleton();
|
|
||||||
NS_ASSERTION(cpc, "Content Protocol is NULL!");
|
|
||||||
(void)cpc->SendStartVisitedQuery(IPC::URI(aURI));
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
nsNavHistory* navHist = nsNavHistory::GetHistoryService();
|
nsNavHistory* navHist = nsNavHistory::GetHistoryService();
|
||||||
NS_ENSURE_TRUE(navHist, NS_ERROR_FAILURE);
|
NS_ENSURE_TRUE(navHist, NS_ERROR_FAILURE);
|
||||||
mozIStorageStatement* stmt = navHist->GetStatementById(DB_IS_PAGE_VISITED);
|
mozIStorageStatement* stmt = navHist->GetStatementById(DB_IS_PAGE_VISITED);
|
||||||
@ -979,15 +961,6 @@ History::NotifyVisited(nsIURI* aURI)
|
|||||||
{
|
{
|
||||||
NS_ASSERTION(aURI, "Ruh-roh! A NULL URI was passed to us!");
|
NS_ASSERTION(aURI, "Ruh-roh! A NULL URI was passed to us!");
|
||||||
|
|
||||||
#ifdef MOZ_IPC
|
|
||||||
if (XRE_GetProcessType() == GeckoProcessType_Default) {
|
|
||||||
mozilla::dom::ContentParent* cpp =
|
|
||||||
mozilla::dom::ContentParent::GetSingleton();
|
|
||||||
NS_ASSERTION(cpp, "Content Protocol is NULL!");
|
|
||||||
(void)cpp->SendNotifyVisited(IPC::URI(aURI));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// If the hash table has not been initialized, then we have nothing to notify
|
// If the hash table has not been initialized, then we have nothing to notify
|
||||||
// about.
|
// about.
|
||||||
if (!mObservers.IsInitialized()) {
|
if (!mObservers.IsInitialized()) {
|
||||||
@ -1177,14 +1150,7 @@ History::RegisterVisitedCallback(nsIURI* aURI,
|
|||||||
Link* aLink)
|
Link* aLink)
|
||||||
{
|
{
|
||||||
NS_ASSERTION(aURI, "Must pass a non-null URI!");
|
NS_ASSERTION(aURI, "Must pass a non-null URI!");
|
||||||
#ifdef MOZ_IPC
|
NS_ASSERTION(aLink, "Must pass a non-null Link object!");
|
||||||
if (XRE_GetProcessType() == GeckoProcessType_Content) {
|
|
||||||
NS_PRECONDITION(aLink, "Must pass a non-null URI!");
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
NS_PRECONDITION(aLink, "Must pass a non-null URI!");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
// First, ensure that our hash table is setup.
|
// First, ensure that our hash table is setup.
|
||||||
if (!mObservers.IsInitialized()) {
|
if (!mObservers.IsInitialized()) {
|
||||||
@ -1207,7 +1173,7 @@ History::RegisterVisitedCallback(nsIURI* aURI,
|
|||||||
// Links wanting to know about this URI. Therefore, we should query the
|
// Links wanting to know about this URI. Therefore, we should query the
|
||||||
// database now.
|
// database now.
|
||||||
nsresult rv = VisitedQuery::Start(aURI);
|
nsresult rv = VisitedQuery::Start(aURI);
|
||||||
if (NS_FAILED(rv) || !aLink) {
|
if (NS_FAILED(rv)) {
|
||||||
// Remove our array from the hashtable so we don't keep it around.
|
// Remove our array from the hashtable so we don't keep it around.
|
||||||
mObservers.RemoveEntry(aURI);
|
mObservers.RemoveEntry(aURI);
|
||||||
return rv;
|
return rv;
|
||||||
|
@ -50,11 +50,6 @@ EXPORT_LIBRARY = 1
|
|||||||
MODULE_NAME = nsPlacesModule
|
MODULE_NAME = nsPlacesModule
|
||||||
IS_COMPONENT = 1
|
IS_COMPONENT = 1
|
||||||
|
|
||||||
EXPORTS_NAMESPACES = mozilla/places
|
|
||||||
|
|
||||||
EXPORTS_mozilla/places = \
|
|
||||||
History.h \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
CPPSRCS = \
|
CPPSRCS = \
|
||||||
nsAnnoProtocolHandler.cpp \
|
nsAnnoProtocolHandler.cpp \
|
||||||
|
Loading…
Reference in New Issue
Block a user