4 files changed, 46 insertions, 66 deletions

diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index 85b1541..f999fdb 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -119,11 +119,6 @@
 #include "ArchiveFactory.h"
 #endif
 
-#ifdef ANDROID_INSTRUMENT
-#include "TimeCounter.h"
-#include "RenderArena.h"
-#endif
-
 namespace WebCore {
 
 using namespace HTMLNames;
@@ -1114,11 +1109,7 @@ void FrameLoader::handleFallbackContent()
 }
 
 void FrameLoader::provisionalLoadStarted()
-{    
-#ifdef ANDROID_INSTRUMENT
-    if (!m_frame->tree()->parent())
-        android::TimeCounter::reset();
-#endif
+{
     if (m_stateMachine.firstLayoutDone())
         m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad);
     m_frame->navigationScheduler()->cancel(true);
@@ -2308,7 +2299,7 @@ void FrameLoader::finishedLoadingDocument(DocumentLoader* loader)
     if (m_stateMachine.creatingInitialEmptyDocument())
         return;
 #endif
-    
+
 #if !ENABLE(WEB_ARCHIVE)
     m_client->finishedLoading(loader);
 #else
@@ -2499,12 +2490,6 @@ void FrameLoader::checkLoadCompleteForThisFrame()
 
             if (Page* page = m_frame->page())
                 page->progress()->progressCompleted(m_frame);
-
-#ifdef ANDROID_INSTRUMENT
-            if (!m_frame->tree()->parent() && m_frame->document()->renderArena())
-                android::TimeCounter::report(m_URL, cache()->getLiveSize(), cache()->getDeadSize(),
-                        m_frame->document()->renderArena()->reportPoolSize());
-#endif
             return;
         }
         
diff --git a/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp b/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp
index 55d7cec..5f60163 100644
--- a/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp
+++ b/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp
@@ -36,6 +36,7 @@
 #include <libxml/tree.h>
 #include <libxml/xmlstring.h>
 #include <libxml/xmlwriter.h>
+#include <utils/Log.h>
 #include <wtf/text/CString.h>
 
 namespace WebCore {
@@ -117,7 +118,7 @@ static bool loadArchiveResourceField(xmlNodePtr resourceNode, const xmlChar* fie
         }
     }
     if (!base64Data) {
-        LOGD("loadArchiveResourceField: Failed to load field.");
+        ALOGD("loadArchiveResourceField: Failed to load field.");
         return false;
     }
 
