Changeset 62805 in webkit


Ignore:
Timestamp:
Jul 8, 2010 11:06:58 AM (14 years ago)
Author:
weinig@apple.com
Message:

Patch for https://bugs.webkit.org/show_bug.cgi?id=41874
Add stubbed out WebBackForwardListProxy

Reviewed by Anders Carlsson.

  • No behavior change.
  • Rename the old WebBackForwardListProxy to WebBackForwardList since it will be the implementation, not the proxy.
  • UIProcess/API/C/WKAPICast.h:
  • UIProcess/API/C/WKBackForwardList.cpp:
  • UIProcess/API/C/WKPage.cpp:
  • UIProcess/WebBackForwardList.cpp: Copied from UIProcess/WebBackForwardListProxy.cpp.
  • UIProcess/WebBackForwardList.h: Copied from UIProcess/WebBackForwardListProxy.h.

(WebKit::WebBackForwardList::create):

  • UIProcess/WebBackForwardListProxy.cpp: Removed.
  • UIProcess/WebBackForwardListProxy.h: Removed.
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):

  • UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::backForwardList):

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebPage/WebBackForwardListProxy.cpp: Added.
  • WebProcess/WebPage/WebBackForwardListProxy.h: Added.

(WebKit::WebBackForwardListProxy::create):

  • win/WebKit2.vcproj:
