| Index: Source/WebKit/chromium/src/WebDOMProgressEvent.cpp
|
| diff --git a/Source/WebKit/chromium/src/WebUserGestureIndicator.cpp b/Source/WebKit/chromium/src/WebDOMProgressEvent.cpp
|
| similarity index 73%
|
| copy from Source/WebKit/chromium/src/WebUserGestureIndicator.cpp
|
| copy to Source/WebKit/chromium/src/WebDOMProgressEvent.cpp
|
| index 1a12fb25719b9e31c703c15162382c7b1a3169fb..60bdde62582b15e7e7f1e7be985b5618851d8809 100644
|
| --- a/Source/WebKit/chromium/src/WebUserGestureIndicator.cpp
|
| +++ b/Source/WebKit/chromium/src/WebDOMProgressEvent.cpp
|
| @@ -29,28 +29,28 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "WebUserGestureIndicator.h"
|
| +#include "WebDOMProgressEvent.h"
|
|
|
| -#include "WebUserGestureToken.h"
|
| -#include "core/dom/UserGestureIndicator.h"
|
| +#include "V8ProgressEvent.h"
|
| +#include "core/dom/ProgressEvent.h"
|
| +#include <public/WebString.h>
|
|
|
| using namespace WebCore;
|
|
|
| namespace WebKit {
|
|
|
| -bool WebUserGestureIndicator::isProcessingUserGesture()
|
| +WebDOMProgressEvent::WebDOMProgressEvent(const WebString& type, bool lengthIsComputable, unsigned long long loaded, unsigned long long total)
|
| + : WebDOMEvent(ProgressEvent::create(type, lengthIsComputable, loaded, total))
|
| {
|
| - return UserGestureIndicator::processingUserGesture();
|
| + ASSERT(m_private);
|
| + ASSERT(isProgressEvent());
|
| }
|
|
|
| -bool WebUserGestureIndicator::consumeUserGesture()
|
| +v8::Handle<v8::Value> WebDOMProgressEvent::toV8Value()
|
| {
|
| - return UserGestureIndicator::consumeUserGesture();
|
| -}
|
| -
|
| -WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken()
|
| -{
|
| - return WebUserGestureToken(UserGestureIndicator::currentToken());
|
| + if (!m_private)
|
| + return v8::Handle<v8::Value>();
|
| + return toV8(m_private, v8::Handle<v8::Object>(), v8::Isolate::GetCurrent());
|
| }
|
|
|
| } // namespace WebKit
|
|
|