@@ -125,7 +126,7 @@ static bool loadArchiveResourceField(xmlNodePtr resourceNode, const xmlChar* fie
 
     const int result = base64Decode(base64Data, base64Size, *outputData);
     if (!result) {
-        LOGD("loadArchiveResourceField: Failed to decode field.");
+        ALOGD("loadArchiveResourceField: Failed to decode field.");
         return false;
     }
 
@@ -165,37 +166,37 @@ static KURL loadArchiveResourceFieldURL(xmlNodePtr resourceNode, const xmlChar*
 static PassRefPtr<ArchiveResource> loadArchiveResource(xmlNodePtr resourceNode)
 {
     if (!xmlStrEqual(resourceNode->name, archiveResourceTag)) {
-        LOGD("loadArchiveResource: Malformed resource.");
+        ALOGD("loadArchiveResource: Malformed resource.");
         return 0;
     }
 
     KURL url = loadArchiveResourceFieldURL(resourceNode, urlFieldTag);
     if (url.isNull()) {
-        LOGD("loadArchiveResource: Failed to load resource.");
+        ALOGD("loadArchiveResource: Failed to load resource.");
         return 0;
     }
 
     String mimeType = loadArchiveResourceFieldString(resourceNode, mimeFieldTag);
     if (mimeType.isNull()) {
-        LOGD("loadArchiveResource: Failed to load resource.");
+        ALOGD("loadArchiveResource: Failed to load resource.");
         return 0;
     }
 
     String textEncoding = loadArchiveResourceFieldString(resourceNode, encodingFieldTag);
     if (textEncoding.isNull()) {
-        LOGD("loadArchiveResource: Failed to load resource.");
+        ALOGD("loadArchiveResource: Failed to load resource.");
         return 0;
     }
 
     String frameName = loadArchiveResourceFieldString(resourceNode, frameFieldTag);
     if (frameName.isNull()) {
-        LOGD("loadArchiveResource: Failed to load resource.");
+        ALOGD("loadArchiveResource: Failed to load resource.");
         return 0;
     }
 
     PassRefPtr<SharedBuffer> data = loadArchiveResourceFieldBuffer(resourceNode, dataFieldTag);
     if (!data) {
-        LOGD("loadArchiveResource: Failed to load resource.");
+        ALOGD("loadArchiveResource: Failed to load resource.");
         return 0;
     }
 
@@ -211,7 +212,7 @@ static PassRefPtr<WebArchiveAndroid> loadArchive(xmlNodePtr archiveNode)
     Vector<PassRefPtr<Archive> > subframes;
 
     if (!xmlStrEqual(archiveNode->name, archiveTag)) {
-        LOGD("loadArchive: Malformed archive.");
+        ALOGD("loadArchive: Malformed archive.");
         return 0;
     }
 
@@ -227,7 +228,7 @@ static PassRefPtr<WebArchiveAndroid> loadArchive(xmlNodePtr archiveNode)
         }
     }
     if (!mainResource) {
-        LOGD("loadArchive: Failed to load main resource.");
+        ALOGD("loadArchive: Failed to load main resource.");
         return 0;
     }
 
@@ -240,7 +241,7 @@ static PassRefPtr<WebArchiveAndroid> loadArchive(xmlNodePtr archiveNode)
                  resourceNode = resourceNode->next) {
                 PassRefPtr<ArchiveResource> subresource = loadArchiveResource(resourceNode);
                 if (!subresource) {
-                    LOGD("loadArchive: Failed to load subresource.");
+                    ALOGD("loadArchive: Failed to load subresource.");
                     break;
                 }
                 subresources.append(subresource);
@@ -258,7 +259,7 @@ static PassRefPtr<WebArchiveAndroid> loadArchive(xmlNodePtr archiveNode)
                  resourceNode = resourceNode->next) {
                 PassRefPtr<WebArchiveAndroid> subframe = loadArchive(resourceNode);
                 if (!subframe) {
-                    LOGD("loadArchive: Failed to load subframe.");
+                    ALOGD("loadArchive: Failed to load subframe.");
                     break;
                 }
                 subframes.append(subframe);
@@ -290,20 +291,20 @@ PassRefPtr<WebArchiveAndroid> WebArchiveAndroid::create(SharedBuffer* buffer)
 
     xmlDocPtr doc = xmlReadMemory(buffer->data(), buffer->size(), noBaseUrl, defaultEncoding, noParserOptions);
     if (!doc) {
-        LOGD("create: Failed to parse document.");
+        ALOGD("create: Failed to parse document.");
         return createArchiveForError();
     }
 
     xmlNodePtr root = xmlDocGetRootElement(doc);
     if (!root) {
-        LOGD("create: Empty document.");
+        ALOGD("create: Empty document.");
         xmlFreeDoc(doc);
         return createArchiveForError();
     }
 
     RefPtr<WebArchiveAndroid> archive = loadArchive(root);
     if (!archive) {
-        LOGD("create: Failed to load archive.");
+        ALOGD("create: Failed to load archive.");
         xmlFreeDoc(doc);
         return createArchiveForError();
     }
@@ -316,7 +317,7 @@ static bool saveArchiveResourceField(xmlTextWriterPtr writer, const xmlChar* tag
 {
     int result = xmlTextWriterStartElement(writer, tag);
     if (result < 0) {
-        LOGD("saveArchiveResourceField: Failed to start element.");
+        ALOGD("saveArchiveResourceField: Failed to start element.");
         return false;
     }
 
@@ -324,20 +325,20 @@ static bool saveArchiveResourceField(xmlTextWriterPtr writer, const xmlChar* tag
         Vector<char> base64Data;
         base64Encode(data, size, base64Data, false);
         if (base64Data.isEmpty()) {
-            LOGD("saveArchiveResourceField: Failed to base64 encode data.");
+            ALOGD("saveArchiveResourceField: Failed to base64 encode data.");
             return false;
         }
 
         result = xmlTextWriterWriteRawLen(writer, BAD_CAST base64Data.data(), base64Data.size());
         if (result < 0) {
-            LOGD("saveArchiveResourceField: Failed to write data.");
+            ALOGD("saveArchiveResourceField: Failed to write data.");
             return false;
         }
     }
 
     result = xmlTextWriterEndElement(writer);
     if (result < 0) {
-        LOGD("saveArchiveResourceField: Failed to end element.");
+        ALOGD("saveArchiveResourceField: Failed to end element.");
         return false;
     }
 
@@ -360,7 +361,7 @@ static bool saveArchiveResource(xmlTextWriterPtr writer, PassRefPtr<ArchiveResou
 {
     int result = xmlTextWriterStartElement(writer, archiveResourceTag);
     if (result < 0) {
-        LOGD("saveArchiveResource: Failed to start element.");
+        ALOGD("saveArchiveResource: Failed to start element.");
         return false;
     }
 
@@ -373,7 +374,7 @@ static bool saveArchiveResource(xmlTextWriterPtr writer, PassRefPtr<ArchiveResou
 
     result = xmlTextWriterEndElement(writer);
     if (result < 0) {
-        LOGD("saveArchiveResource: Failed to end element.");
+        ALOGD("saveArchiveResource: Failed to end element.");
         return false;
     }
 
@@ -384,13 +385,13 @@ static bool saveArchive(xmlTextWriterPtr writer, PassRefPtr<Archive> archive)
 {
     int result = xmlTextWriterStartElement(writer, archiveTag);
     if (result < 0) {
-        LOGD("saveArchive: Failed to start element.");
+        ALOGD("saveArchive: Failed to start element.");
         return false;
     }
 
     result = xmlTextWriterStartElement(writer, mainResourceTag);
     if (result < 0) {
-        LOGD("saveArchive: Failed to start element.");
+        ALOGD("saveArchive: Failed to start element.");
         return false;
     }
 
@@ -399,13 +400,13 @@ static bool saveArchive(xmlTextWriterPtr writer, PassRefPtr<Archive> archive)
 
     result = xmlTextWriterEndElement(writer);
     if (result < 0) {
-        LOGD("saveArchive: Failed to end element.");
+        ALOGD("saveArchive: Failed to end element.");
         return false;
     }
 
     result = xmlTextWriterStartElement(writer, subresourcesTag);
     if (result < 0) {
-        LOGD("saveArchive: Failed to start element.");
+        ALOGD("saveArchive: Failed to start element.");
         return false;
     }
 
@@ -418,13 +419,13 @@ static bool saveArchive(xmlTextWriterPtr writer, PassRefPtr<Archive> archive)
 
     result = xmlTextWriterEndElement(writer);
     if (result < 0) {
-        LOGD("saveArchive: Failed to end element.");
+        ALOGD("saveArchive: Failed to end element.");
         return false;
     }
 
     result = xmlTextWriterStartElement(writer, subframesTag);
     if (result < 0) {
-        LOGD("saveArchive: Failed to start element.");
+        ALOGD("saveArchive: Failed to start element.");
         return false;
     }
 
@@ -437,7 +438,7 @@ static bool saveArchive(xmlTextWriterPtr writer, PassRefPtr<Archive> archive)
 
     result = xmlTextWriterEndElement(writer);
     if (result < 0) {
-        LOGD("saveArchive: Failed to end element.");
+        ALOGD("saveArchive: Failed to end element.");
         return true;
     }
 
@@ -452,7 +453,7 @@ bool WebArchiveAndroid::saveWebArchive(xmlTextWriterPtr writer)
 
     int result = xmlTextWriterStartDocument(writer, defaultXmlVersion, defaultEncoding, defaultStandalone);
     if (result < 0) {
-        LOGD("saveWebArchive: Failed to start document.");
+        ALOGD("saveWebArchive: Failed to start document.");
         return false;
     }
 
@@ -461,7 +462,7 @@ bool WebArchiveAndroid::saveWebArchive(xmlTextWriterPtr writer)
 
     result = xmlTextWriterEndDocument(writer);
     if (result< 0) {
-        LOGD("saveWebArchive: Failed to end document.");
+        ALOGD("saveWebArchive: Failed to end document.");
         return false;
     }
 
diff --git a/Source/WebCore/loader/cache/MemoryCache.h b/Source/WebCore/loader/cache/MemoryCache.h
index a092eac..c9b91f9 100644
--- a/Source/WebCore/loader/cache/MemoryCache.h
+++ b/Source/WebCore/loader/cache/MemoryCache.h
@@ -171,12 +171,6 @@ public:
     void removeResourcesWithOrigin(SecurityOrigin*);
     void getOriginsWithCache(SecurityOriginSet& origins);
 
-#ifdef ANDROID_INSTRUMENT
-    unsigned getLiveSize() { return m_liveSize; }
-    unsigned getDeadSize() { return m_deadSize; }
-#endif
-
-
 private:
     MemoryCache();
     ~MemoryCache(); // Not implemented to make sure nobody accidentally calls delete -- WebCore does not delete singletons.
diff --git a/Source/WebCore/loader/icon/IconDatabase.cpp b/Source/WebCore/loader/icon/IconDatabase.cpp
index 3cefea7..2bb22ec 100644
--- a/Source/WebCore/loader/icon/IconDatabase.cpp
+++ b/Source/WebCore/loader/icon/IconDatabase.cpp
@@ -73,7 +73,7 @@ static const int updateTimerDelay = 5;
 
 static bool checkIntegrityOnOpen = false;
 
-#ifndef NDEBUG
+#if !LOG_DISABLED || !ERROR_DISABLED
 static String urlForLogging(const String& url)
 {
     static unsigned urlTruncationLength = 120;
@@ -967,7 +967,7 @@ void* IconDatabase::iconDatabaseSyncThread()
     
     LOG(IconDatabase, "(THREAD) IconDatabase sync thread started");
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     double startTime = currentTime();
 #endif
 
@@ -993,7 +993,7 @@ void* IconDatabase::iconDatabaseSyncThread()
     if (shouldStopThreadActivity())
         return syncThreadMainLoop();
         
-#ifndef NDEBUG
+#if !LOG_DISABLED
     double timeStamp = currentTime();
     LOG(IconDatabase, "(THREAD) Open took %.4f seconds", timeStamp - startTime);
 #endif    
@@ -1002,7 +1002,7 @@ void* IconDatabase::iconDatabaseSyncThread()
     if (shouldStopThreadActivity())
         return syncThreadMainLoop();
         
-#ifndef NDEBUG
+#if !LOG_DISABLED
     double newStamp = currentTime();
     LOG(IconDatabase, "(THREAD) performOpenInitialization() took %.4f seconds, now %.4f seconds from thread start", newStamp - timeStamp, newStamp - startTime);
     timeStamp = newStamp;
@@ -1025,7 +1025,7 @@ void* IconDatabase::iconDatabaseSyncThread()
         if (shouldStopThreadActivity())
             return syncThreadMainLoop();
             
-#ifndef NDEBUG
+#if !LOG_DISABLED
         newStamp = currentTime();
         LOG(IconDatabase, "(THREAD) performImport() took %.4f seconds, now %.4f seconds from thread start", newStamp - timeStamp, newStamp - startTime);
         timeStamp = newStamp;
@@ -1042,7 +1042,7 @@ void* IconDatabase::iconDatabaseSyncThread()
     if (shouldStopThreadActivity())
         return syncThreadMainLoop();
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     newStamp = currentTime();
     LOG(IconDatabase, "(THREAD) performURLImport() took %.4f seconds.  Entering main loop %.4f seconds from thread start", newStamp - timeStamp, newStamp - startTime);
 #endif 
@@ -1358,7 +1358,7 @@ void* IconDatabase::syncThreadMainLoop()
     while (!m_threadTerminationRequested) {
         m_syncLock.unlock();
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
         double timeStamp = currentTime();
 #endif
         LOG(IconDatabase, "(THREAD) Main work loop starting");
@@ -1391,7 +1391,7 @@ void* IconDatabase::syncThreadMainLoop()
             // has asked to delay pruning
             static bool prunedUnretainedIcons = false;
             if (didWrite && !m_privateBrowsingEnabled && !prunedUnretainedIcons && !databaseCleanupCounter) {
-#ifndef NDEBUG
+#if !LOG_DISABLED
                 double time = currentTime();
 #endif
                 LOG(IconDatabase, "(THREAD) Starting pruneUnretainedIcons()");
@@ -1410,7 +1410,7 @@ void* IconDatabase::syncThreadMainLoop()
                 break;
         }
         
-#ifndef NDEBUG
+#if !LOG_DISABLED
         double newstamp = currentTime();
         LOG(IconDatabase, "(THREAD) Main work loop ran for %.4f seconds, %s requested to terminate", newstamp - timeStamp, shouldStopThreadActivity() ? "was" : "was not");
 #endif
@@ -1458,7 +1458,7 @@ bool IconDatabase::readFromDatabase()
 {
     ASSERT_ICON_SYNC_THREAD();
     
-#ifndef NDEBUG
+#if !LOG_DISABLED
     double timeStamp = currentTime();
 #endif
 
@@ -1567,7 +1567,7 @@ bool IconDatabase::writeToDatabase()
 {
     ASSERT_ICON_SYNC_THREAD();
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     double timeStamp = currentTime();
 #endif
 
@@ -1772,7 +1772,7 @@ void* IconDatabase::cleanupSyncThread()
 {
     ASSERT_ICON_SYNC_THREAD();
     
-#ifndef NDEBUG
+#if !LOG_DISABLED
     double timeStamp = currentTime();
 #endif 
 
@@ -1792,7 +1792,7 @@ void* IconDatabase::cleanupSyncThread()
     deleteAllPreparedStatements();    
     m_syncDB.close();
     
-#ifndef NDEBUG
+#if !LOG_DISABLED
     LOG(IconDatabase, "(THREAD) Final closure took %.4f seconds", currentTime() - timeStamp);
 #endif