Changeset 159077 in webkit


Ignore:
Timestamp:
Nov 11, 2013 3:32:15 PM (10 years ago)
Author:
andersca@apple.com
Message:

Add a FrameLoadState object and begin moving loading related members from WebFrameProxy
​https://bugs.webkit.org/show_bug.cgi?id=124163

Reviewed by Beth Dakin.

  • UIProcess/API/C/WKFrame.cpp:

(WKFrameGetFrameLoadState):

  • UIProcess/FrameLoadState.cpp: Added.

(WebKit::FrameLoadState::FrameLoadState):
(WebKit::FrameLoadState::~FrameLoadState):

  • UIProcess/FrameLoadState.h: Added.
  • UIProcess/WebFrameProxy.cpp:

(WebKit::WebFrameProxy::WebFrameProxy):
(WebKit::WebFrameProxy::didStartProvisionalLoad):
(WebKit::WebFrameProxy::didReceiveServerRedirectForProvisionalLoad):
(WebKit::WebFrameProxy::didFailProvisionalLoad):
(WebKit::WebFrameProxy::didCommitLoad):
(WebKit::WebFrameProxy::didFinishLoad):
(WebKit::WebFrameProxy::didFailLoad):
(WebKit::WebFrameProxy::didSameDocumentNavigation):
(WebKit::WebFrameProxy::setUnreachableURL):

  • UIProcess/WebFrameProxy.h:

(WebKit::WebFrameProxy::frameLoadState):
(WebKit::WebFrameProxy::loadState):
(WebKit::WebFrameProxy::url):
(WebKit::WebFrameProxy::provisionalURL):
(WebKit::WebFrameProxy::unreachableURL):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::activeURL):

  • UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::loadStateAtProcessExit):

  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r159075 r159077  
     12013-11-11  Anders Carlsson  <andersca@apple.com>
     2
     3        Add a FrameLoadState object and begin moving loading related members from WebFrameProxy
     4        https://bugs.webkit.org/show_bug.cgi?id=124163
     5
     6        Reviewed by Beth Dakin.
     7
     8        * UIProcess/API/C/WKFrame.cpp:
     9        (WKFrameGetFrameLoadState):
     10        * UIProcess/FrameLoadState.cpp: Added.
     11        (WebKit::FrameLoadState::FrameLoadState):
     12        (WebKit::FrameLoadState::~FrameLoadState):
     13        * UIProcess/FrameLoadState.h: Added.
     14        * UIProcess/WebFrameProxy.cpp:
     15        (WebKit::WebFrameProxy::WebFrameProxy):
     16        (WebKit::WebFrameProxy::didStartProvisionalLoad):
     17        (WebKit::WebFrameProxy::didReceiveServerRedirectForProvisionalLoad):
     18        (WebKit::WebFrameProxy::didFailProvisionalLoad):
     19        (WebKit::WebFrameProxy::didCommitLoad):
     20        (WebKit::WebFrameProxy::didFinishLoad):
     21        (WebKit::WebFrameProxy::didFailLoad):
     22        (WebKit::WebFrameProxy::didSameDocumentNavigation):
     23        (WebKit::WebFrameProxy::setUnreachableURL):
     24        * UIProcess/WebFrameProxy.h:
     25        (WebKit::WebFrameProxy::frameLoadState):
     26        (WebKit::WebFrameProxy::loadState):
     27        (WebKit::WebFrameProxy::url):
     28        (WebKit::WebFrameProxy::provisionalURL):
     29        (WebKit::WebFrameProxy::unreachableURL):
     30        * UIProcess/WebPageProxy.cpp:
     31        (WebKit::WebPageProxy::WebPageProxy):
     32        (WebKit::WebPageProxy::activeURL):
     33        * UIProcess/WebPageProxy.h:
     34        (WebKit::WebPageProxy::loadStateAtProcessExit):
     35        * WebKit2.xcodeproj/project.pbxproj:
     36
    1372013-11-11  Gergo Balogh  <geryxyz@inf.u-szeged.hu>
    238

  • trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp

    r159059 r159077  
    4545{
    4646    WebFrameProxy* frame = toImpl(frameRef);
    47     switch (frame->loadState()) {
    48         case WebFrameProxy::LoadStateProvisional:
    49             return kWKFrameLoadStateProvisional;
    50         case WebFrameProxy::LoadStateCommitted:
    51             return kWKFrameLoadStateCommitted;
    52         case WebFrameProxy::LoadStateFinished:
    53             return kWKFrameLoadStateFinished;
     47    switch (frame->frameLoadState().m_loadState) {
     48    case FrameLoadState::LoadStateProvisional:
     49        return kWKFrameLoadStateProvisional;
     50    case FrameLoadState::LoadStateCommitted:
     51        return kWKFrameLoadStateCommitted;
     52    case FrameLoadState::LoadStateFinished:
     53        return kWKFrameLoadStateFinished;
    5454    }
    5555   

  • trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp

    r157842 r159077  
    4545WebFrameProxy::WebFrameProxy(WebPageProxy* page, uint64_t frameID)
    4646    : m_page(page)
    47     , m_loadState(LoadStateFinished)
    4847    , m_isFrameSet(false)
    4948    , m_frameID(frameID)
    … …  
    120119void WebFrameProxy::didStartProvisionalLoad(const String& url)
    121120{
    122     ASSERT(m_provisionalURL.isEmpty());
    123     m_loadState = LoadStateProvisional;
    124     m_provisionalURL = url;
     121    ASSERT(m_frameLoadState.m_provisionalURL.isEmpty());
     122    m_frameLoadState.m_loadState = FrameLoadState::LoadStateProvisional;
     123    m_frameLoadState.m_provisionalURL = url;
    125124}
    126125
    127126void WebFrameProxy::didReceiveServerRedirectForProvisionalLoad(const String& url)
    128127{
    129     ASSERT(m_loadState == LoadStateProvisional);
    130     m_provisionalURL = url;
     128    ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateProvisional);
     129    m_frameLoadState.m_provisionalURL = url;
    131130}
    132131
    133132void WebFrameProxy::didFailProvisionalLoad()
    134133{
    135     ASSERT(m_loadState == LoadStateProvisional);
    136     m_loadState = LoadStateFinished;
    137     m_provisionalURL = String();
    138     m_unreachableURL = m_lastUnreachableURL;
     134    ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateProvisional);
     135    m_frameLoadState.m_loadState = FrameLoadState::LoadStateFinished;
     136    m_frameLoadState.m_provisionalURL = String();
     137    m_frameLoadState.m_unreachableURL = m_frameLoadState.m_lastUnreachableURL;
    139138}
    140139
    141140void WebFrameProxy::didCommitLoad(const String& contentType, const PlatformCertificateInfo& certificateInfo)
    142141{
    143     ASSERT(m_loadState == LoadStateProvisional);
    144     m_loadState = LoadStateCommitted;
    145     m_url = m_provisionalURL;
    146     m_provisionalURL = String();
     142    ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateProvisional);
     143    m_frameLoadState.m_loadState = FrameLoadState::LoadStateCommitted;
     144    m_frameLoadState.m_url = m_frameLoadState.m_provisionalURL;
     145    m_frameLoadState.m_provisionalURL = String();
    147146    m_title = String();
    148147    m_MIMEType = contentType;
    … …  
    153152void WebFrameProxy::didFinishLoad()
    154153{
    155     ASSERT(m_loadState == LoadStateCommitted);
    156     ASSERT(m_provisionalURL.isEmpty());
    157     m_loadState = LoadStateFinished;
     154    ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateCommitted);
     155    ASSERT(m_frameLoadState.m_provisionalURL.isEmpty());
     156    m_frameLoadState.m_loadState = FrameLoadState::LoadStateFinished;
    158157}
    159158
    160159void WebFrameProxy::didFailLoad()
    161160{
    162     ASSERT(m_loadState == LoadStateCommitted);
    163     ASSERT(m_provisionalURL.isEmpty());
    164     m_loadState = LoadStateFinished;
     161    ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateCommitted);
     162    ASSERT(m_frameLoadState.m_provisionalURL.isEmpty());
     163    m_frameLoadState.m_loadState = FrameLoadState::LoadStateFinished;
    165164}
    166165
    167166void WebFrameProxy::didSameDocumentNavigation(const String& url)
    168167{
    169     m_url = url;
     168    m_frameLoadState.m_url = url;
    170169}
    171170
    … …  
    233232void WebFrameProxy::setUnreachableURL(const String& unreachableURL)
    234233{
    235     m_lastUnreachableURL = m_unreachableURL;
    236     m_unreachableURL = unreachableURL;
     234    m_frameLoadState.m_lastUnreachableURL = m_frameLoadState.m_unreachableURL;
     235    m_frameLoadState.m_unreachableURL = unreachableURL;
    237236}
    238237

  • trunk/Source/WebKit2/UIProcess/WebFrameProxy.h

    r157842 r159077  
    2828
    2929#include "APIObject.h"
     30#include "FrameLoadState.h"
    3031#include "ImmutableArray.h"
    3132#include "GenericCallback.h"
    … …  
    6162    virtual ~WebFrameProxy();
    6263
    63     enum LoadState {
    64         LoadStateProvisional,
    65         LoadStateCommitted,
    66         LoadStateFinished
    67     };
    68 
    6964    uint64_t frameID() const { return m_frameID; }
    7065    WebPageProxy* page() const { return m_page; }
    … …  
    7772    bool isFrameSet() const { return m_isFrameSet; }
    7873
    79     LoadState loadState() const { return m_loadState; }
     74    FrameLoadState& frameLoadState() { return m_frameLoadState; }
     75
     76    FrameLoadState::LoadState loadState() const { return m_frameLoadState.m_loadState; }
    8077   
    8178    void stopLoading() const;
    8279
    83     const String& url() const { return m_url; }
    84     const String& provisionalURL() const { return m_provisionalURL; }
     80    const String& url() const { return m_frameLoadState.m_url; }
     81    const String& provisionalURL() const { return m_frameLoadState.m_provisionalURL; }
    8582
    8683    void setUnreachableURL(const String&);
    87     const String& unreachableURL() const { return m_unreachableURL; }
     84    const String& unreachableURL() const { return m_frameLoadState.m_unreachableURL; }
    8885
    8986    const String& mimeType() const { return m_MIMEType; }
    … …  
    122119
    123120    WebPageProxy* m_page;
    124     LoadState m_loadState;
    125     String m_url;
    126     String m_provisionalURL;
    127     String m_unreachableURL;
    128     String m_lastUnreachableURL;
     121
     122    FrameLoadState m_frameLoadState;
     123
    129124    String m_MIMEType;
    130125    String m_title;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r158872 r159077  
    239239    , m_viewState(ViewState::NoFlags)
    240240    , m_backForwardList(WebBackForwardList::create(this))
    241     , m_loadStateAtProcessExit(WebFrameProxy::LoadStateFinished)
     241    , m_loadStateAtProcessExit(FrameLoadState::LoadStateFinished)
    242242    , m_temporarilyClosedComposition(false)
    243243    , m_textZoomFactor(1)
    … …  
    848848        return m_mainFrame->unreachableURL();
    849849
    850     switch (m_mainFrame->loadState()) {
    851     case WebFrameProxy::LoadStateProvisional:
     850    switch (m_mainFrame->frameLoadState().m_loadState) {
     851    case FrameLoadState::LoadStateProvisional:
    852852        return m_mainFrame->provisionalURL();
    853     case WebFrameProxy::LoadStateCommitted:
    854     case WebFrameProxy::LoadStateFinished:
     853    case FrameLoadState::LoadStateCommitted:
     854    case FrameLoadState::LoadStateFinished:
    855855        return m_mainFrame->url();
    856856    }

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r158775 r159077  
    611611
    612612    const String& urlAtProcessExit() const { return m_urlAtProcessExit; }
    613     WebFrameProxy::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
     613    FrameLoadState::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
    614614
    615615#if ENABLE(DRAG_SUPPORT)
    … …  
    10911091
    10921092    String m_urlAtProcessExit;
    1093     WebFrameProxy::LoadState m_loadStateAtProcessExit;
     1093    FrameLoadState::LoadState m_loadStateAtProcessExit;
    10941094
    10951095    EditorState m_editorState;

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r159016 r159077  
    267267                1AE00D5C182DADE100087DD7 /* KeyedEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE00D5A182DADE100087DD7 /* KeyedEncoder.cpp */; };
    268268                1AE00D5D182DADE100087DD7 /* KeyedEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D5B182DADE100087DD7 /* KeyedEncoder.h */; };
     269                1AE00D601831792100087DD7 /* FrameLoadState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE00D5E1831792100087DD7 /* FrameLoadState.cpp */; };
     270                1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D5F1831792100087DD7 /* FrameLoadState.h */; };
    269271                1AE117F611DBB30900981615 /* ProcessLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE117F511DBB30900981615 /* ProcessLauncher.cpp */; };
    270272                1AE4976811FF658E0048B464 /* NPJSObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE4976611FF658E0048B464 /* NPJSObject.h */; };
    … …  
    17531755                1AE00D5A182DADE100087DD7 /* KeyedEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeyedEncoder.cpp; sourceTree = "<group>"; };
    17541756                1AE00D5B182DADE100087DD7 /* KeyedEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyedEncoder.h; sourceTree = "<group>"; };
     1757                1AE00D5E1831792100087DD7 /* FrameLoadState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoadState.cpp; sourceTree = "<group>"; };
     1758                1AE00D5F1831792100087DD7 /* FrameLoadState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameLoadState.h; sourceTree = "<group>"; };
    17551759                1AE117F511DBB30900981615 /* ProcessLauncher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessLauncher.cpp; sourceTree = "<group>"; };
    17561760                1AE4976611FF658E0048B464 /* NPJSObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPJSObject.h; sourceTree = "<group>"; };
    … …  
    42954299                                1A6422FC12DD08FE00CAAE2C /* DrawingAreaProxy.messages.in */,
    42964300                                1A910070126675C4001842F5 /* FindIndicator.cpp */,
     4301                                1AE00D5E1831792100087DD7 /* FrameLoadState.cpp */,
     4302                                1AE00D5F1831792100087DD7 /* FrameLoadState.h */,
    42974303                                1A91006F126675C3001842F5 /* FindIndicator.h */,
    42984304                                BC17753E118BABF0007D9E9A /* GenericCallback.h */,
    … …  
    57945800                                51032F1E180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h in Headers */,
    57955801                                51A9E1061315CCFC009E7031 /* WebKeyValueStorageManager.h in Headers */,
     5802                                1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */,
    57965803                                BC59548915C7868500FD1E3E /* WebKit2.h in Headers */,
    57975804                                BCB63478116BF10600603215 /* WebKit2_C.h in Headers */,
    … …  
    67646771                                1AAF0C4B12B16334008E49E2 /* ArgumentCodersCF.cpp in Sources */,
    67656772                                E179FD9F134D38250015B883 /* ArgumentCodersMac.mm in Sources */,
     6773                                1AE00D601831792100087DD7 /* FrameLoadState.cpp in Sources */,
    67666774                                BC032DA510F437D10058C15A /* ArgumentDecoder.cpp in Sources */,
    67676775                                BC032DA710F437D10058C15A /* ArgumentEncoder.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.