Changeset 62805 in webkit
- Timestamp:
- Jul 8, 2010 11:06:58 AM (14 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 2 added
- 8 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r62804 r62805 1 2010-07-08 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Anders Carlsson. 4 5 Patch for https://bugs.webkit.org/show_bug.cgi?id=41874 6 Add stubbed out WebBackForwardListProxy 7 8 - No behavior change. 9 - Rename the old WebBackForwardListProxy to WebBackForwardList since it 10 will be the implementation, not the proxy. 11 12 * UIProcess/API/C/WKAPICast.h: 13 * UIProcess/API/C/WKBackForwardList.cpp: 14 * UIProcess/API/C/WKPage.cpp: 15 * UIProcess/WebBackForwardList.cpp: Copied from UIProcess/WebBackForwardListProxy.cpp. 16 * UIProcess/WebBackForwardList.h: Copied from UIProcess/WebBackForwardListProxy.h. 17 (WebKit::WebBackForwardList::create): 18 * UIProcess/WebBackForwardListProxy.cpp: Removed. 19 * UIProcess/WebBackForwardListProxy.h: Removed. 20 * UIProcess/WebPageProxy.cpp: 21 (WebKit::WebPageProxy::WebPageProxy): 22 * UIProcess/WebPageProxy.h: 23 (WebKit::WebPageProxy::backForwardList): 24 * WebKit2.xcodeproj/project.pbxproj: 25 * WebProcess/WebPage/WebBackForwardListProxy.cpp: Added. 26 * WebProcess/WebPage/WebBackForwardListProxy.h: Added. 27 (WebKit::WebBackForwardListProxy::create): 28 * win/WebKit2.vcproj: 29 1 30 2010-07-08 Sam Weinig <sam@webkit.org> 2 31 -
trunk/WebKit2/UIProcess/API/C/WKAPICast.h
r62307 r62805 40 40 41 41 class ImmutableArray; 42 class WebBackForwardList; 42 43 class WebBackForwardListItem; 43 class WebBackForwardListProxy;44 44 class WebContext; 45 45 class WebFramePolicyListenerProxy; … … 62 62 template<> struct APITypeInfo<WKArrayRef> { typedef ImmutableArray* ImplType; }; 63 63 template<> struct APITypeInfo<WKBackForwardListItemRef> { typedef WebBackForwardListItem* ImplType; }; 64 template<> struct APITypeInfo<WKBackForwardListRef> { typedef WebBackForwardList Proxy* ImplType; };64 template<> struct APITypeInfo<WKBackForwardListRef> { typedef WebBackForwardList* ImplType; }; 65 65 66 66 template<typename ImplType> struct ImplTypeInfo { }; … … 75 75 template<> struct ImplTypeInfo<ImmutableArray*> { typedef WKArrayRef APIType; }; 76 76 template<> struct ImplTypeInfo<WebBackForwardListItem*> { typedef WKBackForwardListItemRef APIType; }; 77 template<> struct ImplTypeInfo<WebBackForwardList Proxy*>{ typedef WKBackForwardListRef APIType; };77 template<> struct ImplTypeInfo<WebBackForwardList*> { typedef WKBackForwardListRef APIType; }; 78 78 79 79 } // namespace WebKit -
trunk/WebKit2/UIProcess/API/C/WKBackForwardList.cpp
r62307 r62805 26 26 #include "WKBackForwardList.h" 27 27 28 #include "WebBackForwardList Proxy.h"28 #include "WebBackForwardList.h" 29 29 #include "WKAPICast.h" 30 30 -
trunk/WebKit2/UIProcess/API/C/WKPage.cpp
r62307 r62805 28 28 29 29 #include "WKAPICast.h" 30 #include "WebBackForwardList Proxy.h"30 #include "WebBackForwardList.h" 31 31 #include "WebPageProxy.h" 32 32 -
trunk/WebKit2/UIProcess/WebBackForwardList.cpp
r62797 r62805 24 24 */ 25 25 26 #include "WebBackForwardList Proxy.h"26 #include "WebBackForwardList.h" 27 27 28 28 namespace WebKit { … … 30 30 static const unsigned NoCurrentItemIndex = UINT_MAX; 31 31 32 WebBackForwardList Proxy::WebBackForwardListProxy(WebPageProxy* page)32 WebBackForwardList::WebBackForwardList(WebPageProxy* page) 33 33 : m_page(page) 34 34 , m_current(NoCurrentItemIndex) … … 36 36 } 37 37 38 WebBackForwardList Proxy::~WebBackForwardListProxy()38 WebBackForwardList::~WebBackForwardList() 39 39 { 40 40 } 41 41 42 WebBackForwardListItem* WebBackForwardList Proxy::currentItem()42 WebBackForwardListItem* WebBackForwardList::currentItem() 43 43 { 44 44 if (m_current != NoCurrentItemIndex) … … 47 47 } 48 48 49 WebBackForwardListItem* WebBackForwardList Proxy::backItem()49 WebBackForwardListItem* WebBackForwardList::backItem() 50 50 { 51 51 if (m_current && m_current != NoCurrentItemIndex) … … 54 54 } 55 55 56 WebBackForwardListItem* WebBackForwardList Proxy::forwardItem()56 WebBackForwardListItem* WebBackForwardList::forwardItem() 57 57 { 58 58 if (m_entries.size() && m_current < m_entries.size() - 1) … … 61 61 } 62 62 63 unsigned WebBackForwardList Proxy::backListCount()63 unsigned WebBackForwardList::backListCount() 64 64 { 65 65 return m_current == NoCurrentItemIndex ? 0 : m_current; 66 66 } 67 67 68 unsigned WebBackForwardList Proxy::forwardListCount()68 unsigned WebBackForwardList::forwardListCount() 69 69 { 70 70 return m_current == NoCurrentItemIndex ? 0 : m_entries.size() - (m_current + 1); 71 71 } 72 72 73 BackForwardListItemVector WebBackForwardList Proxy::backListWithLimit(unsigned limit)73 BackForwardListItemVector WebBackForwardList::backListWithLimit(unsigned limit) 74 74 { 75 75 BackForwardListItemVector list; … … 85 85 } 86 86 87 BackForwardListItemVector WebBackForwardList Proxy::forwardListWithLimit(unsigned limit)87 BackForwardListItemVector WebBackForwardList::forwardListWithLimit(unsigned limit) 88 88 { 89 89 BackForwardListItemVector list; … … 112 112 } 113 113 114 PassRefPtr<ImmutableArray> WebBackForwardList Proxy::backListAsImmutableArrayWithLimit(unsigned limit)114 PassRefPtr<ImmutableArray> WebBackForwardList::backListAsImmutableArrayWithLimit(unsigned limit) 115 115 { 116 116 unsigned size = std::min(backListCount(), limit); … … 132 132 } 133 133 134 PassRefPtr<ImmutableArray> WebBackForwardList Proxy::forwardListAsImmutableArrayWithLimit(unsigned limit)134 PassRefPtr<ImmutableArray> WebBackForwardList::forwardListAsImmutableArrayWithLimit(unsigned limit) 135 135 { 136 136 unsigned size = std::min(forwardListCount(), limit); -
trunk/WebKit2/UIProcess/WebBackForwardList.h
r62797 r62805 24 24 */ 25 25 26 #ifndef WebBackForwardList Proxy_h27 #define WebBackForwardList Proxy_h26 #ifndef WebBackForwardList_h 27 #define WebBackForwardList_h 28 28 29 29 #include "ImmutableArray.h" … … 46 46 */ 47 47 48 class WebBackForwardList Proxy : public RefCounted<WebBackForwardListProxy> {48 class WebBackForwardList : public RefCounted<WebBackForwardList> { 49 49 public: 50 static PassRefPtr<WebBackForwardList Proxy> create(WebPageProxy* page)50 static PassRefPtr<WebBackForwardList> create(WebPageProxy* page) 51 51 { 52 return adoptRef(new WebBackForwardList Proxy(page));52 return adoptRef(new WebBackForwardList(page)); 53 53 } 54 ~WebBackForwardList Proxy();54 ~WebBackForwardList(); 55 55 56 56 WebBackForwardListItem* currentItem(); … … 68 68 69 69 private: 70 WebBackForwardList Proxy(WebPageProxy*);70 WebBackForwardList(WebPageProxy*); 71 71 72 72 WebPageProxy* m_page; … … 77 77 } // namespace WebKit 78 78 79 #endif // WebBackForwardList Proxy_h79 #endif // WebBackForwardList_h -
trunk/WebKit2/UIProcess/WebPageProxy.cpp
r62307 r62805 29 29 #include "MessageID.h" 30 30 #include "PageClient.h" 31 #include "WebBackForwardList Proxy.h"31 #include "WebBackForwardList.h" 32 32 #include "WebContext.h" 33 33 #include "WebCoreArgumentCoders.h" … … 69 69 , m_canGoBack(false) 70 70 , m_canGoForward(false) 71 , m_backForwardList(WebBackForwardList Proxy::create(this))71 , m_backForwardList(WebBackForwardList::create(this)) 72 72 , m_valid(true) 73 73 , m_closed(false) -
trunk/WebKit2/UIProcess/WebPageProxy.h
r62307 r62805 61 61 class DrawingAreaProxy; 62 62 class PageClient; 63 class WebBackForwardList Proxy;63 class WebBackForwardList; 64 64 class WebKeyboardEvent; 65 65 class WebMouseEvent; … … 84 84 DrawingAreaProxy* drawingArea() { return m_drawingArea.get(); } 85 85 86 WebBackForwardList Proxy* backForwardList() { return m_backForwardList.get(); }86 WebBackForwardList* backForwardList() { return m_backForwardList.get(); } 87 87 88 88 void setPageClient(PageClient*); … … 215 215 bool m_canGoBack; 216 216 bool m_canGoForward; 217 RefPtr<WebBackForwardList Proxy> m_backForwardList;217 RefPtr<WebBackForwardList> m_backForwardList; 218 218 219 219 WebCore::String m_toolTip; -
trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj
r62676 r62805 155 155 BC646BF911DD377B006455B0 /* WebBackForwardListItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC646BF511DD377B006455B0 /* WebBackForwardListItem.cpp */; }; 156 156 BC646BFA11DD377B006455B0 /* WebBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = BC646BF611DD377B006455B0 /* WebBackForwardListItem.h */; }; 157 BC646BFB11DD377B006455B0 /* WebBackForwardListProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC646BF711DD377B006455B0 /* WebBackForwardListProxy.cpp */; };158 BC646BFC11DD377B006455B0 /* WebBackForwardListProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BC646BF811DD377B006455B0 /* WebBackForwardListProxy.h */; };159 157 BC646C1A11DD399F006455B0 /* WKBackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC646C1611DD399F006455B0 /* WKBackForwardList.cpp */; }; 160 158 BC646C1B11DD399F006455B0 /* WKBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC646C1711DD399F006455B0 /* WKBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; }; … … 162 160 BC646C1D11DD399F006455B0 /* WKBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = BC646C1911DD399F006455B0 /* WKBackForwardListItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; 163 161 BC6EDAA6111271C600E7678B /* PageClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6EDAA5111271C600E7678B /* PageClient.h */; }; 162 BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC72B9F811E6476B001EB4EA /* WebBackForwardListProxy.cpp */; }; 163 BC72B9FB11E6476B001EB4EA /* WebBackForwardListProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BC72B9F911E6476B001EB4EA /* WebBackForwardListProxy.h */; }; 164 BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC72BA1B11E64907001EB4EA /* WebBackForwardList.cpp */; }; 165 BC72BA1E11E64907001EB4EA /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC72BA1C11E64907001EB4EA /* WebBackForwardList.h */; }; 164 166 BC8452A71162C80900CAB9B5 /* DrawingArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */; }; 165 167 BC8452A81162C80900CAB9B5 /* DrawingArea.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8452A61162C80900CAB9B5 /* DrawingArea.h */; }; … … 409 411 BC646BF511DD377B006455B0 /* WebBackForwardListItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebBackForwardListItem.cpp; sourceTree = "<group>"; }; 410 412 BC646BF611DD377B006455B0 /* WebBackForwardListItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebBackForwardListItem.h; sourceTree = "<group>"; }; 411 BC646BF711DD377B006455B0 /* WebBackForwardListProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebBackForwardListProxy.cpp; sourceTree = "<group>"; };412 BC646BF811DD377B006455B0 /* WebBackForwardListProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebBackForwardListProxy.h; sourceTree = "<group>"; };413 413 BC646C1611DD399F006455B0 /* WKBackForwardList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBackForwardList.cpp; sourceTree = "<group>"; }; 414 414 BC646C1711DD399F006455B0 /* WKBackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBackForwardList.h; sourceTree = "<group>"; }; … … 416 416 BC646C1911DD399F006455B0 /* WKBackForwardListItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBackForwardListItem.h; sourceTree = "<group>"; }; 417 417 BC6EDAA5111271C600E7678B /* PageClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageClient.h; sourceTree = "<group>"; }; 418 BC72B9F811E6476B001EB4EA /* WebBackForwardListProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebBackForwardListProxy.cpp; sourceTree = "<group>"; }; 419 BC72B9F911E6476B001EB4EA /* WebBackForwardListProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebBackForwardListProxy.h; sourceTree = "<group>"; }; 420 BC72BA1B11E64907001EB4EA /* WebBackForwardList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebBackForwardList.cpp; sourceTree = "<group>"; }; 421 BC72BA1C11E64907001EB4EA /* WebBackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebBackForwardList.h; sourceTree = "<group>"; }; 418 422 BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingArea.cpp; sourceTree = "<group>"; }; 419 423 BC8452A61162C80900CAB9B5 /* DrawingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingArea.h; sourceTree = "<group>"; }; … … 736 740 0F5265B111DD37680006D33C /* LayerBackedDrawingArea.cpp */, 737 741 0F5265B211DD37680006D33C /* LayerBackedDrawingArea.h */, 742 BC72B9F811E6476B001EB4EA /* WebBackForwardListProxy.cpp */, 743 BC72B9F911E6476B001EB4EA /* WebBackForwardListProxy.h */, 738 744 BC111ADC112F5B9300337BAB /* WebFrame.cpp */, 739 745 BC032D8910F437A00058C15A /* WebFrame.h */, … … 762 768 BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */, 763 769 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */, 770 BC72BA1B11E64907001EB4EA /* WebBackForwardList.cpp */, 771 BC72BA1C11E64907001EB4EA /* WebBackForwardList.h */, 764 772 BC646BF511DD377B006455B0 /* WebBackForwardListItem.cpp */, 765 773 BC646BF611DD377B006455B0 /* WebBackForwardListItem.h */, 766 BC646BF711DD377B006455B0 /* WebBackForwardListProxy.cpp */,767 BC646BF811DD377B006455B0 /* WebBackForwardListProxy.h */,768 774 BCB9E2421120DACA00A137E0 /* WebContext.cpp */, 769 775 BCB9E2411120DACA00A137E0 /* WebContext.h */, … … 1139 1145 BC64697011DBE603006455B0 /* ImmutableArray.h in Headers */, 1140 1146 BC646BFA11DD377B006455B0 /* WebBackForwardListItem.h in Headers */, 1141 BC646BFC11DD377B006455B0 /* WebBackForwardListProxy.h in Headers */,1142 1147 BC646C1B11DD399F006455B0 /* WKBackForwardList.h in Headers */, 1143 1148 BC646C1D11DD399F006455B0 /* WKBackForwardListItem.h in Headers */, … … 1149 1154 BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */, 1150 1155 BCA8C9DC11E4086500812FB7 /* WebBackForwardControllerClient.h in Headers */, 1156 BC72B9FB11E6476B001EB4EA /* WebBackForwardListProxy.h in Headers */, 1157 BC72BA1E11E64907001EB4EA /* WebBackForwardList.h in Headers */, 1151 1158 ); 1152 1159 runOnlyForDeploymentPostprocessing = 0; … … 1314 1321 BC64696F11DBE603006455B0 /* ImmutableArray.cpp in Sources */, 1315 1322 BC646BF911DD377B006455B0 /* WebBackForwardListItem.cpp in Sources */, 1316 BC646BFB11DD377B006455B0 /* WebBackForwardListProxy.cpp in Sources */,1317 1323 BC646C1A11DD399F006455B0 /* WKBackForwardList.cpp in Sources */, 1318 1324 BC646C1C11DD399F006455B0 /* WKBackForwardListItem.cpp in Sources */, … … 1329 1335 BCA8C6AF11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp in Sources */, 1330 1336 BCA8C9DD11E4086500812FB7 /* WebBackForwardControllerClient.cpp in Sources */, 1337 BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */, 1338 BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */, 1331 1339 ); 1332 1340 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebKit2/win/WebKit2.vcproj
r62756 r62805 678 678 <File 679 679 RelativePath="..\WebProcess\WebPage\DrawingArea.h" 680 > 681 </File> 682 <File 683 RelativePath="..\WebProcess\WebPage\WebBackForwardListProxy.cpp" 684 > 685 </File> 686 <File 687 RelativePath="..\WebProcess\WebPage\WebBackForwardListProxy.h" 680 688 > 681 689 </File> … … 854 862 </File> 855 863 <File 864 RelativePath="..\UIProcess\WebBackForwardList.cpp" 865 > 866 </File> 867 <File 868 RelativePath="..\UIProcess\WebBackForwardList.h" 869 > 870 </File> 871 <File 856 872 RelativePath="..\UIProcess\WebBackForwardListItem.cpp" 857 873 > … … 859 875 <File 860 876 RelativePath="..\UIProcess\WebBackForwardListItem.h" 861 >862 </File>863 <File864 RelativePath="..\UIProcess\WebBackForwardListProxy.cpp"865 >866 </File>867 <File868 RelativePath="..\UIProcess\WebBackForwardListProxy.h"869 877 > 870 878 </File>
Note: See TracChangeset
for help on using the changeset viewer.