Changeset 32225 in webkit

Timestamp:

Apr 18, 2008 1:54:04 PM (16 years ago)

Author:

mrowe@apple.com

Message:

Fix builds that do not have DOM storage enabled.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DOMWindow.cpp (modified) (3 diffs)
• page/Page.cpp (modified) (2 diffs)
• page/PageGroup.cpp (modified) (3 diffs)
• page/PageGroup.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-10  Mark Rowe  <mrowe@apple.com>
+
+        Rubber-stamped by Brady Eidson.
+
+        Fix builds that do not have DOM storage enabled.
+
+        * page/DOMWindow.cpp:
+        * page/Page.cpp:
+        * page/PageGroup.cpp:
+        * page/PageGroup.h:
+
 2008-04-18  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/page/DOMWindow.cpp

@@ -33 +33 @@
 #include "Chrome.h"
 #include "Console.h"
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-#include "DOMApplicationCache.h"
-#endif
 #include "DOMSelection.h"
 #include "Document.h"
@@ -46 +43 @@
 #include "HTMLFrameOwnerElement.h"
 #include "History.h"
-#include "LocalStorage.h"
 #include "Location.h"
 #include "Navigator.h"
@@ -66 +62 @@
 
 #if ENABLE(DOM_STORAGE)
+#include "LocalStorage.h"
 #include "SessionStorage.h"
 #include "Storage.h"
 #include "StorageArea.h"
+#endif
+
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+#include "DOMApplicationCache.h"
 #endif
 

trunk/WebCore/page/Page.cpp

@@ -38 +38 @@
 #include "InspectorController.h"
 #include "JavaScriptDebugServer.h"
-#include "LocalStorage.h"
 #include "Logging.h"
 #include "Navigator.h"
@@ -56 +55 @@
 
 #if ENABLE(DOM_STORAGE)
+#include "LocalStorage.h"
 #include "SessionStorage.h"
 #include "StorageArea.h"

trunk/WebCore/page/PageGroup.cpp

@@ -29 +29 @@
 #include "ChromeClient.h"
 #include "Document.h"
+#include "Page.h"
+
+#if ENABLE(DOM_STORAGE)
 #include "LocalStorage.h"
-#include "Page.h"
 #include "StorageArea.h"
+#endif
 
 namespace WebCore {
@@ -117 +120 @@
 }
 
+#if ENABLE(DOM_STORAGE)
 LocalStorage* PageGroup::localStorage()
 {
@@ -126 +130 @@
     return m_localStorage.get();
 }
+#endif
 
 } // namespace WebCore

trunk/WebCore/page/PageGroup.h

@@ -54 +54 @@
         static void setShouldTrackVisitedLinks(bool);
         static void removeAllVisitedLinks();
-        
+
+#if ENABLE(DOM_STORAGE)
         LocalStorage* localStorage();
+#endif
 
     private:
@@ -63 +65 @@
         HashSet<unsigned, AlreadyHashed> m_visitedLinkHashes;
         bool m_visitedLinksPopulated;
+
+#if ENABLE(DOM_STORAGE)
         RefPtr<LocalStorage> m_localStorage;
+#endif
     };