| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "WebUserGestureIndicator.h" | 32 #include "WebDOMProgressEvent.h" |
| 33 | 33 |
| 34 #include "WebUserGestureToken.h" | 34 #include "V8ProgressEvent.h" |
| 35 #include "core/dom/UserGestureIndicator.h" | 35 #include "core/dom/ProgressEvent.h" |
| 36 #include <public/WebString.h> |
| 36 | 37 |
| 37 using namespace WebCore; | 38 using namespace WebCore; |
| 38 | 39 |
| 39 namespace WebKit { | 40 namespace WebKit { |
| 40 | 41 |
| 41 bool WebUserGestureIndicator::isProcessingUserGesture() | 42 WebDOMProgressEvent::WebDOMProgressEvent(const WebString& type, bool lengthIsCom
putable, unsigned long long loaded, unsigned long long total) |
| 43 : WebDOMEvent(ProgressEvent::create(type, lengthIsComputable, loaded, total)
) |
| 42 { | 44 { |
| 43 return UserGestureIndicator::processingUserGesture(); | 45 ASSERT(m_private); |
| 46 ASSERT(isProgressEvent()); |
| 44 } | 47 } |
| 45 | 48 |
| 46 bool WebUserGestureIndicator::consumeUserGesture() | 49 v8::Handle<v8::Value> WebDOMProgressEvent::toV8Value() |
| 47 { | 50 { |
| 48 return UserGestureIndicator::consumeUserGesture(); | 51 if (!m_private) |
| 49 } | 52 return v8::Handle<v8::Value>(); |
| 50 | 53 return toV8(m_private, v8::Handle<v8::Object>(), v8::Isolate::GetCurrent()); |
| 51 WebUserGestureToken WebUserGestureIndicator::currentUserGestureToken() | |
| 52 { | |
| 53 return WebUserGestureToken(UserGestureIndicator::currentToken()); | |
| 54 } | 54 } |
| 55 | 55 |
| 56 } // namespace WebKit | 56 } // namespace WebKit |
| OLD | NEW |