diff options
Diffstat (limited to 'Source/WebCore/loader/archive/android')
| -rw-r--r-- | Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp | 60 | 
1 files changed, 30 insertions, 30 deletions
| diff --git a/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp b/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp index 048d787..5f60163 100644 --- a/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp +++ b/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp @@ -118,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;      } @@ -126,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;      } @@ -166,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;      } @@ -212,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;      } @@ -228,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;      } @@ -241,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); @@ -259,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); @@ -291,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();      } @@ -317,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;      } @@ -325,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;      } @@ -361,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;      } @@ -374,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;      } @@ -385,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;      } @@ -400,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;      } @@ -419,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;      } @@ -438,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;      } @@ -453,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;      } @@ -462,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;      } | 