Location:
trunk/WebKit2
Files:
2 added
8 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/WebKit2/ChangeLog

    r62804 r62805  
     12010-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
    1302010-07-08  Sam Weinig  <sam@webkit.org>
    231
  • trunk/WebKit2/UIProcess/API/C/WKAPICast.h

    r62307 r62805  
    4040
    4141class ImmutableArray;
     42class WebBackForwardList;
    4243class WebBackForwardListItem;
    43 class WebBackForwardListProxy;
    4444class WebContext;
    4545class WebFramePolicyListenerProxy;
     
    6262template<> struct APITypeInfo<WKArrayRef>                       { typedef ImmutableArray* ImplType; };
    6363template<> struct APITypeInfo<WKBackForwardListItemRef>         { typedef WebBackForwardListItem* ImplType; };
    64 template<> struct APITypeInfo<WKBackForwardListRef>             { typedef WebBackForwardListProxy* ImplType; };
     64template<> struct APITypeInfo<WKBackForwardListRef>             { typedef WebBackForwardList* ImplType; };
    6565
    6666template<typename ImplType> struct ImplTypeInfo { };
     
    7575template<> struct ImplTypeInfo<ImmutableArray*>                 { typedef WKArrayRef APIType; };
    7676template<> struct ImplTypeInfo<WebBackForwardListItem*>         { typedef WKBackForwardListItemRef APIType; };
    77 template<> struct ImplTypeInfo<WebBackForwardListProxy*>        { typedef WKBackForwardListRef APIType; };
     77template<> struct ImplTypeInfo<WebBackForwardList*>             { typedef WKBackForwardListRef APIType; };
    7878
    7979} // namespace WebKit
  • trunk/WebKit2/UIProcess/API/C/WKBackForwardList.cpp

    r62307 r62805  
    2626#include "WKBackForwardList.h"
    2727
    28 #include "WebBackForwardListProxy.h"
     28#include "WebBackForwardList.h"
    2929#include "WKAPICast.h"
    3030
  • trunk/WebKit2/UIProcess/API/C/WKPage.cpp

    r62307 r62805  
    2828
    2929#include "WKAPICast.h"
    30 #include "WebBackForwardListProxy.h"
     30#include "WebBackForwardList.h"
    3131#include "WebPageProxy.h"
    3232
  • trunk/WebKit2/UIProcess/WebBackForwardList.cpp

    r62797 r62805  
    2424 */
    2525
    26 #include "WebBackForwardListProxy.h"
     26#include "WebBackForwardList.h"
    2727
    2828namespace WebKit {
     
    3030static const unsigned NoCurrentItemIndex = UINT_MAX;
    3131
    32 WebBackForwardListProxy::WebBackForwardListProxy(WebPageProxy* page)
     32WebBackForwardList::WebBackForwardList(WebPageProxy* page)
    3333    : m_page(page)
    3434    , m_current(NoCurrentItemIndex)
     
    3636}
    3737
    38 WebBackForwardListProxy::~WebBackForwardListProxy()
     38WebBackForwardList::~WebBackForwardList()
    3939{
    4040}
    4141
    42 WebBackForwardListItem* WebBackForwardListProxy::currentItem()
     42WebBackForwardListItem* WebBackForwardList::currentItem()
    4343{
    4444    if (m_current != NoCurrentItemIndex)
     
    4747}
    4848
    49 WebBackForwardListItem* WebBackForwardListProxy::backItem()
     49WebBackForwardListItem* WebBackForwardList::backItem()
    5050{
    5151    if (m_current && m_current != NoCurrentItemIndex)
     
    5454}
    5555
    56 WebBackForwardListItem* WebBackForwardListProxy::forwardItem()
     56WebBackForwardListItem* WebBackForwardList::forwardItem()
    5757{
    5858    if (m_entries.size() && m_current < m_entries.size() - 1)
     
    6161}
    6262
    63 unsigned WebBackForwardListProxy::backListCount()
     63unsigned WebBackForwardList::backListCount()
    6464{
    6565    return m_current == NoCurrentItemIndex ? 0 : m_current;
    6666}
    6767
    68 unsigned WebBackForwardListProxy::forwardListCount()
     68unsigned WebBackForwardList::forwardListCount()
    6969{
    7070    return m_current == NoCurrentItemIndex ? 0 : m_entries.size() - (m_current + 1);
    7171}
    7272
    73 BackForwardListItemVector WebBackForwardListProxy::backListWithLimit(unsigned limit)
     73BackForwardListItemVector WebBackForwardList::backListWithLimit(unsigned limit)
    7474{
    7575    BackForwardListItemVector list;
     
    8585}
    8686
    87 BackForwardListItemVector WebBackForwardListProxy::forwardListWithLimit(unsigned limit)
     87BackForwardListItemVector WebBackForwardList::forwardListWithLimit(unsigned limit)
    8888{
    8989    BackForwardListItemVector list;
     
    112112}
    113113
    114 PassRefPtr<ImmutableArray> WebBackForwardListProxy::backListAsImmutableArrayWithLimit(unsigned limit)
     114PassRefPtr<ImmutableArray> WebBackForwardList::backListAsImmutableArrayWithLimit(unsigned limit)
    115115{
    116116    unsigned size = std::min(backListCount(), limit);
     
    132132}
    133133
    134 PassRefPtr<ImmutableArray> WebBackForwardListProxy::forwardListAsImmutableArrayWithLimit(unsigned limit)
     134PassRefPtr<ImmutableArray> WebBackForwardList::forwardListAsImmutableArrayWithLimit(unsigned limit)
    135135{
    136136    unsigned size = std::min(forwardListCount(), limit);
  • trunk/WebKit2/UIProcess/WebBackForwardList.h

    r62797 r62805  
    2424 */
    2525
    26 #ifndef WebBackForwardListProxy_h
    27 #define WebBackForwardListProxy_h
     26#ifndef WebBackForwardList_h
     27#define WebBackForwardList_h
    2828
    2929#include "ImmutableArray.h"
     
    4646 */
    4747
    48 class WebBackForwardListProxy : public RefCounted<WebBackForwardListProxy> {
     48class WebBackForwardList : public RefCounted<WebBackForwardList> {
    4949public:
    50     static PassRefPtr<WebBackForwardListProxy> create(WebPageProxy* page)
     50    static PassRefPtr<WebBackForwardList> create(WebPageProxy* page)
    5151    {
    52         return adoptRef(new WebBackForwardListProxy(page));
     52        return adoptRef(new WebBackForwardList(page));
    5353    }
    54     ~WebBackForwardListProxy();
     54    ~WebBackForwardList();
    5555
    5656    WebBackForwardListItem* currentItem();
     
    6868
    6969private:
    70     WebBackForwardListProxy(WebPageProxy*);
     70    WebBackForwardList(WebPageProxy*);
    7171
    7272    WebPageProxy* m_page;
     
    7777} // namespace WebKit
    7878
    79 #endif // WebBackForwardListProxy_h
     79#endif // WebBackForwardList_h
  • trunk/WebKit2/UIProcess/WebPageProxy.cpp

    r62307 r62805  
    2929#include "MessageID.h"
    3030#include "PageClient.h"
    31 #include "WebBackForwardListProxy.h"
     31#include "WebBackForwardList.h"
    3232#include "WebContext.h"
    3333#include "WebCoreArgumentCoders.h"
     
    6969    , m_canGoBack(false)
    7070    , m_canGoForward(false)
    71     , m_backForwardList(WebBackForwardListProxy::create(this))
     71    , m_backForwardList(WebBackForwardList::create(this))
    7272    , m_valid(true)
    7373    , m_closed(false)
  • trunk/WebKit2/UIProcess/WebPageProxy.h

    r62307 r62805  
    6161class DrawingAreaProxy;
    6262class PageClient;
    63 class WebBackForwardListProxy;
     63class WebBackForwardList;
    6464class WebKeyboardEvent;
    6565class WebMouseEvent;
     
    8484    DrawingAreaProxy* drawingArea() { return m_drawingArea.get(); }
    8585
    86     WebBackForwardListProxy* backForwardList() { return m_backForwardList.get(); }
     86    WebBackForwardList* backForwardList() { return m_backForwardList.get(); }
    8787
    8888    void setPageClient(PageClient*);
     
    215215    bool m_canGoBack;
    216216    bool m_canGoForward;
    217     RefPtr<WebBackForwardListProxy> m_backForwardList;
     217    RefPtr<WebBackForwardList> m_backForwardList;
    218218
    219219    WebCore::String m_toolTip;
  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r62676 r62805  
    155155                BC646BF911DD377B006455B0 /* WebBackForwardListItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC646BF511DD377B006455B0 /* WebBackForwardListItem.cpp */; };
    156156                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 */; };
    159157                BC646C1A11DD399F006455B0 /* WKBackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC646C1611DD399F006455B0 /* WKBackForwardList.cpp */; };
    160158                BC646C1B11DD399F006455B0 /* WKBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC646C1711DD399F006455B0 /* WKBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; };
     
    162160                BC646C1D11DD399F006455B0 /* WKBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = BC646C1911DD399F006455B0 /* WKBackForwardListItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
    163161                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 */; };
    164166                BC8452A71162C80900CAB9B5 /* DrawingArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */; };
    165167                BC8452A81162C80900CAB9B5 /* DrawingArea.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8452A61162C80900CAB9B5 /* DrawingArea.h */; };
     
    409411                BC646BF511DD377B006455B0 /* WebBackForwardListItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebBackForwardListItem.cpp; sourceTree = "<group>"; };
    410412                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>"; };
    413413                BC646C1611DD399F006455B0 /* WKBackForwardList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBackForwardList.cpp; sourceTree = "<group>"; };
    414414                BC646C1711DD399F006455B0 /* WKBackForwardList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBackForwardList.h; sourceTree = "<group>"; };
     
    416416                BC646C1911DD399F006455B0 /* WKBackForwardListItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBackForwardListItem.h; sourceTree = "<group>"; };
    417417                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>"; };
    418422                BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingArea.cpp; sourceTree = "<group>"; };
    419423                BC8452A61162C80900CAB9B5 /* DrawingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingArea.h; sourceTree = "<group>"; };
     
    736740                                0F5265B111DD37680006D33C /* LayerBackedDrawingArea.cpp */,
    737741                                0F5265B211DD37680006D33C /* LayerBackedDrawingArea.h */,
     742                                BC72B9F811E6476B001EB4EA /* WebBackForwardListProxy.cpp */,
     743                                BC72B9F911E6476B001EB4EA /* WebBackForwardListProxy.h */,
    738744                                BC111ADC112F5B9300337BAB /* WebFrame.cpp */,
    739745                                BC032D8910F437A00058C15A /* WebFrame.h */,
     
    762768                                BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */,
    763769                                1A30066C1110F4F70031937C /* ResponsivenessTimer.h */,
     770                                BC72BA1B11E64907001EB4EA /* WebBackForwardList.cpp */,
     771                                BC72BA1C11E64907001EB4EA /* WebBackForwardList.h */,
    764772                                BC646BF511DD377B006455B0 /* WebBackForwardListItem.cpp */,
    765773                                BC646BF611DD377B006455B0 /* WebBackForwardListItem.h */,
    766                                 BC646BF711DD377B006455B0 /* WebBackForwardListProxy.cpp */,
    767                                 BC646BF811DD377B006455B0 /* WebBackForwardListProxy.h */,
    768774                                BCB9E2421120DACA00A137E0 /* WebContext.cpp */,
    769775                                BCB9E2411120DACA00A137E0 /* WebContext.h */,
     
    11391145                                BC64697011DBE603006455B0 /* ImmutableArray.h in Headers */,
    11401146                                BC646BFA11DD377B006455B0 /* WebBackForwardListItem.h in Headers */,
    1141                                 BC646BFC11DD377B006455B0 /* WebBackForwardListProxy.h in Headers */,
    11421147                                BC646C1B11DD399F006455B0 /* WKBackForwardList.h in Headers */,
    11431148                                BC646C1D11DD399F006455B0 /* WKBackForwardListItem.h in Headers */,
     
    11491154                                BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */,
    11501155                                BCA8C9DC11E4086500812FB7 /* WebBackForwardControllerClient.h in Headers */,
     1156                                BC72B9FB11E6476B001EB4EA /* WebBackForwardListProxy.h in Headers */,
     1157                                BC72BA1E11E64907001EB4EA /* WebBackForwardList.h in Headers */,
    11511158                        );
    11521159                        runOnlyForDeploymentPostprocessing = 0;
     
    13141321                                BC64696F11DBE603006455B0 /* ImmutableArray.cpp in Sources */,
    13151322                                BC646BF911DD377B006455B0 /* WebBackForwardListItem.cpp in Sources */,
    1316                                 BC646BFB11DD377B006455B0 /* WebBackForwardListProxy.cpp in Sources */,
    13171323                                BC646C1A11DD399F006455B0 /* WKBackForwardList.cpp in Sources */,
    13181324                                BC646C1C11DD399F006455B0 /* WKBackForwardListItem.cpp in Sources */,
     
    13291335                                BCA8C6AF11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp in Sources */,
    13301336                                BCA8C9DD11E4086500812FB7 /* WebBackForwardControllerClient.cpp in Sources */,
     1337                                BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */,
     1338                                BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
    13311339                        );
    13321340                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/WebKit2/win/WebKit2.vcproj

    r62756 r62805  
    678678                                <File
    679679                                        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"
    680688                                        >
    681689                                </File>
     
    854862                        </File>
    855863                        <File
     864                                RelativePath="..\UIProcess\WebBackForwardList.cpp"
     865                                >
     866                        </File>
     867                        <File
     868                                RelativePath="..\UIProcess\WebBackForwardList.h"
     869                                >
     870                        </File>
     871                        <File
    856872                                RelativePath="..\UIProcess\WebBackForwardListItem.cpp"
    857873                                >
     
    859875                        <File
    860876                                RelativePath="..\UIProcess\WebBackForwardListItem.h"
    861                                 >
    862                         </File>
    863                         <File
    864                                 RelativePath="..\UIProcess\WebBackForwardListProxy.cpp"
    865                                 >
    866                         </File>
    867                         <File
    868                                 RelativePath="..\UIProcess\WebBackForwardListProxy.h"
    869877                                >
    870878                        </File>
Note: See TracChangeset for help on using the changeset viewer.