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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 #include "web/ExternalDateTimeChooser.h" | 96 #include "web/ExternalDateTimeChooser.h" |
97 #include "web/ExternalPopupMenu.h" | 97 #include "web/ExternalPopupMenu.h" |
98 #include "web/PopupMenuImpl.h" | 98 #include "web/PopupMenuImpl.h" |
99 #include "web/WebFileChooserCompletionImpl.h" | 99 #include "web/WebFileChooserCompletionImpl.h" |
100 #include "web/WebFrameWidgetImpl.h" | 100 #include "web/WebFrameWidgetImpl.h" |
101 #include "web/WebInputEventConversion.h" | 101 #include "web/WebInputEventConversion.h" |
102 #include "web/WebLocalFrameImpl.h" | 102 #include "web/WebLocalFrameImpl.h" |
103 #include "web/WebPluginContainerImpl.h" | 103 #include "web/WebPluginContainerImpl.h" |
104 #include "web/WebSettingsImpl.h" | 104 #include "web/WebSettingsImpl.h" |
105 #include "web/WebViewImpl.h" | 105 #include "web/WebViewImpl.h" |
| 106 #include "wtf/PtrUtil.h" |
106 #include "wtf/text/CString.h" | 107 #include "wtf/text/CString.h" |
107 #include "wtf/text/CharacterNames.h" | 108 #include "wtf/text/CharacterNames.h" |
108 #include "wtf/text/StringBuilder.h" | 109 #include "wtf/text/StringBuilder.h" |
109 #include "wtf/text/StringConcatenate.h" | 110 #include "wtf/text/StringConcatenate.h" |
| 111 #include <memory> |
110 | 112 |
111 namespace blink { | 113 namespace blink { |
112 | 114 |
113 namespace { | 115 namespace { |
114 | 116 |
115 const char* dialogTypeToString(ChromeClient::DialogType dialogType) | 117 const char* dialogTypeToString(ChromeClient::DialogType dialogType) |
116 { | 118 { |
117 switch (dialogType) { | 119 switch (dialogType) { |
118 case ChromeClient::AlertDialog: | 120 case ChromeClient::AlertDialog: |
119 return "alert"; | 121 return "alert"; |
(...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1106 { | 1108 { |
1107 return m_webView->elasticOverscroll(); | 1109 return m_webView->elasticOverscroll(); |
1108 } | 1110 } |
1109 | 1111 |
1110 void ChromeClientImpl::didObserveNonGetFetchFromScript() const | 1112 void ChromeClientImpl::didObserveNonGetFetchFromScript() const |
1111 { | 1113 { |
1112 if (m_webView->pageImportanceSignals()) | 1114 if (m_webView->pageImportanceSignals()) |
1113 m_webView->pageImportanceSignals()->setIssuedNonGetFetchFromScript(); | 1115 m_webView->pageImportanceSignals()->setIssuedNonGetFetchFromScript(); |
1114 } | 1116 } |
1115 | 1117 |
1116 PassOwnPtr<WebFrameScheduler> ChromeClientImpl::createFrameScheduler(BlameContex
t* blameContext) | 1118 std::unique_ptr<WebFrameScheduler> ChromeClientImpl::createFrameScheduler(BlameC
ontext* blameContext) |
1117 { | 1119 { |
1118 return adoptPtr(m_webView->scheduler()->createFrameScheduler(blameContext).r
elease()); | 1120 return wrapUnique(m_webView->scheduler()->createFrameScheduler(blameContext)
.release()); |
1119 } | 1121 } |
1120 | 1122 |
1121 double ChromeClientImpl::lastFrameTimeMonotonic() const | 1123 double ChromeClientImpl::lastFrameTimeMonotonic() const |
1122 { | 1124 { |
1123 return m_webView->lastFrameTimeMonotonic(); | 1125 return m_webView->lastFrameTimeMonotonic(); |
1124 } | 1126 } |
1125 | 1127 |
1126 } // namespace blink | 1128 } // namespace blink |
OLD | NEW |