OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 #include "public/web/WebConsoleMessage.h" | 196 #include "public/web/WebConsoleMessage.h" |
197 #include "public/web/WebDOMEvent.h" | 197 #include "public/web/WebDOMEvent.h" |
198 #include "public/web/WebDocument.h" | 198 #include "public/web/WebDocument.h" |
199 #include "public/web/WebFindOptions.h" | 199 #include "public/web/WebFindOptions.h" |
200 #include "public/web/WebFormElement.h" | 200 #include "public/web/WebFormElement.h" |
201 #include "public/web/WebFrameClient.h" | 201 #include "public/web/WebFrameClient.h" |
202 #include "public/web/WebFrameOwnerProperties.h" | 202 #include "public/web/WebFrameOwnerProperties.h" |
203 #include "public/web/WebHistoryItem.h" | 203 #include "public/web/WebHistoryItem.h" |
204 #include "public/web/WebIconURL.h" | 204 #include "public/web/WebIconURL.h" |
205 #include "public/web/WebInputElement.h" | 205 #include "public/web/WebInputElement.h" |
| 206 #include "public/web/WebInputMethodController.h" |
206 #include "public/web/WebKit.h" | 207 #include "public/web/WebKit.h" |
207 #include "public/web/WebNode.h" | 208 #include "public/web/WebNode.h" |
208 #include "public/web/WebPerformance.h" | 209 #include "public/web/WebPerformance.h" |
209 #include "public/web/WebPlugin.h" | 210 #include "public/web/WebPlugin.h" |
210 #include "public/web/WebPrintParams.h" | 211 #include "public/web/WebPrintParams.h" |
211 #include "public/web/WebPrintPresetOptions.h" | 212 #include "public/web/WebPrintPresetOptions.h" |
212 #include "public/web/WebRange.h" | 213 #include "public/web/WebRange.h" |
213 #include "public/web/WebScriptSource.h" | 214 #include "public/web/WebScriptSource.h" |
214 #include "public/web/WebSerializedScriptValue.h" | 215 #include "public/web/WebSerializedScriptValue.h" |
215 #include "public/web/WebTreeScopeType.h" | 216 #include "public/web/WebTreeScopeType.h" |
(...skipping 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1562 WebLocalFrameImpl::WebLocalFrameImpl(WebTreeScopeType scope, | 1563 WebLocalFrameImpl::WebLocalFrameImpl(WebTreeScopeType scope, |
1563 WebFrameClient* client) | 1564 WebFrameClient* client) |
1564 : WebLocalFrame(scope), | 1565 : WebLocalFrame(scope), |
1565 m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this)), | 1566 m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this)), |
1566 m_frameWidget(0), | 1567 m_frameWidget(0), |
1567 m_client(client), | 1568 m_client(client), |
1568 m_autofillClient(0), | 1569 m_autofillClient(0), |
1569 m_contentSettingsClient(0), | 1570 m_contentSettingsClient(0), |
1570 m_inputEventsScaleFactorForEmulation(1), | 1571 m_inputEventsScaleFactorForEmulation(1), |
1571 m_webDevToolsFrontend(0), | 1572 m_webDevToolsFrontend(0), |
| 1573 m_inputMethodController(new WebInputMethodControllerImpl(this)), |
1572 m_selfKeepAlive(this) { | 1574 m_selfKeepAlive(this) { |
1573 DCHECK(m_client); | 1575 DCHECK(m_client); |
1574 frameCount++; | 1576 frameCount++; |
1575 } | 1577 } |
1576 | 1578 |
1577 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, | 1579 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, |
1578 WebFrameClient* client) | 1580 WebFrameClient* client) |
1579 : WebLocalFrameImpl(oldWebFrame->inShadowTree() | 1581 : WebLocalFrameImpl(oldWebFrame->inShadowTree() |
1580 ? WebTreeScopeType::Shadow | 1582 ? WebTreeScopeType::Shadow |
1581 : WebTreeScopeType::Document, | 1583 : WebTreeScopeType::Document, |
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2390 } else if (metric == "npnNegotiatedProtocol") { | 2392 } else if (metric == "npnNegotiatedProtocol") { |
2391 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2393 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
2392 } else if (metric == "wasAlternateProtocolAvailable") { | 2394 } else if (metric == "wasAlternateProtocolAvailable") { |
2393 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2395 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
2394 } else if (metric == "connectionInfo") { | 2396 } else if (metric == "connectionInfo") { |
2395 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2397 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
2396 } | 2398 } |
2397 UseCounter::count(frame(), feature); | 2399 UseCounter::count(frame(), feature); |
2398 } | 2400 } |
2399 | 2401 |
| 2402 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { |
| 2403 return m_inputMethodController.get(); |
| 2404 } |
| 2405 |
2400 } // namespace blink | 2406 } // namespace blink |
OLD | NEW |