1 files changed, 40 insertions, 24 deletions

diff --git a/WebKit/android/FrameLoaderClientAndroid.h b/WebKit/android/FrameLoaderClientAndroid.h
index 0900863..58b296e 100644
--- a/WebKit/android/FrameLoaderClientAndroid.h
+++ b/WebKit/android/FrameLoaderClientAndroid.h
@@ -1,40 +1,51 @@
-/* 
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
+/*
+ * Copyright 2007, 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 APPLE COMPUTER, INC. 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 FrameLoaderClientAndroid_h
 #define FrameLoaderClientAndroid_h
 
+#include "CacheBuilder.h"
 #include "FrameLoaderClient.h"
 #include "ResourceResponse.h"
 #include "WebIconDatabase.h"
 
+using namespace WebCore;
+
 namespace android {
     class WebFrame;
-}
-
-namespace WebCore {
 
     class FrameLoaderClientAndroid : public FrameLoaderClient,
-            android::WebIconDatabaseClient {
+            WebIconDatabaseClient {
     public:
-        FrameLoaderClientAndroid(android::WebFrame* webframe);
+        FrameLoaderClientAndroid(WebFrame* webframe);
+
+        Frame* getFrame() { return m_frame; }
+        static FrameLoaderClientAndroid* get(const Frame* frame);
 
         void setFrame(Frame* frame) { m_frame = frame; }
-        android::WebFrame* webFrame() const { return m_webFrame; }
+        WebFrame* webFrame() const { return m_webFrame; }
         
         virtual void frameLoaderDestroyed();
         
@@ -164,7 +175,7 @@ namespace WebCore {
         virtual bool canCachePage() const;
         virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&);
 
-        virtual WTF::PassRefPtr<WebCore::Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
+        virtual WTF::PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
                                    const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
        virtual Widget* createPlugin(const IntSize&, Element*, const KURL&, 
             const WTF::Vector<WebCore::String, 0u>&, const WTF::Vector<String, 0u>&, 
@@ -187,9 +198,13 @@ namespace WebCore {
 
         // WebIconDatabaseClient api
         virtual void didAddIconForPageUrl(const String& pageUrl);
+        
+        // FIXME: this doesn't really go here, but it's better than Frame
+        CacheBuilder& getCacheBuilder() { return m_cacheBuilder; }
     private:
+        CacheBuilder m_cacheBuilder;
         Frame*              m_frame;
-        android::WebFrame*  m_webFrame;
+        WebFrame*  m_webFrame;
 
         enum ResourceErrors {
             InternalErrorCancelled = -99,
@@ -219,6 +234,7 @@ namespace WebCore {
             ErrorFileNotFound          = -14,
             ErrorTooManyRequests       = -15
         };
+        friend class CacheBuilder;
     };
 
 }