For local review prior to sending to webkit

page/DOMWindow.h

 /*
  * Copyright (C) 2006, 2007, 2009 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 47 matching lines @@
     class PostMessageTimer;
     class ScheduledAction;
     class Screen;
     class WebKitPoint;
 
 #if ENABLE(DOM_STORAGE)
     class SessionStorage;
     class Storage;
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
     class DOMApplicationCache;
 #endif
 
     typedef int ExceptionCode;
 
     class DOMWindow : public RefCounted<DOMWindow>, public EventTarget {
     public:
         static PassRefPtr<DOMWindow> create(Frame* frame) { return adoptRef(new DOMWindow(frame)); }
         virtual ~DOMWindow();
 
@@ skipping 110 matching lines @@
 #endif
 
 #if ENABLE(DOM_STORAGE)
         // HTML 5 key/value storage
         Storage* sessionStorage() const;
         Storage* localStorage() const;
 #endif
 
         Console* console() const;
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
         DOMApplicationCache* applicationCache() const;
 #endif
 
         void postMessage(const String& message, MessagePort*, const String& targetOrigin, DOMWindow* source, ExceptionCode&);
         void postMessageTimerFired(PostMessageTimer*);
 
         void scrollBy(int x, int y) const;
         void scrollTo(int x, int y) const;
         void scroll(int x, int y) const { scrollTo(x, y); }
 
@@ skipping 104 matching lines @@
         BarInfo* optionalScrollbars() const { return m_scrollbars.get(); }
         BarInfo* optionalStatusbar() const { return m_statusbar.get(); }
         BarInfo* optionalToolbar() const { return m_toolbar.get(); }
         Console* optionalConsole() const { return m_console.get(); }
         Navigator* optionalNavigator() const { return m_navigator.get(); }
         Location* optionalLocation() const { return m_location.get(); }
 #if ENABLE(DOM_STORAGE)
         Storage* optionalSessionStorage() const { return m_sessionStorage.get(); }
         Storage* optionalLocalStorage() const { return m_localStorage.get(); }
 #endif
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
         DOMApplicationCache* optionalApplicationCache() const { return m_applicationCache.get(); }
 #endif
 
         using RefCounted<DOMWindow>::ref;
         using RefCounted<DOMWindow>::deref;
 
     private:
         DOMWindow(Frame*);
 
         virtual void refEventTarget() { ref(); }
@@ skipping 14 matching lines @@
         mutable RefPtr<BarInfo> m_scrollbars;
         mutable RefPtr<BarInfo> m_statusbar;
         mutable RefPtr<BarInfo> m_toolbar;
         mutable RefPtr<Console> m_console;
         mutable RefPtr<Navigator> m_navigator;
         mutable RefPtr<Location> m_location;
 #if ENABLE(DOM_STORAGE)
         mutable RefPtr<Storage> m_sessionStorage;
         mutable RefPtr<Storage> m_localStorage;
 #endif
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
         mutable RefPtr<DOMApplicationCache> m_applicationCache;
 #endif
 
         RegisteredEventListenerVector m_eventListeners;
     };
 
 } // namespace WebCore
 
 #endif // DOMWindow_h