For local review prior to sending to webkit

html/HTMLHtmlElement.cpp

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Simon Hausmann (hausmann@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 #include "config.h"
 #include "HTMLHtmlElement.h"
 
-#include "ApplicationCacheGroup.h"
 #include "Document.h"
 #include "HTMLNames.h"
 
+// FIXME: The use of these two flags to should be a temporary situation. 
+// Eventually we should use ENABLE(APPLICATION_CACHE) for this feature in
+// all cases.
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) && ENABLE(APPLICATION_CACHE)
+#error APPLICATION_CACHE and OFFLINE_WEB_APPLICATIONS are mutually exclusive flags
+#endif
+
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#include "ApplicationCacheGroup.h"
+#elif ENABLE(APPLICATION_CACHE)
+#include "Frame.h"
+#include "FrameLoader.h"
+#endif
+
 namespace WebCore {
 
 using namespace HTMLNames;
 
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
+
+static void selectCacheWithoutManifest(Frame* frame)
+{
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+    ApplicationCacheGroup::selectCacheWithoutManifestURL(frame);
+#elif ENABLE(APPLICATION_CACHE)
+    frame->loader()->selectApplicationCacheWithoutManifest();
+#endif
+}
+
+static void selectCacheWithManifest(Frame* frame, const KURL& manifestURL)
+{
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+    ApplicationCacheGroup::selectCache(frame, manifestURL);
+#elif ENABLE(APPLICATION_CACHE)
+    frame->loader()->selectApplicationCacheWithManifest(manifestURL);
+#endif
+}
+
+#endif  // ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
+
 HTMLHtmlElement::HTMLHtmlElement(const QualifiedName& tagName, Document* doc)
     : HTMLElement(tagName, doc)
 {
     ASSERT(hasTagName(htmlTag));
 }
 
 HTMLHtmlElement::~HTMLHtmlElement()
 {
 }
 
 String HTMLHtmlElement::version() const
 {
     return getAttribute(versionAttr);
 }
 
 void HTMLHtmlElement::setVersion(const String &value)
 {
     setAttribute(versionAttr, value);
 }
 
 bool HTMLHtmlElement::checkDTD(const Node* newChild)
 {
     return newChild->hasTagName(headTag) || newChild->hasTagName(bodyTag) ||
            newChild->hasTagName(framesetTag) || newChild->hasTagName(noframesTag);
 }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
 void HTMLHtmlElement::insertedIntoDocument()
 {
     HTMLElement::insertedIntoDocument();
     
     if (!document()->parsing())
         return;
 
     if (!document()->frame())
         return;
 
     // Check the manifest attribute
     AtomicString manifest = getAttribute(manifestAttr);
-    if (manifest.isNull())
-        ApplicationCacheGroup::selectCacheWithoutManifestURL(document()->frame());
+    if (manifest.isNull() || manifest.isEmpty())
+        selectCacheWithoutManifest(document()->frame());
     else
-        ApplicationCacheGroup::selectCache(document()->frame(), document()->completeURL(manifest));
+        selectCacheWithManifest(document()->frame(), document()->completeURL(manifest));
 }
 #endif
 
 }