Backout history changes to reflect the review and landing of bug 702037 on m-c. r=blassey
authorDoug Turner <dougt@dougt.org>
Mon, 21 Nov 2011 11:56:38 -0800
changeset 83563 88a9701f51350f3ba2331082f20551747d90e050
parent 83562 7da5cd40873378be3351d15bfac9733f1beabffa
child 83564 be195eac506c421456ffa85fe6121679ee567b25
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey
bugs702037
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout history changes to reflect the review and landing of bug 702037 on m-c. r=blassey
toolkit/components/places/History.cpp
toolkit/components/places/nsNavHistory.cpp
--- a/toolkit/components/places/History.cpp
+++ b/toolkit/components/places/History.cpp
@@ -1755,27 +1755,16 @@ History::VisitURI(nsIURI* aURI,
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 History::RegisterVisitedCallback(nsIURI* aURI,
                                  Link* aLink)
 {
-  //xxx
-  // Disable this, along with MOZ_PLACES.  We are giving up
-  // link visitied highlighting because it currently
-  // requires a large database (places).  In the future, it
-  // would be nice if we could be smarter about what we
-  // persist and have some sort of memory/time limit before
-  // evicting.
-#ifdef ANDROID
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
-
   NS_ASSERTION(aURI, "Must pass a non-null URI!");
   if (XRE_GetProcessType() == GeckoProcessType_Content) {
     NS_PRECONDITION(aLink, "Must pass a non-null Link!");
   }
 
   // First, ensure that our hash table is setup.
   if (!mObservers.IsInitialized()) {
     NS_ENSURE_TRUE(mObservers.Init(VISIT_OBSERVERS_INITIAL_CACHE_SIZE),
--- a/toolkit/components/places/nsNavHistory.cpp
+++ b/toolkit/components/places/nsNavHistory.cpp
@@ -368,25 +368,16 @@ nsNavHistory::~nsNavHistory()
   if (gHistoryService == this)
     gHistoryService = nsnull;
 }
 
 
 nsresult
 nsNavHistory::Init()
 {
-
-  // XXX
-  // For the native ui on android, we will not be using MOZ_PLACES.
-  // Currently places has deeply weaved it way throughout the gecko codebase.
-  // Here we disable all database creation and loading of places.
-#ifdef ANDROID
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
-
   NS_TIME_FUNCTION;
 
   LoadPrefs();
 
   mDB = Database::GetDatabase();
   NS_ENSURE_STATE(mDB);
 
   // recent events hash tables