Commit 199f2304 authored by hclam@chromium.org's avatar hclam@chromium.org

Roll WebKit to r45634 and fix build

Review URL: http://codereview.chromium.org/155241

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20196 0039d316-1c4b-4281-b951-d872f2087c98
parent bd1b9670
vars = { vars = {
"webkit_trunk": "webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk", "http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "45633", "webkit_revision": "45634",
} }
......
...@@ -1493,11 +1493,11 @@ bool WebFrameLoaderClient::ActionSpecifiesDisposition( ...@@ -1493,11 +1493,11 @@ bool WebFrameLoaderClient::ActionSpecifiesDisposition(
} }
NavigationGesture WebFrameLoaderClient::NavigationGestureForLastLoad() { NavigationGesture WebFrameLoaderClient::NavigationGestureForLastLoad() {
// TODO(timsteele): userGestureHint returns too many false positives // TODO(timsteele): isProcessingUserGesture() returns too many false positives
// (see bug 1051891) to trust it and assign NavigationGestureUser, so // (see bug 1051891) to trust it and assign NavigationGestureUser, so
// for now we assign Unknown in those cases and Auto otherwise. // for now we assign Unknown in those cases and Auto otherwise.
// (Issue 874811 known false negative as well). // (Issue 874811 known false negative as well).
return webframe_->frame()->loader()->userGestureHint() ? return webframe_->frame()->loader()->isProcessingUserGesture() ?
NavigationGestureUnknown : NavigationGestureUnknown :
NavigationGestureAuto; NavigationGestureAuto;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment