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

Back out Bug 551181 because it depends on the last bug I backed out

Browse Source
This commit is contained in:
Kyle Huey 2010-07-27 17:13:55 -07:00
commit 412f76637e
5 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/ipc/ContentParent.cpp
View File

@ -46,7 +46,7 @@
#include "nsIPrefBranch2.h"
#include "nsIPrefLocalizedString.h"
#include "nsIObserverService.h"
#include "nsContentUtils.h"
#include "nsAutoPtr.h"
#include "nsCOMPtr.h"
#include "nsServiceManagerUtils.h"
@ -433,16 +433,6 @@ ContentParent::RequestRunToCompletion()
return true;
}
bool
ContentParent::RecvVisitURI(const IPC::URI& uri,
const IPC::URI& referrer,
const PRUint32& flags)
{
nsCOMPtr<nsIURI> ourURI = uri;
nsCOMPtr<nsIURI> ourReferrer = referrer;
IHistory *history = nsContentUtils::GetHistory();
history->VisitURI(ourURI, ourReferrer, flags);
/* void onDispatchedEvent (in nsIThreadInternal thread); */
NS_IMETHODIMP
ContentParent::OnDispatchedEvent(nsIThreadInternal *thread)

4
dom/ipc/ContentParent.h
View File

@ -47,7 +47,6 @@
#include "nsIObserver.h"
#include "nsIThreadInternal.h"
#include "mozilla/Monitor.h"
#include "nsNetUtil.h"
#include "nsIPrefService.h"
#include "nsIPermissionManager.h"
@ -147,9 +146,6 @@ private:
void EnsurePermissionService();
virtual bool RecvVisitURI(const IPC::URI& uri,
const IPC::URI& referrer,
const PRUint32& flags);
mozilla::Monitor mMonitor;
GeckoChildProcessHost* mSubprocess;

1
dom/ipc/PContent.ipdl
View File

@ -75,7 +75,6 @@ parent:
// Services remoting
async VisitURI(URI uri, URI referrer, PRUint32 flags);
// PrefService messages
sync GetPrefType(nsCString prefName) returns (PRInt32 retValue, nsresult rv);
sync GetBoolPref(nsCString prefName) returns (PRBool retValue, nsresult rv);

13
toolkit/components/places/src/History.cpp
View File

@ -39,9 +39,6 @@
#ifdef MOZ_IPC
#include "mozilla/dom/ContentChild.h"
#include "nsXULAppAPI.h"
#endif
#include "History.h"
#include "nsNavHistory.h"
#include "nsNavBookmarks.h"
@ -1057,16 +1054,6 @@ History::VisitURI(nsIURI* aURI,
return NS_OK;
}
#ifdef MOZ_IPC
if (XRE_GetProcessType() == GeckoProcessType_Content) {
mozilla::dom::ContentChild * cpc =
mozilla::dom::ContentChild::GetSingleton();
NS_ASSERTION(cpc, "Content Protocol is NULL!");
(void)cpc->SendVisitURI(IPC::URI(aURI), IPC::URI(aLastVisitedURI), aFlags);
return NS_OK;
}
#endif /* MOZ_IPC */
nsNavHistory* history = nsNavHistory::GetHistoryService();
NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);

2
toolkit/components/places/src/Makefile.in
View File

@ -99,6 +99,4 @@ EXTRA_PP_JS_MODULES = \
PlacesUtils.jsm \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk