Title: [158210] trunk/Source/WebKit2
- Revision
- 158210
- Author
- [email protected]
- Date
- 2013-10-29 12:43:29 -0700 (Tue, 29 Oct 2013)
Log Message
SessionState.h should not include WebBackForwardList.h
https://bugs.webkit.org/show_bug.cgi?id=123454
Reviewed by Geoff Garen.
WebBackForwardList is a UIProcess type, SessionState is in shared code.
Also, WebBackForwardListItemVector should be in WebBackForwardListItem.h, not WebBackForwardList.h
(the vector type is used in the WebProcess, the item header is shared but the list type is in the UIProcess).
* Shared/SessionState.cpp:
- fixed includes
* Shared/SessionState.h:
- WebBackForwardList.h -> WebBackForwardListItem.h
* Shared/WebBackForwardListItem.h:
- Moved WebBackForwardListVector from WebBackForwardList.h
* Shared/WebPageCreationParameters.h:
- fixed includes
* UIProcess/WebBackForwardList.h:
- Moved WebBackForwardListVector to WebBackForwardListItem.h
* WebProcess/WebPage/DrawingArea.cpp:
- fixed includes
* WebProcess/WebPage/WebPage.cpp:
- fixed includes
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (158209 => 158210)
--- trunk/Source/WebKit2/ChangeLog 2013-10-29 19:41:03 UTC (rev 158209)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-29 19:43:29 UTC (rev 158210)
@@ -1,3 +1,29 @@
+2013-10-29 Gavin Barraclough <[email protected]>
+
+ SessionState.h should not include WebBackForwardList.h
+ https://bugs.webkit.org/show_bug.cgi?id=123454
+
+ Reviewed by Geoff Garen.
+
+ WebBackForwardList is a UIProcess type, SessionState is in shared code.
+ Also, WebBackForwardListItemVector should be in WebBackForwardListItem.h, not WebBackForwardList.h
+ (the vector type is used in the WebProcess, the item header is shared but the list type is in the UIProcess).
+
+ * Shared/SessionState.cpp:
+ - fixed includes
+ * Shared/SessionState.h:
+ - WebBackForwardList.h -> WebBackForwardListItem.h
+ * Shared/WebBackForwardListItem.h:
+ - Moved WebBackForwardListVector from WebBackForwardList.h
+ * Shared/WebPageCreationParameters.h:
+ - fixed includes
+ * UIProcess/WebBackForwardList.h:
+ - Moved WebBackForwardListVector to WebBackForwardListItem.h
+ * WebProcess/WebPage/DrawingArea.cpp:
+ - fixed includes
+ * WebProcess/WebPage/WebPage.cpp:
+ - fixed includes
+
2013-10-29 Zan Dobersek <[email protected]>
Unreviewed Mac debug build fix after r158183.
Modified: trunk/Source/WebKit2/Shared/SessionState.cpp (158209 => 158210)
--- trunk/Source/WebKit2/Shared/SessionState.cpp 2013-10-29 19:41:03 UTC (rev 158209)
+++ trunk/Source/WebKit2/Shared/SessionState.cpp 2013-10-29 19:43:29 UTC (rev 158210)
@@ -25,6 +25,7 @@
#include "config.h"
#include "SessionState.h"
+#include "WebCoreArgumentCoders.h"
namespace CoreIPC {
Modified: trunk/Source/WebKit2/Shared/SessionState.h (158209 => 158210)
--- trunk/Source/WebKit2/Shared/SessionState.h 2013-10-29 19:41:03 UTC (rev 158209)
+++ trunk/Source/WebKit2/Shared/SessionState.h 2013-10-29 19:43:29 UTC (rev 158210)
@@ -26,7 +26,7 @@
#ifndef SessionState_h
#define SessionState_h
-#include "WebBackForwardList.h"
+#include "WebBackForwardListItem.h"
namespace CoreIPC {
class ArgumentDecoder;
Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.h (158209 => 158210)
--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2013-10-29 19:41:03 UTC (rev 158209)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2013-10-29 19:43:29 UTC (rev 158210)
@@ -75,6 +75,8 @@
Vector<uint8_t> m_backForwardData;
};
+typedef Vector<RefPtr<WebBackForwardListItem>> BackForwardListItemVector;
+
} // namespace WebKit
#endif // WebBackForwardListItem_h
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (158209 => 158210)
--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2013-10-29 19:41:03 UTC (rev 158209)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2013-10-29 19:43:29 UTC (rev 158210)
@@ -27,10 +27,15 @@
#define WebPageCreationParameters_h
#include "DrawingAreaInfo.h"
+#include "LayerTreeContext.h"
#include "SessionState.h"
+#include "WebCoreArgumentCoders.h"
#include "WebPageGroupData.h"
#include "WebPreferencesStore.h"
+#include <WebCore/Color.h>
#include <WebCore/IntSize.h>
+#include <WebCore/Pagination.h>
+#include <WebCore/ScrollTypes.h>
#include <wtf/text/WTFString.h>
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (158209 => 158210)
--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2013-10-29 19:41:03 UTC (rev 158209)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2013-10-29 19:43:29 UTC (rev 158210)
@@ -39,8 +39,6 @@
namespace WebKit {
-typedef Vector<RefPtr<WebBackForwardListItem>> BackForwardListItemVector;
-
/*
* Current
* |---------*--------------| Entries
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp (158209 => 158210)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2013-10-29 19:41:03 UTC (rev 158209)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2013-10-29 19:43:29 UTC (rev 158210)
@@ -25,6 +25,7 @@
#include "config.h"
#include "DrawingArea.h"
+#include <wtf/Functional.h>
// Subclasses
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (158209 => 158210)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-10-29 19:41:03 UTC (rev 158209)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-10-29 19:43:29 UTC (rev 158210)
@@ -31,8 +31,10 @@
#include "Arguments.h"
#include "DataReference.h"
#include "DecoderAdapter.h"
+#include "DragControllerAction.h"
#include "DrawingArea.h"
#include "DrawingAreaMessages.h"
+#include "EditorState.h"
#include "EventDispatcher.h"
#include "InjectedBundle.h"
#include "InjectedBundleBackForwardList.h"
@@ -49,8 +51,8 @@
#include "PrintInfo.h"
#include "SessionState.h"
#include "ShareableBitmap.h"
+#include "WKSharedAPICast.h"
#include "WebAlternativeTextClient.h"
-#include "WebBackForwardList.h"
#include "WebBackForwardListItem.h"
#include "WebBackForwardListProxy.h"
#include "WebChromeClient.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
