Source/WebCore/ChangeLog

 12011-01-11 Joe Mason <jmason@rim.com>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 FrameLoader::isProcessingUserGesture is wrong in dispatchWillPerformClientRedirect
 6 https://bugs.webkit.org/show_bug.cgi?id=52211
 7
 8 Create a UserGestureIndicator when calling the clientRedirected callback.
 9
 10 * loader/NavigationScheduler.cpp:
 11 (WebCore::ScheduledURLNavigation::didStartTimer):
 12 (WebCore::ScheduledURLNavigation::didStopTimer):
 13 (WebCore::ScheduledFormSubmission::didStartTimer):
 14 (WebCore::ScheduledFormSubmission::didStopTimer):
 15
1162011-01-11 Carlos Garcia Campos <cgarcia@igalia.com>
217
318 Reviewed by Martin Robinson.
75518

Source/WebCore/loader/NavigationScheduler.cpp

@@protected:
113113 if (m_haveToldClient)
114114 return;
115115 m_haveToldClient = true;
 116
 117 UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
116118 frame->loader()->clientRedirected(KURL(ParsedURLString, m_url), delay(), currentTime() + timer->nextFireInterval(), lockBackForwardList());
117119 }
118120

@@protected:
120122 {
121123 if (!m_haveToldClient)
122124 return;
 125
 126 // do not set a UserGestureIndicator because there are other paths to dispatchDidCancelClientRedirect where the gesture state is not set, and we should be consistent with them
123127 frame->loader()->clientRedirectCancelledOrFinished(newLoadInProgress);
124128 }
125129

@@public:
224228 if (m_haveToldClient)
225229 return;
226230 m_haveToldClient = true;
 231
 232 UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
227233 frame->loader()->clientRedirected(m_submission->requestURL(), delay(), currentTime() + timer->nextFireInterval(), lockBackForwardList());
228234 }
229235

@@public:
231237 {
232238 if (!m_haveToldClient)
233239 return;
 240
 241 // do not set a UserGestureIndicator because there are other paths to dispatchDidCancelClientRedirect where the gesture state is not set, and we should be consistent with them
234242 frame->loader()->clientRedirectCancelledOrFinished(newLoadInProgress);
235243 }
236244
75475

Tools/ChangeLog

 12011-01-11 Joe Mason <jmason@rim.com>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 FrameLoader::isProcessingUserGesture is wrong in dispatchWillPerformClientRedirect
 6 https://bugs.webkit.org/show_bug.cgi?id=52211
 7
 8 Dump isUserProcessingGesture in willPerformClientRedirect so that the layout tests can be extended.
 9 (For the mac and chromium ports - other ports don't support dumping user gestures in DRT.)
 10
 11 * DumpRenderTree/chromium/WebViewHost.cpp:
 12 (WebViewHost::willPerformClientRedirect):
 13 (WebViewHost::didStartProvisionalLoad):
 14 * DumpRenderTree/mac/FrameLoadDelegate.mm:
 15 (-[FrameLoadDelegate webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:]):
 16
1172011-01-11 Sam Weinig <sam@webkit.org>
218
319 Roll r75474 back in.
75518

Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@void WebViewHost::unableToImplementPolic
823823void WebViewHost::willPerformClientRedirect(WebFrame* frame, const WebURL& from, const WebURL& to,
824824 double interval, double fire_time)
825825{
826  if (!m_shell->shouldDumpFrameLoadCallbacks())
827  return;
828  printFrameDescription(frame);
829  printf(" - willPerformClientRedirectToURL: %s \n", to.spec().data());
 826 if (m_shell->shouldDumpFrameLoadCallbacks()) {
 827 printFrameDescription(frame);
 828 printf(" - willPerformClientRedirectToURL: %s \n", to.spec().data());
 829 }
 830
 831 if (m_shell->shouldDumpUserGestureInFrameLoadCallbacks())
 832 printFrameUserGestureStatus(frame, " - in willPerformClientRedirect\n");
830833}
831834
832835void WebViewHost::didCancelClientRedirect(WebFrame* frame)

@@void WebViewHost::didCreateDataSource(We
846849
847850void WebViewHost::didStartProvisionalLoad(WebFrame* frame)
848851{
849  if (m_shell->shouldDumpUserGestureInFrameLoadCallbacks())
850  printFrameUserGestureStatus(frame, " - in didStartProvisionalLoadForFrame\n");
851852 if (m_shell->shouldDumpFrameLoadCallbacks()) {
852853 printFrameDescription(frame);
853854 fputs(" - didStartProvisionalLoadForFrame\n", stdout);
854855 }
855856
 857 if (m_shell->shouldDumpUserGestureInFrameLoadCallbacks())
 858 printFrameUserGestureStatus(frame, " - in didStartProvisionalLoadForFrame\n");
 859
856860 if (!m_topLoadingFrame)
857861 m_topLoadingFrame = frame;
858862
75475

Tools/DumpRenderTree/mac/FrameLoadDelegate.mm

@@- (void)webView:(WebView *)sender willPe
353353 NSString *string = [NSString stringWithFormat:@"%@ - willPerformClientRedirectToURL: %@ ", [frame _drt_descriptionSuitableForTestResult], [URL _drt_descriptionSuitableForTestResult]];
354354 printf ("%s\n", [string UTF8String]);
355355 }
 356
 357 if (!done && gLayoutTestController->dumpUserGestureInFrameLoadCallbacks()) {
 358 NSString *string = [NSString stringWithFormat:@"%@ - in willPerformClientRedirect", [frame _drt_printFrameUserGestureStatus]];
 359 printf ("%s\n", [string UTF8String]);
 360 }
356361}
357362
358363- (void)webView:(WebView *)sender didCancelClientRedirectForFrame:(WebFrame *)frame
75475

WebKit/qt/ChangeLog

 12011-01-11 Joe Mason <jmason@rim.com>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 FrameLoader::isProcessingUserGesture is wrong in dispatchWillPerformClientRedirect
 6 https://bugs.webkit.org/show_bug.cgi?id=52211
 7
 8 Dump isUserProcessingGesture in willPerformClientRedirect so that the layout tests can be extended.
 9
 10 * WebCoreSupport/FrameLoaderClientQt.cpp:
 11 (WebCore::FrameLoaderClientQt::dispatchWillPerformClientRedirect):
 12
1132011-01-11 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
214
315 Reviewed by Kenneth Rohde Christiansen.
75518

WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@void FrameLoaderClientQt::dispatchWillPe
372372 if (dumpFrameLoaderCallbacks)
373373 printf("%s - willPerformClientRedirectToURL: %s \n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)), qPrintable(drtDescriptionSuitableForTestResult(url)));
374374
 375 if (dumpUserGestureInFrameLoaderCallbacks)
 376 printf("%s - in willPerformClientRedirect\n", qPrintable(drtPrintFrameUserGestureStatus(m_frame)));
 377
375378 notImplemented();
376379}
377380
75475

LayoutTests/ChangeLog

 12011-01-11 Joe Mason <jmason@rim.com>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 FrameLoader::isProcessingUserGesture is wrong in dispatchWillPerformClientRedirect
 6 https://bugs.webkit.org/show_bug.cgi?id=52211
 7
 8 Add willPerformClientRedirect to the user-gesture tests.
 9
 10 * fast/frames/location-redirect-user-gesture-expected.txt:
 11 * fast/frames/meta-refresh-user-gesture-expected.txt:
 12
1132011-01-11 Stephen White <senorblanco@chromium.org>
214
315 Unreviewed; chromium-gpu test expectations update.
75518

LayoutTests/fast/frames/location-redirect-user-gesture-expected.txt

 1Frame with user gesture "false" - in willPerformClientRedirect
12Frame with user gesture "false" - in didStartProvisionalLoadForFrame
23
75475

LayoutTests/fast/frames/meta-refresh-user-gesture-expected.txt

 1Frame with user gesture "false" - in willPerformClientRedirect
12Frame with user gesture "false" - in didStartProvisionalLoadForFrame
23
75475