For local review prior to sending to webkit

page/DOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 58 matching lines @@
 #include "Database.h"
 #endif
 
 #if ENABLE(DOM_STORAGE)
 #include "LocalStorage.h"
 #include "SessionStorage.h"
 #include "Storage.h"
 #include "StorageArea.h"
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
 #include "DOMApplicationCache.h"
 #endif
 
 using std::min;
 using std::max;
 
 namespace WebCore {
 
 class PostMessageTimer : public TimerBase {
 public:
@@ skipping 338 matching lines @@
 #if ENABLE(DOM_STORAGE)
     if (m_sessionStorage)
         m_sessionStorage->disconnectFrame();
     m_sessionStorage = 0;
 
     if (m_localStorage)
         m_localStorage->disconnectFrame();
     m_localStorage = 0;
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
     if (m_applicationCache)
         m_applicationCache->disconnectFrame();
     m_applicationCache = 0;
 #endif
 }
 
 Screen* DOMWindow::screen() const
 {
     if (!m_screen)
         m_screen = Screen::create(m_frame);
@@ skipping 49 matching lines @@
     return m_toolbar.get();
 }
 
 Console* DOMWindow::console() const
 {
     if (!m_console)
         m_console = Console::create(m_frame);
     return m_console.get();
 }
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
 DOMApplicationCache* DOMWindow::applicationCache() const
 {
     if (!m_applicationCache)
         m_applicationCache = DOMApplicationCache::create(m_frame);
     return m_applicationCache.get();
 }
 #endif
 
 Navigator* DOMWindow::navigator() const
 {
@@ skipping 1142 matching lines @@
 {
     // Not implemented.
 }
 
 void DOMWindow::releaseEvents()
 {
     // Not implemented.
 }
 
 } // namespace WebCore