Changeset 48994 in webkit


Ignore:
Timestamp:
Oct 1, 2009 1:12:40 PM (14 years ago)
Author:
abarth@webkit.org
Message:

2009-10-01 Adam Barth <abarth@webkit.org>

Reviewed by Darin Adler.

Remove FrameLoader::schedule* APIs
https://bugs.webkit.org/show_bug.cgi?id=29950

Change clients of FrameLoader::schedule* to call redirectScheduler
directly.

No behavior change.

  • bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::setLocation): (WebCore::createWindow): (WebCore::JSDOMWindow::open):
  • bindings/js/JSDocumentCustom.cpp: (WebCore::JSDocument::setLocation):
  • bindings/js/JSLocationCustom.cpp: (WebCore::navigateIfAllowed): (WebCore::JSLocation::reload):
  • bindings/v8/V8Utilities.cpp: (WebCore::navigateIfAllowed):
  • bindings/v8/custom/V8DOMWindowCustom.cpp: (WebCore::createWindow): (WebCore::CALLBACK_FUNC_DECL):
  • bindings/v8/custom/V8LocationCustom.cpp: (WebCore::CALLBACK_FUNC_DECL):
  • dom/Document.cpp: (WebCore::Document::implicitClose): (WebCore::Document::processHttpEquiv):
  • html/HTMLTokenizer.cpp: (WebCore::HTMLTokenizer::write):
  • loader/FrameLoader.cpp: (WebCore::FrameLoader::requestFrame): (WebCore::FrameLoader::submitForm): (WebCore::FrameLoader::receivedFirstData):
  • loader/FrameLoader.h:
  • loader/appcache/ApplicationCacheGroup.cpp: (WebCore::ApplicationCacheGroup::selectCache):
  • page/History.cpp: (WebCore::History::back): (WebCore::History::forward): (WebCore::History::go):
Location:
trunk/WebCore
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r48993 r48994  
     12009-10-01  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Remove FrameLoader::schedule* APIs
     6        https://bugs.webkit.org/show_bug.cgi?id=29950
     7
     8        Change clients of FrameLoader::schedule* to call redirectScheduler
     9        directly.
     10
     11        No behavior change.
     12
     13        * bindings/js/JSDOMWindowCustom.cpp:
     14        (WebCore::JSDOMWindow::setLocation):
     15        (WebCore::createWindow):
     16        (WebCore::JSDOMWindow::open):
     17        * bindings/js/JSDocumentCustom.cpp:
     18        (WebCore::JSDocument::setLocation):
     19        * bindings/js/JSLocationCustom.cpp:
     20        (WebCore::navigateIfAllowed):
     21        (WebCore::JSLocation::reload):
     22        * bindings/v8/V8Utilities.cpp:
     23        (WebCore::navigateIfAllowed):
     24        * bindings/v8/custom/V8DOMWindowCustom.cpp:
     25        (WebCore::createWindow):
     26        (WebCore::CALLBACK_FUNC_DECL):
     27        * bindings/v8/custom/V8LocationCustom.cpp:
     28        (WebCore::CALLBACK_FUNC_DECL):
     29        * dom/Document.cpp:
     30        (WebCore::Document::implicitClose):
     31        (WebCore::Document::processHttpEquiv):
     32        * html/HTMLTokenizer.cpp:
     33        (WebCore::HTMLTokenizer::write):
     34        * loader/FrameLoader.cpp:
     35        (WebCore::FrameLoader::requestFrame):
     36        (WebCore::FrameLoader::submitForm):
     37        (WebCore::FrameLoader::receivedFirstData):
     38        * loader/FrameLoader.h:
     39        * loader/appcache/ApplicationCacheGroup.cpp:
     40        (WebCore::ApplicationCacheGroup::selectCache):
     41        * page/History.cpp:
     42        (WebCore::History::back):
     43        (WebCore::History::forward):
     44        (WebCore::History::go):
     45
    1462009-10-01  Beth Dakin  <bdakin@apple.com>
    247
  • trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

    r48960 r48994  
    590590    if (!protocolIsJavaScript(url) || allowsAccessFrom(exec)) {
    591591        // We want a new history item if this JS was called via a user gesture
    592         frame->loader()->scheduleLocationChange(url, lexicalFrame->loader()->outgoingReferrer(), !lexicalFrame->script()->anyPageIsProcessingUserGesture(), false, processingUserGesture(exec));
     592        frame->redirectScheduler()->scheduleLocationChange(url, lexicalFrame->loader()->outgoingReferrer(), !lexicalFrame->script()->anyPageIsProcessingUserGesture(), false, processingUserGesture(exec));
    593593    }
    594594}
     
    782782            newFrame->loader()->changeLocation(completedURL, referrer, false, false, userGesture);
    783783        else if (!url.isEmpty())
    784             newFrame->loader()->scheduleLocationChange(completedURL.string(), referrer, !lexicalFrame->script()->anyPageIsProcessingUserGesture(), false, userGesture);
     784            newFrame->redirectScheduler()->scheduleLocationChange(completedURL.string(), referrer, !lexicalFrame->script()->anyPageIsProcessingUserGesture(), false, userGesture);
    785785    }
    786786
     
    839839            String referrer = dynamicFrame->loader()->outgoingReferrer();
    840840
    841             frame->loader()->scheduleLocationChange(completedURL, referrer, !lexicalFrame->script()->anyPageIsProcessingUserGesture(), false, userGesture);
     841            frame->redirectScheduler()->scheduleLocationChange(completedURL, referrer, !lexicalFrame->script()->anyPageIsProcessingUserGesture(), false, userGesture);
    842842        }
    843843        return toJS(exec, frame->domWindow());
  • trunk/WebCore/bindings/js/JSDocumentCustom.cpp

    r47752 r48994  
    8989
    9090    bool userGesture = activeFrame->script()->processingUserGesture();
    91     frame->loader()->scheduleLocationChange(str, activeFrame->loader()->outgoingReferrer(), !activeFrame->script()->anyPageIsProcessingUserGesture(), false, userGesture);
     91    frame->redirectScheduler()->scheduleLocationChange(str, activeFrame->loader()->outgoingReferrer(), !activeFrame->script()->anyPageIsProcessingUserGesture(), false, userGesture);
    9292}
    9393
  • trunk/WebCore/bindings/js/JSLocationCustom.cpp

    r48619 r48994  
    197197
    198198    if (!protocolIsJavaScript(url) || allowsAccessFromFrame(exec, frame))
    199         frame->loader()->scheduleLocationChange(url.string(), lexicalFrame->loader()->outgoingReferrer(), lockHistory, lockBackForwardList, processingUserGesture(exec));
     199        frame->redirectScheduler()->scheduleLocationChange(url.string(), lexicalFrame->loader()->outgoingReferrer(), lockHistory, lockBackForwardList, processingUserGesture(exec));
    200200}
    201201
     
    327327
    328328    if (!protocolIsJavaScript(frame->loader()->url()))
    329         frame->loader()->scheduleRefresh(processingUserGesture(exec));
     329        frame->redirectScheduler()->scheduleRefresh(processingUserGesture(exec));
    330330    return jsUndefined();
    331331}
  • trunk/WebCore/bindings/v8/V8Utilities.cpp

    r48610 r48994  
    106106
    107107    if (!protocolIsJavaScript(url) || ScriptController::isSafeScript(frame))
    108         frame->loader()->scheduleLocationChange(url.string(), callingFrame->loader()->outgoingReferrer(), lockHistory, lockBackForwardList, processingUserGesture());
     108        frame->redirectScheduler()->scheduleLocationChange(url.string(), callingFrame->loader()->outgoingReferrer(), lockHistory, lockBackForwardList, processingUserGesture());
    109109}
    110110
  • trunk/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

    r48978 r48994  
    516516            newFrame->loader()->changeLocation(completedUrl, referrer, false, false, userGesture);
    517517        else if (!url.isEmpty())
    518             newFrame->loader()->scheduleLocationChange(completedUrl.string(), referrer, false, userGesture);
     518            newFrame->redirectScheduler()->scheduleLocationChange(completedUrl.string(), referrer, false, userGesture);
    519519    }
    520520
     
    674674            String referrer = enteredFrame->loader()->outgoingReferrer();
    675675
    676             frame->loader()->scheduleLocationChange(completedUrl, referrer, false, userGesture);
     676            frame->redirectScheduler()->scheduleLocationChange(completedUrl, referrer, false, userGesture);
    677677        }
    678678        return V8DOMWrapper::convertToV8Object(V8ClassIndex::DOMWINDOW, frame->domWindow());
  • trunk/WebCore/bindings/v8/custom/V8LocationCustom.cpp

    r48619 r48994  
    275275
    276276    if (!protocolIsJavaScript(frame->loader()->url()))
    277         frame->loader()->scheduleRefresh(processingUserGesture());
     277        frame->redirectScheduler()->scheduleRefresh(processingUserGesture());
    278278    return v8::Undefined();
    279279}
  • trunk/WebCore/dom/Document.cpp

    r48912 r48994  
    16651665    }
    16661666
    1667     bool wasLocationChangePending = frame() && frame()->loader()->isScheduledLocationChangePending();
     1667    bool wasLocationChangePending = frame() && frame()->redirectScheduler()->locationChangePending();
    16681668    bool doload = !parsing() && m_tokenizer && !m_processingLoadEvent && !wasLocationChangePending;
    16691669   
     
    17321732    // If they wanna cheat, we can too. -dwh
    17331733
    1734     if (frame()->loader()->isScheduledLocationChangePending() && elapsedTime() < cLayoutScheduleThreshold) {
     1734    if (frame()->redirectScheduler()->locationChangePending() && elapsedTime() < cLayoutScheduleThreshold) {
    17351735        // Just bail out. Before or during the onload we were shifted to another page.
    17361736        // The old i-Bench suite does this. When this happens don't bother painting or laying out.       
     
    21612161            else
    21622162                url = completeURL(url).string();
    2163             frame->loader()->scheduleHTTPRedirection(delay, url);
     2163            frame->redirectScheduler()->scheduleRedirect(delay, url);
    21642164        }
    21652165    } else if (equalIgnoringCase(equiv, "set-cookie")) {
     
    21752175        if (frameLoader->shouldInterruptLoadForXFrameOptions(content, url())) {
    21762176            frameLoader->stopAllLoaders();
    2177             frameLoader->scheduleLocationChange(blankURL(), String());
     2177            frame->redirectScheduler()->scheduleLocationChange(blankURL(), String());
    21782178        }
    21792179    }
  • trunk/WebCore/html/HTMLTokenizer.cpp

    r48701 r48994  
    16741674    State state = m_state;
    16751675
    1676     while (!m_src.isEmpty() && (!frame || !frame->loader()->isScheduledLocationChangePending())) {
     1676    while (!m_src.isEmpty() && (!frame || !frame->redirectScheduler()->locationChangePending())) {
    16771677        if (!continueProcessing(processedCount, startTime, state))
    16781678            break;
  • trunk/WebCore/loader/FrameLoader.cpp

    r48958 r48994  
    461461    Frame* frame = ownerElement->contentFrame();
    462462    if (frame)
    463         frame->loader()->scheduleLocationChange(url.string(), m_outgoingReferrer, true, true, isProcessingUserGesture());
     463        frame->redirectScheduler()->scheduleLocationChange(url.string(), m_outgoingReferrer, true, true, isProcessingUserGesture());
    464464    else
    465465        frame = loadSubframe(ownerElement, url, frameName, m_outgoingReferrer);
     
    596596    addHTTPOriginIfNeeded(frameRequest.resourceRequest(), outgoingOrigin());
    597597
    598     targetFrame->loader()->scheduleFormSubmission(frameRequest, lockHistory, event, formState);
     598    targetFrame->redirectScheduler()->scheduleFormSubmission(frameRequest, lockHistory, event, formState);
    599599}
    600600
     
    907907        url = m_frame->document()->completeURL(url).string();
    908908
    909     scheduleHTTPRedirection(delay, url);
     909    m_frame->redirectScheduler()->scheduleRedirect(delay, url);
    910910}
    911911
     
    13751375}
    13761376
    1377 bool FrameLoader::isScheduledLocationChangePending() const
    1378 {
    1379     return m_frame->redirectScheduler()->locationChangePending();
    1380 }
    1381 
    1382 void FrameLoader::scheduleHTTPRedirection(double delay, const String& url)
    1383 {
    1384     m_frame->redirectScheduler()->scheduleRedirect(delay, url);
    1385 }
    1386 
    13871377void RedirectScheduler::scheduleRedirect(double delay, const String& url)
    13881378{
     
    14131403    }
    14141404    return false;
    1415 }
    1416 
    1417 void FrameLoader::scheduleLocationChange(const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool wasUserGesture)
    1418 {
    1419     m_frame->redirectScheduler()->scheduleLocationChange(url, referrer, lockHistory, lockBackForwardList, wasUserGesture);
    14201405}
    14211406
     
    14471432}
    14481433
    1449 void FrameLoader::scheduleFormSubmission(const FrameLoadRequest& frameRequest,
    1450     bool lockHistory, PassRefPtr<Event> event, PassRefPtr<FormState> formState)
    1451 {
    1452     m_frame->redirectScheduler()->scheduleFormSubmission(frameRequest, lockHistory, event, formState);
    1453 }
    1454 
    14551434void RedirectScheduler::scheduleFormSubmission(const FrameLoadRequest& frameRequest,
    14561435    bool lockHistory, PassRefPtr<Event> event, PassRefPtr<FormState> formState)
     
    14671446
    14681447    schedule(new ScheduledRedirection(frameRequest, lockHistory, mustLockBackForwardList(m_frame), event, formState, duringLoad));
    1469 }
    1470 
    1471 void FrameLoader::scheduleRefresh(bool wasUserGesture)
    1472 {
    1473     m_frame->redirectScheduler()->scheduleRefresh(wasUserGesture);
    14741448}
    14751449
     
    15021476    ASSERT_NOT_REACHED();
    15031477    return false;
    1504 }
    1505 
    1506 void FrameLoader::scheduleHistoryNavigation(int steps)
    1507 {
    1508     m_frame->redirectScheduler()->scheduleHistoryNavigation(steps);
    15091478}
    15101479
  • trunk/WebCore/loader/FrameLoader.h

    r48958 r48994  
    122122
    123123        void scheduleRedirect(double delay, const String& url);
    124         void scheduleLocationChange(const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool wasUserGesture);
     124        void scheduleLocationChange(const String& url, const String& referrer, bool lockHistory = true, bool lockBackForwardList = true, bool userGesture = false);
    125125        void scheduleFormSubmission(const FrameLoadRequest&, bool lockHistory, PassRefPtr<Event>, PassRefPtr<FormState>);
    126         void scheduleRefresh(bool wasUserGesture);
     126        void scheduleRefresh(bool userGesture = false);
    127127        void scheduleHistoryNavigation(int steps);
    128128
     
    303303        KURL baseURL() const;
    304304
    305         bool isScheduledLocationChangePending() const;
    306         void scheduleHTTPRedirection(double delay, const String& url);
    307         void scheduleLocationChange(const String& url, const String& referrer, bool lockHistory = true, bool lockBackForwardList = true, bool userGesture = false);
    308         void scheduleRefresh(bool userGesture = false);
    309         void scheduleHistoryNavigation(int steps);
    310 
    311305        bool canGoBackOrForward(int distance) const;
    312306        void goBackOrForward(int distance);
     
    524518        void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int length);
    525519        void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier);
    526 
    527         void scheduleFormSubmission(const FrameLoadRequest&, bool lockHistory, PassRefPtr<Event>, PassRefPtr<FormState>);
    528520
    529521        void loadWithDocumentLoader(DocumentLoader*, FrameLoadType, PassRefPtr<FormState>); // Calls continueLoadAfterNavigationPolicy
  • trunk/WebCore/loader/appcache/ApplicationCacheGroup.cpp

    r48701 r48994  
    159159            // as part of the initial load.
    160160            // The navigation will not result in the same resource being loaded, because "foreign" entries are never picked during navigation.
    161             frame->loader()->scheduleLocationChange(documentLoader->url(), frame->loader()->referrer(), true);
     161            frame->redirectScheduler()->scheduleLocationChange(documentLoader->url(), frame->loader()->referrer(), true);
    162162        }
    163163       
  • trunk/WebCore/page/History.cpp

    r30434 r48994  
    5858    if (!m_frame)
    5959        return;
    60     m_frame->loader()->scheduleHistoryNavigation(-1);
     60    m_frame->redirectScheduler()->scheduleHistoryNavigation(-1);
    6161}
    6262
     
    6565    if (!m_frame)
    6666        return;
    67     m_frame->loader()->scheduleHistoryNavigation(1);
     67    m_frame->redirectScheduler()->scheduleHistoryNavigation(1);
    6868}
    6969
     
    7272    if (!m_frame)
    7373        return;
    74     m_frame->loader()->scheduleHistoryNavigation(distance);
     74    m_frame->redirectScheduler()->scheduleHistoryNavigation(distance);
    7575}
    7676
Note: See TracChangeset for help on using the changeset viewer.