Changeset 207345 in webkit
- Timestamp:
- Oct 14, 2016 10:14:39 AM (7 years ago)
- Location:
- trunk/Source
- Files:
-
- 16 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r207280 r207345 1605 1605 1606 1606 history/BackForwardController.cpp 1607 history/BackForwardList.cpp1608 1607 history/CachedFrame.cpp 1609 1608 history/CachedPage.cpp -
trunk/Source/WebCore/ChangeLog
r207343 r207345 1 2016-10-13 Anders Carlsson <andersca@apple.com> 2 3 Move BackForwardList from WebCore to WebKitLegacy 4 https://bugs.webkit.org/show_bug.cgi?id=163418 5 6 Reviewed by Tim Horton. 7 8 * CMakeLists.txt: 9 * WebCore.xcodeproj/project.pbxproj: 10 * history/BackForwardController.cpp: 11 (WebCore::BackForwardController::BackForwardController): 12 * history/BackForwardController.h: 13 * loader/EmptyClients.cpp: 14 (WebCore::fillWithEmptyClients): 15 * page/Page.cpp: 16 (WebCore::Page::Page): 17 1 18 2016-10-14 Manuel Rego Casasnovas <rego@igalia.com> 2 19 -
trunk/Source/WebCore/PlatformMac.cmake
r206883 r207345 691 691 editing/mac/TextAlternativeWithRange.h 692 692 693 history/BackForwardList.h694 693 history/HistoryItem.h 695 694 history/PageCache.h -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r207342 r207345 5281 5281 BCA8C81E11E3D36900812FB7 /* BackForwardController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C81C11E3D36900812FB7 /* BackForwardController.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5282 5282 BCA8C81F11E3D36900812FB7 /* BackForwardController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8C81D11E3D36900812FB7 /* BackForwardController.cpp */; }; 5283 BCA8CA5F11E4E6D100812FB7 /* BackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8CA5D11E4E6D100812FB7 /* BackForwardList.cpp */; };5284 BCA8CA6011E4E6D100812FB7 /* BackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8CA5E11E4E6D100812FB7 /* BackForwardList.h */; settings = {ATTRIBUTES = (Private, ); }; };5285 5283 BCAA486F14A052530088FAC4 /* PlatformEventFactoryMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAA486D14A052530088FAC4 /* PlatformEventFactoryMac.mm */; }; 5286 5284 BCAA487014A052530088FAC4 /* PlatformEventFactoryMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAA486E14A052530088FAC4 /* PlatformEventFactoryMac.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 12807 12805 BCA8C81C11E3D36900812FB7 /* BackForwardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackForwardController.h; sourceTree = "<group>"; }; 12808 12806 BCA8C81D11E3D36900812FB7 /* BackForwardController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackForwardController.cpp; sourceTree = "<group>"; }; 12809 BCA8CA5D11E4E6D100812FB7 /* BackForwardList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackForwardList.cpp; sourceTree = "<group>"; };12810 BCA8CA5E11E4E6D100812FB7 /* BackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackForwardList.h; sourceTree = "<group>"; };12811 12807 BCAA486D14A052530088FAC4 /* PlatformEventFactoryMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformEventFactoryMac.mm; sourceTree = "<group>"; }; 12812 12808 BCAA486E14A052530088FAC4 /* PlatformEventFactoryMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformEventFactoryMac.h; sourceTree = "<group>"; }; … … 16699 16695 BCA8C81D11E3D36900812FB7 /* BackForwardController.cpp */, 16700 16696 BCA8C81C11E3D36900812FB7 /* BackForwardController.h */, 16701 BCA8CA5D11E4E6D100812FB7 /* BackForwardList.cpp */,16702 BCA8CA5E11E4E6D100812FB7 /* BackForwardList.h */,16703 16697 51C0AA400F2AA15E001648C2 /* CachedFrame.cpp */, 16704 16698 51C0AA380F2AA10A001648C2 /* CachedFrame.h */, … … 24001 23995 51741D0F0B07259A00ED442C /* BackForwardClient.h in Headers */, 24002 23996 BCA8C81E11E3D36900812FB7 /* BackForwardController.h in Headers */, 24003 BCA8CA6011E4E6D100812FB7 /* BackForwardList.h in Headers */,24004 23997 BC124EE80C2641CD009E2349 /* BarProp.h in Headers */, 24005 23998 460BB6161D0A1BF000221812 /* Base64Utilities.h in Headers */, … … 27780 27773 29A8124B0FBB9CA900510293 /* AXObjectCacheMac.mm in Sources */, 27781 27774 BCA8C81F11E3D36900812FB7 /* BackForwardController.cpp in Sources */, 27782 BCA8CA5F11E4E6D100812FB7 /* BackForwardList.cpp in Sources */,27783 27775 BC124EE70C2641CD009E2349 /* BarProp.cpp in Sources */, 27784 27776 460BB6151D0A1BF000221812 /* Base64Utilities.cpp in Sources */, -
trunk/Source/WebCore/history/BackForwardController.cpp
r194496 r207345 27 27 #include "BackForwardController.h" 28 28 29 #include "BackForwardList.h" 30 #include "HistoryItem.h" 29 #include "BackForwardClient.h" 31 30 #include "Page.h" 32 31 33 32 namespace WebCore { 34 33 35 BackForwardController::BackForwardController(Page& page, Ref Ptr<BackForwardClient>&& client)34 BackForwardController::BackForwardController(Page& page, Ref<BackForwardClient>&& client) 36 35 : m_page(page) 37 36 , m_client(WTFMove(client)) 38 37 { 39 if (!m_client)40 m_client = BackForwardList::create(&page);41 38 } 42 39 -
trunk/Source/WebCore/history/BackForwardController.h
r189675 r207345 40 40 WTF_MAKE_NONCOPYABLE(BackForwardController); WTF_MAKE_FAST_ALLOCATED; 41 41 public: 42 BackForwardController(Page&, Ref Ptr<BackForwardClient>&&);42 BackForwardController(Page&, Ref<BackForwardClient>&&); 43 43 ~BackForwardController(); 44 44 -
trunk/Source/WebCore/loader/EmptyClients.cpp
r206238 r207345 30 30 31 31 #include "ApplicationCacheStorage.h" 32 #include "BackForwardClient.h" 32 33 #include "ColorChooser.h" 33 34 #include "DOMWrapperWorld.h" … … 141 142 }; 142 143 144 class EmptyBackForwardClient final : public BackForwardClient { 145 void addItem(Ref<HistoryItem>&&) override { } 146 void goToItem(HistoryItem*) override { } 147 HistoryItem* itemAtIndex(int) override { return nullptr; } 148 int backListCount() override { return 0; } 149 int forwardListCount() override { return 0; } 150 void close() override { } 151 152 #if PLATFORM(IOS) 153 unsigned current() override { return 0; } 154 void setCurrent(unsigned) override { } 155 bool clearAllPageCaches() override { return false; } 156 #endif 157 }; 158 143 159 void fillWithEmptyClients(PageConfiguration& pageConfiguration) 144 160 { … … 170 186 pageConfiguration.progressTrackerClient = &dummyProgressTrackerClient.get(); 171 187 188 pageConfiguration.backForwardClient = adoptRef(new EmptyBackForwardClient); 172 189 pageConfiguration.diagnosticLoggingClient = std::make_unique<EmptyDiagnosticLoggingClient>(); 173 190 -
trunk/Source/WebCore/page/Page.cpp
r206951 r207345 179 179 , m_settings(Settings::create(this)) 180 180 , m_progress(std::make_unique<ProgressTracker>(*pageConfiguration.progressTrackerClient)) 181 , m_backForwardController(std::make_unique<BackForwardController>(*this, WTFMove(pageConfiguration.backForwardClient)))181 , m_backForwardController(std::make_unique<BackForwardController>(*this, *WTFMove(pageConfiguration.backForwardClient))) 182 182 , m_mainFrame(MainFrame::create(*this, pageConfiguration)) 183 183 , m_theme(RenderTheme::themeForPage(this)) -
trunk/Source/WebKit/ChangeLog
r207308 r207345 1 2016-10-13 Anders Carlsson <andersca@apple.com> 2 3 Move BackForwardList from WebCore to WebKitLegacy 4 https://bugs.webkit.org/show_bug.cgi?id=163418 5 6 Reviewed by Tim Horton. 7 8 * WebKit.xcodeproj/project.pbxproj: 9 1 10 2016-10-12 Anders Carlsson <andersca@apple.com> 2 11 -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r205502 r207345 56 56 1A8DED500EE88B8A00F25022 /* HostedNetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */; }; 57 57 1A8DED510EE88B8A00F25022 /* HostedNetscapePluginStream.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */; }; 58 1A9119F61DB0470A0087D1FD /* BackForwardList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9119F41DB0470A0087D1FD /* BackForwardList.mm */; }; 59 1A9119F71DB0470A0087D1FD /* BackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9119F51DB0470A0087D1FD /* BackForwardList.h */; }; 58 60 1AA83F831A5C4AE400026EC6 /* WebDatabaseProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA83F811A5C4AE400026EC6 /* WebDatabaseProvider.cpp */; }; 59 61 1AA83F841A5C4AE400026EC6 /* WebDatabaseProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA83F821A5C4AE400026EC6 /* WebDatabaseProvider.h */; }; … … 850 852 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HostedNetscapePluginStream.h; sourceTree = "<group>"; }; 851 853 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HostedNetscapePluginStream.mm; sourceTree = "<group>"; }; 854 1A9119F41DB0470A0087D1FD /* BackForwardList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BackForwardList.mm; sourceTree = "<group>"; }; 855 1A9119F51DB0470A0087D1FD /* BackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackForwardList.h; sourceTree = "<group>"; }; 852 856 1AA83F811A5C4AE400026EC6 /* WebDatabaseProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebDatabaseProvider.cpp; path = ../../Storage/WebDatabaseProvider.cpp; sourceTree = "<group>"; }; 853 857 1AA83F821A5C4AE400026EC6 /* WebDatabaseProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebDatabaseProvider.h; path = ../../Storage/WebDatabaseProvider.h; sourceTree = "<group>"; }; … … 1849 1853 isa = PBXGroup; 1850 1854 children = ( 1855 1A9119F41DB0470A0087D1FD /* BackForwardList.mm */, 1856 1A9119F51DB0470A0087D1FD /* BackForwardList.h */, 1851 1857 1A60518D17502A5D00BC62F5 /* BinaryPropertyList.cpp */, 1852 1858 1A60518E17502A5D00BC62F5 /* BinaryPropertyList.h */, … … 2896 2902 93D437661D57ABEF00AB85EA /* DOMProgressEvent.h in Headers */, 2897 2903 93D437681D57ABEF00AB85EA /* DOMRange.h in Headers */, 2904 1A9119F71DB0470A0087D1FD /* BackForwardList.h in Headers */, 2898 2905 93D4376A1D57ABEF00AB85EA /* DOMRangeException.h in Headers */, 2899 2906 93D4376B1D57ABEF00AB85EA /* DOMRangeInternal.h in Headers */, … … 3540 3547 B6CE5C24100BC5CE00219936 /* WebApplicationCache.mm in Sources */, 3541 3548 A5DEFC1411D5344B00885273 /* WebApplicationCacheQuotaManager.mm in Sources */, 3549 1A9119F61DB0470A0087D1FD /* BackForwardList.mm in Sources */, 3542 3550 9398111D0824BF01008DF038 /* WebArchive.mm in Sources */, 3543 3551 939810CF0824BF01008DF038 /* WebAuthenticationPanel.m in Sources */, -
trunk/Source/WebKit/mac/ChangeLog
r207300 r207345 1 2016-10-13 Anders Carlsson <andersca@apple.com> 2 3 Move BackForwardList from WebCore to WebKitLegacy 4 https://bugs.webkit.org/show_bug.cgi?id=163418 5 6 Reviewed by Tim Horton. 7 8 * History/BackForwardList.h: Renamed from Source/WebCore/history/BackForwardList.h. 9 (BackForwardList::create): 10 (BackForwardList::webView): 11 * History/BackForwardList.mm: Renamed from Source/WebCore/history/BackForwardList.cpp. 12 (BackForwardList::BackForwardList): 13 (BackForwardList::close): 14 (BackForwardList::containsItem): 15 * History/WebBackForwardList.mm: 16 (kit): 17 (-[WebBackForwardList initWithBackForwardList:]): 18 (-[WebBackForwardList setPageCacheSize:]): 19 (-[WebBackForwardList pageCacheSize]): 20 * History/WebBackForwardListInternal.h: 21 * WebCoreSupport/WebFrameLoaderClient.mm: 22 * WebView/WebFrameView.mm: 23 * WebView/WebView.mm: 24 (-[WebView _commonInitializationWithFrameName:groupName:]): 25 (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]): 26 1 27 2016-10-13 Anders Carlsson <andersca@apple.com> 2 28 -
trunk/Source/WebKit/mac/History/BackForwardList.h
r207344 r207345 26 26 */ 27 27 28 #ifndef BackForwardList_h 29 #define BackForwardList_h 28 #pragma once 30 29 31 #include "BackForwardClient.h"30 #include <WebCore/BackForwardClient.h> 32 31 #include <wtf/HashSet.h> 33 32 #include <wtf/Vector.h> 34 33 35 namespace WebCore { 34 OBJC_CLASS WebView; 36 35 37 class Page;36 typedef HashSet<RefPtr<WebCore::HistoryItem>> HistoryItemHashSet; 38 37 39 typedef HashSet<RefPtr<HistoryItem>> HistoryItemHashSet; 40 41 class BackForwardList : public BackForwardClient { 38 class BackForwardList : public WebCore::BackForwardClient { 42 39 public: 43 static Ref<BackForwardList> create( Page* page) { return adoptRef(*new BackForwardList(page)); }40 static Ref<BackForwardList> create(WebView *webView) { return adoptRef(*new BackForwardList(webView)); } 44 41 virtual ~BackForwardList(); 45 42 46 Page* page() { return m_page; }43 WebView *webView() { return m_webView; } 47 44 48 void addItem(Ref< HistoryItem>&&) override;45 void addItem(Ref<WebCore::HistoryItem>&&) override; 49 46 WEBCORE_EXPORT void goBack(); 50 47 WEBCORE_EXPORT void goForward(); 51 void goToItem( HistoryItem*) override;48 void goToItem(WebCore::HistoryItem*) override; 52 49 53 WEBCORE_EXPORT HistoryItem* backItem();54 WEBCORE_EXPORT HistoryItem* currentItem();55 WEBCORE_EXPORT HistoryItem* forwardItem();56 HistoryItem* itemAtIndex(int) override;50 WEBCORE_EXPORT WebCore::HistoryItem* backItem(); 51 WEBCORE_EXPORT WebCore::HistoryItem* currentItem(); 52 WEBCORE_EXPORT WebCore::HistoryItem* forwardItem(); 53 WebCore::HistoryItem* itemAtIndex(int) override; 57 54 58 WEBCORE_EXPORT void backListWithLimit(int, Vector<Ref< HistoryItem>>&);59 WEBCORE_EXPORT void forwardListWithLimit(int, Vector<Ref< HistoryItem>>&);55 WEBCORE_EXPORT void backListWithLimit(int, Vector<Ref<WebCore::HistoryItem>>&); 56 WEBCORE_EXPORT void forwardListWithLimit(int, Vector<Ref<WebCore::HistoryItem>>&); 60 57 61 58 WEBCORE_EXPORT int capacity(); … … 65 62 int backListCount() override; 66 63 int forwardListCount() override; 67 WEBCORE_EXPORT bool containsItem( HistoryItem*);64 WEBCORE_EXPORT bool containsItem(WebCore::HistoryItem*); 68 65 69 66 void close() override; 70 67 WEBCORE_EXPORT bool closed(); 71 68 72 WEBCORE_EXPORT void removeItem( HistoryItem*);73 WEBCORE_EXPORT Vector<Ref< HistoryItem>>& entries();69 WEBCORE_EXPORT void removeItem(WebCore::HistoryItem*); 70 WEBCORE_EXPORT Vector<Ref<WebCore::HistoryItem>>& entries(); 74 71 75 72 #if PLATFORM(IOS) … … 81 78 82 79 private: 83 WEBCORE_EXPORT explicit BackForwardList( Page*);80 WEBCORE_EXPORT explicit BackForwardList(WebView *); 84 81 85 Page* m_page;86 Vector<Ref< HistoryItem>> m_entries;82 WebView* m_webView; 83 Vector<Ref<WebCore::HistoryItem>> m_entries; 87 84 HistoryItemHashSet m_entryHash; 88 85 unsigned m_current; … … 91 88 bool m_enabled; 92 89 }; 93 94 } // namespace WebCore95 96 #endif // BackForwardList_h -
trunk/Source/WebKit/mac/History/BackForwardList.mm
r207344 r207345 25 25 */ 26 26 27 #include "config.h"28 27 #include "BackForwardList.h" 29 28 30 #include "Frame.h" 31 #include "FrameLoader.h" 32 #include "FrameLoaderClient.h" 33 #include "HistoryItem.h" 34 #include "Logging.h" 35 #include "Page.h" 36 #include "PageCache.h" 37 #include "SerializedScriptValue.h" 38 39 namespace WebCore { 29 #include <WebCore/PageCache.h> 30 31 using namespace WebCore; 40 32 41 33 static const unsigned DefaultCapacity = 100; 42 34 static const unsigned NoCurrentItemIndex = UINT_MAX; 43 35 44 BackForwardList::BackForwardList( Page* page)45 : m_ page(page)36 BackForwardList::BackForwardList(WebView *webView) 37 : m_webView(webView) 46 38 , m_current(NoCurrentItemIndex) 47 39 , m_capacity(DefaultCapacity) … … 89 81 { 90 82 ASSERT(m_current > 0); 91 if (m_current > 0) {83 if (m_current > 0) 92 84 m_current--; 93 }94 85 } 95 86 … … 97 88 { 98 89 ASSERT(m_current < m_entries.size() - 1); 99 if (m_current < m_entries.size() - 1) {90 if (m_current < m_entries.size() - 1) 100 91 m_current++; 101 }102 92 } 103 93 … … 107 97 return; 108 98 109 unsigned in t index = 0;110 for (; index < m_entries.size(); ++index) 99 unsigned index = 0; 100 for (; index < m_entries.size(); ++index) { 111 101 if (m_entries[index].ptr() == item) 112 102 break; 113 if (index < m_entries.size()) { 103 } 104 105 if (index < m_entries.size()) 114 106 m_current = index; 115 }116 107 } 117 108 … … 178 169 if (!size) 179 170 m_current = NoCurrentItemIndex; 180 else if (m_current > m_entries.size() - 1) {171 else if (m_current > m_entries.size() - 1) 181 172 m_current = m_entries.size() - 1; 182 } 173 183 174 m_capacity = size; 184 175 } … … 256 247 m_entries.clear(); 257 248 m_entryHash.clear(); 258 m_ page= nullptr;249 m_webView = nullptr; 259 250 m_closed = true; 260 251 } … … 292 283 return m_entryHash.contains(entry); 293 284 } 294 295 }; // namespace WebCore -
trunk/Source/WebKit/mac/History/WebBackForwardList.mm
r207300 r207345 30 30 #import "WebBackForwardListInternal.h" 31 31 32 #import "BackForwardList.h" 32 33 #import "WebFrameInternal.h" 33 34 #import "WebHistoryItemInternal.h" … … 39 40 #import "WebTypesInternal.h" 40 41 #import "WebViewPrivate.h" 41 #import <WebCore/BackForwardList.h>42 42 #import <WebCore/HistoryItem.h> 43 43 #import <WebCore/Page.h> … … 83 83 return webBackForwardList; 84 84 85 return [[[WebBackForwardList alloc] initWithBackForwardList: backForwardList] autorelease];86 } 87 88 - (id)initWithBackForwardList:( PassRefPtr<BackForwardList>)backForwardList85 return [[[WebBackForwardList alloc] initWithBackForwardList:*backForwardList] autorelease]; 86 } 87 88 - (id)initWithBackForwardList:(Ref<BackForwardList>&&)backForwardList 89 89 { 90 90 WebCoreThreadViolationCheckRoundOne(); … … 93 93 return nil; 94 94 95 _private = reinterpret_cast<WebBackForwardListPrivate*>( backForwardList.leakRef());95 _private = reinterpret_cast<WebBackForwardListPrivate*>(&backForwardList.leakRef()); 96 96 backForwardLists().set(core(self), self); 97 97 return self; … … 333 333 - (void)setPageCacheSize:(NSUInteger)size 334 334 { 335 [ kit(core(self)->page()) setUsesPageCache:size != 0];335 [core(self)->webView() setUsesPageCache:size != 0]; 336 336 } 337 337 338 338 - (NSUInteger)pageCacheSize 339 339 { 340 return [ kit(core(self)->page()) usesPageCache] ? PageCache::singleton().maxSize() : 0;340 return [core(self)->webView() usesPageCache] ? PageCache::singleton().maxSize() : 0; 341 341 } 342 342 -
trunk/Source/WebKit/mac/History/WebBackForwardListInternal.h
r181906 r207345 30 30 #import <wtf/PassRefPtr.h> 31 31 32 namespace WebCore {33 32 class BackForwardList; 34 }35 33 36 WebCore::BackForwardList* core(WebBackForwardList *);37 WebBackForwardList *kit( WebCore::BackForwardList*);34 BackForwardList* core(WebBackForwardList *); 35 WebBackForwardList *kit(BackForwardList*); 38 36 39 37 @interface WebBackForwardList () 40 - (id)initWithBackForwardList:( PassRefPtr<WebCore::BackForwardList>)backForwardList;38 - (id)initWithBackForwardList:(Ref<BackForwardList>&&)backForwardList; 41 39 @end -
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
r207151 r207345 29 29 #import "WebFrameLoaderClient.h" 30 30 31 #import "BackForwardList.h" 31 32 #import "DOMElementInternal.h" 32 33 #import "DOMHTMLFormElementInternal.h" … … 76 77 #import <WebCore/AuthenticationMac.h> 77 78 #import <WebCore/BackForwardController.h> 78 #import <WebCore/BackForwardList.h>79 79 #import <WebCore/CachedFrame.h> 80 80 #import <WebCore/Chrome.h> -
trunk/Source/WebKit/mac/WebView/WebFrameView.mm
r204474 r207345 29 29 #import "WebFrameView.h" 30 30 31 #import "BackForwardList.h" 31 32 #import "WebClipView.h" 32 33 #import "WebDataSourcePrivate.h" … … 53 54 #import <Foundation/NSURLRequest.h> 54 55 #import <WebCore/BackForwardController.h> 55 #import <WebCore/BackForwardList.h>56 56 #import <WebCore/DragController.h> 57 57 #import <WebCore/EventHandler.h> -
trunk/Source/WebKit/mac/WebView/WebView.mm
r207171 r207345 32 32 #import "WebViewData.h" 33 33 34 #import "BackForwardList.h" 34 35 #import "DOMCSSStyleDeclarationInternal.h" 35 36 #import "DOMDocumentInternal.h" … … 122 123 #import <WebCore/ApplicationCacheStorage.h> 123 124 #import <WebCore/BackForwardController.h> 124 #import <WebCore/BackForwardList.h>125 125 #import <WebCore/CFNetworkSPI.h> 126 126 #import <WebCore/Chrome.h> … … 1033 1033 #endif 1034 1034 1035 pageConfiguration.backForwardClient = BackForwardList::create(self); 1036 1035 1037 #if ENABLE(APPLE_PAY) 1036 1038 pageConfiguration.paymentCoordinatorClient = new WebPaymentCoordinatorClient(); … … 1282 1284 #endif 1283 1285 1286 pageConfiguration.backForwardClient = BackForwardList::create(self); 1284 1287 pageConfiguration.inspectorClient = new WebInspectorClient(self); 1285 1288 pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
Note: See TracChangeset
for help on using the changeset viewer.