Changeset 69938 in webkit

Timestamp:

Oct 17, 2010 7:59:32 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-10-17 Adam Barth <​abarth@webkit.org>

Reviewed by Dimitri Glazkov.

Remove explicit passing of user gesture in NavigationScheduler
​https://bugs.webkit.org/show_bug.cgi?id=47786

As requested by Mr. Glazkov, remove more explicit passing of the user
gesture state. We now use a static to pass this information around.

• bindings/generic/BindingFrame.h: (WebCore::::navigateIfAllowed):
• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::setLocation):
• bindings/js/JSLocationCustom.cpp: (WebCore::JSLocation::reload):
• bindings/v8/custom/V8LocationCustom.cpp: (WebCore::V8Location::reloadCallback):
• inspector/InspectorController.cpp: (WebCore::InspectorController::setResourceTrackingEnabled): (WebCore::InspectorController::reloadPage):
• loader/NavigationScheduler.cpp: (WebCore::ScheduledNavigation::ScheduledNavigation): (WebCore::ScheduledURLNavigation::ScheduledURLNavigation): (WebCore::ScheduledRedirect::ScheduledRedirect): (WebCore::ScheduledLocationChange::ScheduledLocationChange): (WebCore::ScheduledRefresh::ScheduledRefresh): (WebCore::ScheduledHistoryNavigation::ScheduledHistoryNavigation): (WebCore::ScheduledFormSubmission::ScheduledFormSubmission): (WebCore::NavigationScheduler::scheduleRedirect): (WebCore::NavigationScheduler::mustLockBackForwardList): (WebCore::NavigationScheduler::scheduleLocationChange): (WebCore::NavigationScheduler::scheduleFormSubmission): (WebCore::NavigationScheduler::scheduleRefresh): (WebCore::NavigationScheduler::scheduleHistoryNavigation):
• loader/NavigationScheduler.h:
• loader/SubframeLoader.cpp: (WebCore::SubframeLoader::loadOrRedirectSubframe):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/generic/BindingFrame.h (modified) (1 diff)
• bindings/js/JSDOMWindowCustom.cpp (modified) (1 diff)
• bindings/js/JSLocationCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8LocationCustom.cpp (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (2 diffs)
• loader/NavigationScheduler.cpp (modified) (14 diffs)
• loader/NavigationScheduler.h (modified) (2 diffs)
• loader/SubframeLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-17  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Remove explicit passing of user gesture in NavigationScheduler
+        https://bugs.webkit.org/show_bug.cgi?id=47786
+
+        As requested by Mr. Glazkov, remove more explicit passing of the user
+        gesture state.  We now use a static to pass this information around.
+
+        * bindings/generic/BindingFrame.h:
+        (WebCore::::navigateIfAllowed):
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::setLocation):
+        * bindings/js/JSLocationCustom.cpp:
+        (WebCore::JSLocation::reload):
+        * bindings/v8/custom/V8LocationCustom.cpp:
+        (WebCore::V8Location::reloadCallback):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::setResourceTrackingEnabled):
+        (WebCore::InspectorController::reloadPage):
+        * loader/NavigationScheduler.cpp:
+        (WebCore::ScheduledNavigation::ScheduledNavigation):
+        (WebCore::ScheduledURLNavigation::ScheduledURLNavigation):
+        (WebCore::ScheduledRedirect::ScheduledRedirect):
+        (WebCore::ScheduledLocationChange::ScheduledLocationChange):
+        (WebCore::ScheduledRefresh::ScheduledRefresh):
+        (WebCore::ScheduledHistoryNavigation::ScheduledHistoryNavigation):
+        (WebCore::ScheduledFormSubmission::ScheduledFormSubmission):
+        (WebCore::NavigationScheduler::scheduleRedirect):
+        (WebCore::NavigationScheduler::mustLockBackForwardList):
+        (WebCore::NavigationScheduler::scheduleLocationChange):
+        (WebCore::NavigationScheduler::scheduleFormSubmission):
+        (WebCore::NavigationScheduler::scheduleRefresh):
+        (WebCore::NavigationScheduler::scheduleHistoryNavigation):
+        * loader/NavigationScheduler.h:
+        * loader/SubframeLoader.cpp:
+        (WebCore::SubframeLoader::loadOrRedirectSubframe):
+
 2010-10-17  Julien Chaffraix  <jchaffraix@codeaurora.org>
 

trunk/WebCore/bindings/generic/BindingFrame.h

@@ -50 +50 @@
         return;
     if (!protocolIsJavaScript(url) || state->allowsAccessFromFrame(frame))
-        frame->navigationScheduler()->scheduleLocationChange(url.string(), activeFrame->loader()->outgoingReferrer(), lockHistory, lockBackForwardList, state->processingUserGesture());
+        frame->navigationScheduler()->scheduleLocationChange(url.string(), activeFrame->loader()->outgoingReferrer(), lockHistory, lockBackForwardList);
 }
 

trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -513 +513 @@
     if (!protocolIsJavaScript(url) || allowsAccessFrom(exec)) {
         // We want a new history item if this JS was called via a user gesture
-        frame->navigationScheduler()->scheduleLocationChange(url, lexicalFrame->loader()->outgoingReferrer(), !lexicalFrame->script()->anyPageIsProcessingUserGesture(), false, processingUserGesture());
+        frame->navigationScheduler()->scheduleLocationChange(url, lexicalFrame->loader()->outgoingReferrer(), !lexicalFrame->script()->anyPageIsProcessingUserGesture(), false);
     }
 }

trunk/WebCore/bindings/js/JSLocationCustom.cpp

@@ -314 +314 @@
 
     if (!protocolIsJavaScript(frame->loader()->url()))
-        frame->navigationScheduler()->scheduleRefresh(processingUserGesture());
+        frame->navigationScheduler()->scheduleRefresh();
     return jsUndefined();
 }

trunk/WebCore/bindings/v8/custom/V8LocationCustom.cpp

@@ -283 +283 @@
 
     if (!protocolIsJavaScript(frame->loader()->url()))
-        frame->navigationScheduler()->scheduleRefresh(processingUserGesture());
+        frame->navigationScheduler()->scheduleRefresh();
     return v8::Undefined();
 }

trunk/WebCore/inspector/InspectorController.cpp

@@ -1163 +1163 @@
 
     if (enable)
-        m_inspectedPage->mainFrame()->navigationScheduler()->scheduleRefresh(true);
+        reloadPage();
 }
 
@@ -2123 +2123 @@
 void InspectorController::reloadPage()
 {
-    m_inspectedPage->mainFrame()->navigationScheduler()->scheduleRefresh(true);
+    // FIXME: Why do we set the user gesture indicator here?
+    UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
+    m_inspectedPage->mainFrame()->navigationScheduler()->scheduleRefresh();
 }
 

trunk/WebCore/loader/NavigationScheduler.cpp

@@ -54 +54 @@
 class ScheduledNavigation : public Noncopyable {
 public:
-    ScheduledNavigation(double delay, bool lockHistory, bool lockBackForwardList, bool wasDuringLoad, bool isLocationChange, bool wasUserGesture)
+    ScheduledNavigation(double delay, bool lockHistory, bool lockBackForwardList, bool wasDuringLoad, bool isLocationChange)
         : m_delay(delay)
         , m_lockHistory(lockHistory)
@@ -60 +60 @@
         , m_wasDuringLoad(wasDuringLoad)
         , m_isLocationChange(isLocationChange)
-        , m_wasUserGesture(wasUserGesture)
+        , m_wasUserGesture(ScriptController::processingUserGesture())
     {
     }
@@ -89 +89 @@
 class ScheduledURLNavigation : public ScheduledNavigation {
 public:
-    ScheduledURLNavigation(double delay, const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool wasUserGesture, bool duringLoad, bool isLocationChange)
-        : ScheduledNavigation(delay, lockHistory, lockBackForwardList, duringLoad, isLocationChange, wasUserGesture)
+    ScheduledURLNavigation(double delay, const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool duringLoad, bool isLocationChange)
+        : ScheduledNavigation(delay, lockHistory, lockBackForwardList, duringLoad, isLocationChange)
         , m_url(url)
         , m_referrer(referrer)
@@ -129 +129 @@
 class ScheduledRedirect : public ScheduledURLNavigation {
 public:
-    ScheduledRedirect(double delay, const String& url, bool lockHistory, bool lockBackForwardList, bool wasUserGesture)
-        : ScheduledURLNavigation(delay, url, String(), lockHistory, lockBackForwardList, wasUserGesture, false, false) { }
+    ScheduledRedirect(double delay, const String& url, bool lockHistory, bool lockBackForwardList)
+        : ScheduledURLNavigation(delay, url, String(), lockHistory, lockBackForwardList, false, false)
+    {
+    }
 
     virtual bool shouldStartTimer(Frame* frame) { return frame->loader()->allAncestorsAreComplete(); }
@@ -137 +139 @@
 class ScheduledLocationChange : public ScheduledURLNavigation {
 public:
-    ScheduledLocationChange(const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool wasUserGesture, bool duringLoad)
-        : ScheduledURLNavigation(0.0, url, referrer, lockHistory, lockBackForwardList, wasUserGesture, duringLoad, true) { }
+    ScheduledLocationChange(const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool duringLoad)
+        : ScheduledURLNavigation(0.0, url, referrer, lockHistory, lockBackForwardList, duringLoad, true) { }
 };
 
 class ScheduledRefresh : public ScheduledURLNavigation {
 public:
-    ScheduledRefresh(const String& url, const String& referrer, bool wasUserGesture)
-        : ScheduledURLNavigation(0.0, url, referrer, true, true, wasUserGesture, false, true) { }
+    ScheduledRefresh(const String& url, const String& referrer)
+        : ScheduledURLNavigation(0.0, url, referrer, true, true, false, true)
+    {
+    }
 
     virtual void fire(Frame* frame)
@@ -155 +159 @@
 class ScheduledHistoryNavigation : public ScheduledNavigation {
 public:
-    explicit ScheduledHistoryNavigation(int historySteps, bool wasUserGesture) : ScheduledNavigation(0, false, false, false, true, wasUserGesture), m_historySteps(historySteps) { }
+    explicit ScheduledHistoryNavigation(int historySteps)
+        : ScheduledNavigation(0, false, false, false, true)
+        , m_historySteps(historySteps)
+    {
+    }
 
     virtual void fire(Frame* frame)
@@ -179 +187 @@
 class ScheduledFormSubmission : public ScheduledNavigation {
 public:
-    ScheduledFormSubmission(PassRefPtr<FormSubmission> submission, bool lockBackForwardList, bool duringLoad, bool wasUserGesture)
-        : ScheduledNavigation(0, submission->lockHistory(), lockBackForwardList, duringLoad, true, wasUserGesture)
+    ScheduledFormSubmission(PassRefPtr<FormSubmission> submission, bool lockBackForwardList, bool duringLoad)
+        : ScheduledNavigation(0, submission->lockHistory(), lockBackForwardList, duringLoad, true)
         , m_submission(submission)
         , m_haveToldClient(false)
@@ -259 +267 @@
     // We want a new back/forward list item if the refresh timeout is > 1 second.
     if (!m_redirect || delay <= m_redirect->delay())
-        schedule(adoptPtr(new ScheduledRedirect(delay, url, true, delay <= 1, false)));
-}
-
-bool NavigationScheduler::mustLockBackForwardList(Frame* targetFrame, bool wasUserGesture)
+        schedule(adoptPtr(new ScheduledRedirect(delay, url, true, delay <= 1)));
+}
+
+bool NavigationScheduler::mustLockBackForwardList(Frame* targetFrame)
 {
     // Non-user navigation before the page has finished firing onload should not create a new back/forward item.
     // See https://webkit.org/b/42861 for the original motivation for this.    
-    if (!wasUserGesture && targetFrame->loader()->documentLoader() && !targetFrame->loader()->documentLoader()->wasOnloadHandled())
+    if (!ScriptController::processingUserGesture() && targetFrame->loader()->documentLoader() && !targetFrame->loader()->documentLoader()->wasOnloadHandled())
         return true;
     
@@ -280 +288 @@
 }
 
-void NavigationScheduler::scheduleLocationChange(const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool wasUserGesture)
+void NavigationScheduler::scheduleLocationChange(const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList)
 {
     if (!m_frame->page())
@@ -287 +295 @@
         return;
 
-    lockBackForwardList = lockBackForwardList || mustLockBackForwardList(m_frame, wasUserGesture);
+    lockBackForwardList = lockBackForwardList || mustLockBackForwardList(m_frame);
 
     FrameLoader* loader = m_frame->loader();
@@ -303 +311 @@
     bool duringLoad = !loader->stateMachine()->committedFirstRealDocumentLoad();
 
-    schedule(adoptPtr(new ScheduledLocationChange(url, referrer, lockHistory, lockBackForwardList, wasUserGesture, duringLoad)));
+    schedule(adoptPtr(new ScheduledLocationChange(url, referrer, lockHistory, lockBackForwardList, duringLoad)));
 }
 
@@ -320 +328 @@
     // to match IE and Opera.
     // See https://bugs.webkit.org/show_bug.cgi?id=32383 for the original motivation for this.
-    bool isUserGesture = m_frame->loader()->isProcessingUserGesture();
-    bool lockBackForwardList = mustLockBackForwardList(m_frame, isUserGesture) || (submission->state()->formSubmissionTrigger() == SubmittedByJavaScript && m_frame->tree()->parent() && !isUserGesture);
-
-    schedule(adoptPtr(new ScheduledFormSubmission(submission, lockBackForwardList, duringLoad, isUserGesture)));
-}
-
-void NavigationScheduler::scheduleRefresh(bool wasUserGesture)
+    bool lockBackForwardList = mustLockBackForwardList(m_frame)
+        || (submission->state()->formSubmissionTrigger() == SubmittedByJavaScript
+            && m_frame->tree()->parent() && !ScriptController::processingUserGesture());
+
+    schedule(adoptPtr(new ScheduledFormSubmission(submission, lockBackForwardList, duringLoad)));
+}
+
+void NavigationScheduler::scheduleRefresh()
 {
     if (!m_frame->page())
@@ -334 +343 @@
         return;
 
-    schedule(adoptPtr(new ScheduledRefresh(url.string(), m_frame->loader()->outgoingReferrer(), wasUserGesture)));
+    schedule(adoptPtr(new ScheduledRefresh(url.string(), m_frame->loader()->outgoingReferrer())));
 }
 
@@ -351 +360 @@
 
     // In all other cases, schedule the history traversal to occur asynchronously.
-    schedule(adoptPtr(new ScheduledHistoryNavigation(steps, m_frame->loader()->isProcessingUserGesture())));
+    schedule(adoptPtr(new ScheduledHistoryNavigation(steps)));
 }
 

trunk/WebCore/loader/NavigationScheduler.h

@@ -57 +57 @@
 
     void scheduleRedirect(double delay, const String& url);
-    void scheduleLocationChange(const String& url, const String& referrer, bool lockHistory = true, bool lockBackForwardList = true, bool userGesture = false);
+    void scheduleLocationChange(const String& url, const String& referrer, bool lockHistory = true, bool lockBackForwardList = true);
     void scheduleFormSubmission(PassRefPtr<FormSubmission>);
-    void scheduleRefresh(bool userGesture = false);
+    void scheduleRefresh();
     void scheduleHistoryNavigation(int steps);
 
@@ -71 +71 @@
     void schedule(PassOwnPtr<ScheduledNavigation>);
 
-    static bool mustLockBackForwardList(Frame* targetFrame, bool mustLockIfDuringLoad);
+    static bool mustLockBackForwardList(Frame* targetFrame);
 
     Frame* m_frame;

trunk/WebCore/loader/SubframeLoader.cpp

@@ -240 +240 @@
     Frame* frame = ownerElement->contentFrame();
     if (frame)
-        frame->navigationScheduler()->scheduleLocationChange(url.string(), m_frame->loader()->outgoingReferrer(), lockHistory, lockBackForwardList, m_frame->loader()->isProcessingUserGesture());
+        frame->navigationScheduler()->scheduleLocationChange(url.string(), m_frame->loader()->outgoingReferrer(), lockHistory, lockBackForwardList);
     else
         frame = loadSubframe(ownerElement, url, frameName, m_frame->loader()->outgoingReferrer());