| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 769 ASSERT_WITH_SECURITY_IMPLICATION(0 <= dismissal && dismissal < static_cast<i
nt>(arraysize(kDismissals))); | 769 ASSERT_WITH_SECURITY_IMPLICATION(0 <= dismissal && dismissal < static_cast<i
nt>(arraysize(kDismissals))); |
| 770 | 770 |
| 771 blink::Platform::current()->histogramEnumeration("Renderer.ModalDialogsDurin
gPageDismissal", dismissal * arraysize(kDialogs) + dialog, arraysize(kDialogs) *
arraysize(kDismissals)); | 771 blink::Platform::current()->histogramEnumeration("Renderer.ModalDialogsDurin
gPageDismissal", dismissal * arraysize(kDialogs) + dialog, arraysize(kDialogs) *
arraysize(kDismissals)); |
| 772 | 772 |
| 773 String message = String("Blocked ") + kDialogs[dialog] + "('" + dialogMessag
e + "') during " + kDismissals[dismissal] + "."; | 773 String message = String("Blocked ") + kDialogs[dialog] + "('" + dialogMessag
e + "') during " + kDismissals[dismissal] + "."; |
| 774 m_webView->mainFrame()->addMessageToConsole(WebConsoleMessage(WebConsoleMess
age::LevelError, message)); | 774 m_webView->mainFrame()->addMessageToConsole(WebConsoleMessage(WebConsoleMess
age::LevelError, message)); |
| 775 | 775 |
| 776 return false; | 776 return false; |
| 777 } | 777 } |
| 778 | 778 |
| 779 void ChromeClientImpl::numWheelEventHandlersChanged(unsigned numberOfWheelHandle
rs) | |
| 780 { | |
| 781 m_webView->numberOfWheelEventHandlersChanged(numberOfWheelHandlers); | |
| 782 } | |
| 783 | |
| 784 void ChromeClientImpl::needTouchEvents(bool needsTouchEvents) | 779 void ChromeClientImpl::needTouchEvents(bool needsTouchEvents) |
| 785 { | 780 { |
| 786 m_webView->hasTouchEventHandlers(needsTouchEvents); | 781 m_webView->hasTouchEventHandlers(needsTouchEvents); |
| 787 } | 782 } |
| 788 | 783 |
| 789 void ChromeClientImpl::setTouchAction(TouchAction touchAction) | 784 void ChromeClientImpl::setTouchAction(TouchAction touchAction) |
| 790 { | 785 { |
| 791 if (WebViewClient* client = m_webView->client()) { | 786 if (WebViewClient* client = m_webView->client()) { |
| 792 WebTouchAction webTouchAction = static_cast<WebTouchAction>(touchAction)
; | 787 WebTouchAction webTouchAction = static_cast<WebTouchAction>(touchAction)
; |
| 793 client->setTouchAction(webTouchAction); | 788 client->setTouchAction(webTouchAction); |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 908 { | 903 { |
| 909 return static_cast<NavigatorContentUtilsClient::CustomHandlersState>(m_webVi
ew->client()->isProtocolHandlerRegistered(scheme, baseURL, url)); | 904 return static_cast<NavigatorContentUtilsClient::CustomHandlersState>(m_webVi
ew->client()->isProtocolHandlerRegistered(scheme, baseURL, url)); |
| 910 } | 905 } |
| 911 | 906 |
| 912 void NavigatorContentUtilsClientImpl::unregisterProtocolHandler(const String& sc
heme, const WebCore::KURL& baseURL, const WebCore::KURL& url) | 907 void NavigatorContentUtilsClientImpl::unregisterProtocolHandler(const String& sc
heme, const WebCore::KURL& baseURL, const WebCore::KURL& url) |
| 913 { | 908 { |
| 914 m_webView->client()->unregisterProtocolHandler(scheme, baseURL, url); | 909 m_webView->client()->unregisterProtocolHandler(scheme, baseURL, url); |
| 915 } | 910 } |
| 916 | 911 |
| 917 } // namespace blink | 912 } // namespace blink |
| OLD | NEW |