2007-04-12 Mark Rowe <mrowe@apple.com>
Qt build fix.
* WebCore.pro:
* editing/qt/EditorQt.cpp:
(WebCore::Editor::markBadGrammar):
* history/qt/CachedPageQt.cpp: Added.
(WebCore::CachedPage::close):
* history/qt/PageCacheQt.cpp: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@20848 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ea2b02b..1b6a527 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-04-12 Mark Rowe <mrowe@apple.com>
+
+ Qt build fix.
+
+ * WebCore.pro:
+ * editing/qt/EditorQt.cpp:
+ (WebCore::Editor::markBadGrammar):
+ * history/qt/CachedPageQt.cpp: Added.
+ (WebCore::CachedPage::close):
+ * history/qt/PageCacheQt.cpp: Removed.
+
2007-04-11 Brady Eidson <beidson@apple.com>
Reviewed by Antti
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index e062453..7b4154d 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -392,10 +392,10 @@
editing/visible_units.cpp \
editing/WrapContentsInDummySpanCommand.cpp \
history/BackForwardList.cpp \
+ history/CachedPage.cpp \
history/HistoryItem.cpp \
history/HistoryItemTimer.cpp \
- history/PageCache.cpp \
- history/qt/PageCacheQt.cpp \
+ history/qt/CachedPageQt.cpp \
html/CanvasGradient.cpp \
html/CanvasPattern.cpp \
html/CanvasRenderingContext2D.cpp \
@@ -521,7 +521,6 @@
page/FrameView.cpp \
page/MouseEventWithHitTestResults.cpp \
page/Page.cpp \
- page/PageState.cpp \
page/qt/DragControllerQt.cpp \
page/qt/EventHandlerQt.cpp \
page/qt/FrameQt.cpp \
diff --git a/WebCore/editing/qt/EditorQt.cpp b/WebCore/editing/qt/EditorQt.cpp
index 21ea763..9a4a606 100644
--- a/WebCore/editing/qt/EditorQt.cpp
+++ b/WebCore/editing/qt/EditorQt.cpp
@@ -91,4 +91,9 @@
}
+void Editor::markBadGrammar(const Selection& selection)
+{
+
+}
+
} // namespace WebCore
diff --git a/WebCore/history/qt/PageCacheQt.cpp b/WebCore/history/qt/CachedPageQt.cpp
similarity index 82%
rename from WebCore/history/qt/PageCacheQt.cpp
rename to WebCore/history/qt/CachedPageQt.cpp
index a64b9db..5d83001 100644
--- a/WebCore/history/qt/PageCacheQt.cpp
+++ b/WebCore/history/qt/CachedPageQt.cpp
@@ -24,26 +24,22 @@
*/
#include "config.h"
-#include "PageCache.h"
+#include "CachedPage.h"
namespace WebCore {
-void PageCache::close()
+void CachedPage::close()
{
- if (!m_pageState)
+ if (!m_document)
return;
// FIXME: <rdar://problem/4886844>
// The current method of tracking the "document view" is messy and quite platform specific
// Having a WebCore-way to track this would be great.
-// if (m_documentView)
-// objc_msgSend(m_documentView.get(), @selector(closeIfNotCurrentView));
+ // if (m_documentView)
+ // objc_msgSend(m_documentView.get(), @selector(closeIfNotCurrentView));
- m_pageState->clear();
-
- // Setting these to null is how the PageCache object knows it's been closed
- m_pageState = 0;
- m_documentLoader = 0;
+ clear();
}
} //namespace WebCore
