Changeset 207308 in webkit

Timestamp:

Oct 13, 2016 2:36:02 PM (8 years ago)

Author:

andersca@apple.com

Message:

Copy BackForwardList from WebCore to WebKit/win
​https://bugs.webkit.org/show_bug.cgi?id=163360

Reviewed by Alex Christensen.

Source/WebKit:

This is the first step towards getting rid of BackForwardList in WebCore.

• PlatformWin.cmake:

Add new files.

Source/WebKit/win:

Use our local BackForwardList class instead of WebCore::BackForwardList.

• BackForwardList.cpp: Added.
• BackForwardList.h: Added.
• WebBackForwardList.h:
• WebView.cpp:

(WebView::initWithFrame):
(WebView::backForwardList):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• PlatformWin.cmake (modified) (1 diff)
• win/BackForwardList.cpp (added)
• win/BackForwardList.h (added)
• win/ChangeLog (modified) (1 diff)
• win/WebBackForwardList.cpp (modified) (1 diff)
• win/WebBackForwardList.h (modified) (3 diffs)
• win/WebView.cpp (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2016-10-12  Anders Carlsson  <andersca@apple.com>
+
+        Copy BackForwardList from WebCore to WebKit/win
+        https://bugs.webkit.org/show_bug.cgi?id=163360
+
+        Reviewed by Alex Christensen.
+
+        This is the first step towards getting rid of BackForwardList in WebCore.
+
+        * PlatformWin.cmake:
+        Add new files.
+
 2016-10-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/PlatformWin.cmake

@@ -145 +145 @@
     win/AccessibleImage.cpp
     win/AccessibleTextImpl.cpp
+    win/BackForwardList.cpp
     win/CFDictionaryPropertyBag.cpp
     win/DOMCSSClasses.cpp

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2016-10-12  Anders Carlsson  <andersca@apple.com>
+
+        Copy BackForwardList from WebCore to WebKit/win
+        https://bugs.webkit.org/show_bug.cgi?id=163360
+
+        Reviewed by Alex Christensen.
+
+        Use our local BackForwardList class instead of WebCore::BackForwardList.
+
+        * BackForwardList.cpp: Added.
+        * BackForwardList.h: Added.
+        * WebBackForwardList.h:
+        * WebView.cpp:
+        (WebView::initWithFrame):
+        (WebView::backForwardList):
+
 2016-10-13  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/win/WebBackForwardList.cpp

@@ -27 +27 @@
 #include "WebBackForwardList.h"
 
+#include "BackForwardList.h"
 #include "WebFrame.h"
 #include "WebKit.h"
 #include "WebPreferences.h"
 
-#include <WebCore/BackForwardList.h>
 #include <WebCore/COMPtr.h>
 #include <WebCore/HistoryItem.h>

trunk/Source/WebKit/win/WebBackForwardList.h

@@ -24 +24 @@
  */
 
-#ifndef WebBackForwardList_H
-#define WebBackForwardList_H
+#pragma once
 
 #include "WebKit.h"
@@ -34 +33 @@
 #include <WTF/RefPtr.h>
 
-namespace WebCore {
-    class BackForwardList;
-}
+class BackForwardList;
 
 class WebBackForwardList : public IWebBackForwardList, IWebBackForwardListPrivate
 {
 public:
-    static WebBackForwardList* createInstance(PassRefPtr<WebCore::BackForwardList>);
+    static WebBackForwardList* createInstance(PassRefPtr<BackForwardList>);
 protected:
-    WebBackForwardList(PassRefPtr<WebCore::BackForwardList>);
+    WebBackForwardList(PassRefPtr<BackForwardList>);
     ~WebBackForwardList();
 
@@ -74 +71 @@
 protected:
     ULONG m_refCount { 0 };
-    RefPtr<WebCore::BackForwardList> m_backForwardList;
+    RefPtr<BackForwardList> m_backForwardList;
 };
-
-#endif

trunk/Source/WebKit/win/WebView.cpp

@@ -28 +28 @@
 #include "WebView.h"
 
-#include "BackForwardController.h"
+#include "BackForwardList.h"
 #include "COMVariantSetter.h"
 #include "DOMCoreClasses.h"
@@ -85 +85 @@
 #include <WebCore/BString.h>
 #include <WebCore/BackForwardController.h>
-#include <WebCore/BackForwardList.h>
 #include <WebCore/BitmapInfo.h>
 #include <WebCore/Chrome.h>
@@ -3100 +3099 @@
 
     PageConfiguration configuration(makeUniqueRef<WebEditorClient>(this), SocketProvider::create());
+    configuration.backForwardClient = BackForwardList::create();
     configuration.chromeClient = new WebChromeClient(this);
     configuration.contextMenuClient = new WebContextMenuClient(this);
@@ -3431 +3431 @@
         return E_FAIL;
  
-    *list = WebBackForwardList::createInstance(static_cast<WebCore::BackForwardList*>(m_page->backForward().client()));
+    *list = WebBackForwardList::createInstance(static_cast<BackForwardList*>(m_page->backForward().client()));
 
     return S_OK;