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 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1459 | 1459 |
1460 WebLocalFrameImpl::WebLocalFrameImpl(WebTreeScopeType scope, WebFrameClient* cli
ent) | 1460 WebLocalFrameImpl::WebLocalFrameImpl(WebTreeScopeType scope, WebFrameClient* cli
ent) |
1461 : WebLocalFrame(scope) | 1461 : WebLocalFrame(scope) |
1462 , m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this)) | 1462 , m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this)) |
1463 , m_frameWidget(0) | 1463 , m_frameWidget(0) |
1464 , m_client(client) | 1464 , m_client(client) |
1465 , m_autofillClient(0) | 1465 , m_autofillClient(0) |
1466 , m_contentSettingsClient(0) | 1466 , m_contentSettingsClient(0) |
1467 , m_inputEventsScaleFactorForEmulation(1) | 1467 , m_inputEventsScaleFactorForEmulation(1) |
1468 , m_webDevToolsFrontend(0) | 1468 , m_webDevToolsFrontend(0) |
| 1469 , m_inputMethodController(new WebInputMethodControllerImpl(this)) |
1469 , m_selfKeepAlive(this) | 1470 , m_selfKeepAlive(this) |
1470 { | 1471 { |
1471 frameCount++; | 1472 frameCount++; |
1472 } | 1473 } |
1473 | 1474 |
1474 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, WebFrameClient
* client) | 1475 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, WebFrameClient
* client) |
1475 : WebLocalFrameImpl(oldWebFrame->inShadowTree() ? WebTreeScopeType::Shadow :
WebTreeScopeType::Document, client) | 1476 : WebLocalFrameImpl(oldWebFrame->inShadowTree() ? WebTreeScopeType::Shadow :
WebTreeScopeType::Document, client) |
1476 { | 1477 { |
1477 } | 1478 } |
1478 | 1479 |
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2234 } else if (metric == "npnNegotiatedProtocol") { | 2235 } else if (metric == "npnNegotiatedProtocol") { |
2235 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2236 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
2236 } else if (metric == "wasAlternateProtocolAvailable") { | 2237 } else if (metric == "wasAlternateProtocolAvailable") { |
2237 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2238 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
2238 } else if (metric == "connectionInfo") { | 2239 } else if (metric == "connectionInfo") { |
2239 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2240 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
2240 } | 2241 } |
2241 UseCounter::count(frame(), feature); | 2242 UseCounter::count(frame(), feature); |
2242 } | 2243 } |
2243 | 2244 |
| 2245 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() |
| 2246 { |
| 2247 return m_inputMethodController.get(); |
| 2248 } |
| 2249 |
2244 } // namespace blink | 2250 } // namespace blink |
OLD | NEW |