From 31dbc523d9ee6fd7d7e46c540b5f675eeb559ed7 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 9 May 2011 16:25:46 +0100 Subject: Merge WebKit at r75315: Move Android-specific WebCore files to Source This moves files in the following WebCore subdirectories ... - bindings/js - bindings/v8/custom - plugins/android - platform/android - platform/graphics/android - page/ - css/ - dom/ - loader/archive/android --- WebCore/loader/archive/android/WebArchiveAndroid.h | 55 ---------------------- 1 file changed, 55 deletions(-) delete mode 100644 WebCore/loader/archive/android/WebArchiveAndroid.h (limited to 'WebCore/loader/archive/android/WebArchiveAndroid.h') diff --git a/WebCore/loader/archive/android/WebArchiveAndroid.h b/WebCore/loader/archive/android/WebArchiveAndroid.h deleted file mode 100644 index 1bbf952..0000000 --- a/WebCore/loader/archive/android/WebArchiveAndroid.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2010, The Android Open Source Project - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef WebArchiveAndroid_h -#define WebArchiveAndroid_h - -#include "Archive.h" -#include "DocumentLoader.h" -#include "Frame.h" -#include - -namespace WebCore { - -class WebArchiveAndroid : public Archive { -public: - static PassRefPtr create(PassRefPtr mainResource, - Vector >& subresources, - Vector >& subframeArchives); - - static PassRefPtr create(Frame* frame); - static PassRefPtr create(SharedBuffer* buffer); - - bool saveWebArchive(xmlTextWriterPtr writer); - -private: - WebArchiveAndroid(PassRefPtr mainResource, - Vector >& subresources, - Vector >& subframeArchives); -}; - -} - -#endif // WEBARCHIVEANDROID_H -- cgit v1.1