Commit c20efebf authored by mrowe@apple.com's avatar mrowe@apple.com

Fix builds that do not have DOM storage enabled.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32225 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 96ccacd2
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>
Fixes the regression where style rules in the Inspector always show "inline stylesheet"
......@@ -32,9 +32,6 @@
#include "CSSStyleSelector.h"
#include "Chrome.h"
#include "Console.h"
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
#include "DOMApplicationCache.h"
#endif
#include "DOMSelection.h"
#include "Document.h"
#include "Element.h"
......@@ -45,7 +42,6 @@
#include "FrameView.h"
#include "HTMLFrameOwnerElement.h"
#include "History.h"
#include "LocalStorage.h"
#include "Location.h"
#include "Navigator.h"
#include "Page.h"
......@@ -65,11 +61,16 @@
#endif
#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
using std::min;
using std::max;
......
......@@ -37,7 +37,6 @@
#include "HistoryItem.h"
#include "InspectorController.h"
#include "JavaScriptDebugServer.h"
#include "LocalStorage.h"
#include "Logging.h"
#include "Navigator.h"
#include "PageGroup.h"
......@@ -55,6 +54,7 @@
#include <wtf/HashMap.h>
#if ENABLE(DOM_STORAGE)
#include "LocalStorage.h"
#include "SessionStorage.h"
#include "StorageArea.h"
#endif
......
......@@ -28,9 +28,12 @@
#include "ChromeClient.h"
#include "Document.h"
#include "LocalStorage.h"
#include "Page.h"
#if ENABLE(DOM_STORAGE)
#include "LocalStorage.h"
#include "StorageArea.h"
#endif
namespace WebCore {
......@@ -116,6 +119,7 @@ void PageGroup::setShouldTrackVisitedLinks(bool shouldTrack)
removeAllVisitedLinks();
}
#if ENABLE(DOM_STORAGE)
LocalStorage* PageGroup::localStorage()
{
#if ENABLE(DATABASE)
......@@ -125,5 +129,6 @@ LocalStorage* PageGroup::localStorage()
return m_localStorage.get();
}
#endif
} // namespace WebCore
......@@ -53,8 +53,10 @@ namespace WebCore {
static void setShouldTrackVisitedLinks(bool);
static void removeAllVisitedLinks();
#if ENABLE(DOM_STORAGE)
LocalStorage* localStorage();
#endif
private:
void addVisitedLink(unsigned stringHash);
......@@ -62,7 +64,10 @@ namespace WebCore {
HashSet<Page*> m_pages;
HashSet<unsigned, AlreadyHashed> m_visitedLinkHashes;
bool m_visitedLinksPopulated;
#if ENABLE(DOM_STORAGE)
RefPtr<LocalStorage> m_localStorage;
#endif
};
} // namespace WebCore
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment