| 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 #include "public/web/WebConsoleMessage.h" | 189 #include "public/web/WebConsoleMessage.h" |
| 190 #include "public/web/WebDOMEvent.h" | 190 #include "public/web/WebDOMEvent.h" |
| 191 #include "public/web/WebDocument.h" | 191 #include "public/web/WebDocument.h" |
| 192 #include "public/web/WebFindOptions.h" | 192 #include "public/web/WebFindOptions.h" |
| 193 #include "public/web/WebFormElement.h" | 193 #include "public/web/WebFormElement.h" |
| 194 #include "public/web/WebFrameClient.h" | 194 #include "public/web/WebFrameClient.h" |
| 195 #include "public/web/WebFrameOwnerProperties.h" | 195 #include "public/web/WebFrameOwnerProperties.h" |
| 196 #include "public/web/WebHistoryItem.h" | 196 #include "public/web/WebHistoryItem.h" |
| 197 #include "public/web/WebIconURL.h" | 197 #include "public/web/WebIconURL.h" |
| 198 #include "public/web/WebInputElement.h" | 198 #include "public/web/WebInputElement.h" |
| 199 #include "public/web/WebInputMethodController.h" |
| 199 #include "public/web/WebKit.h" | 200 #include "public/web/WebKit.h" |
| 200 #include "public/web/WebNode.h" | 201 #include "public/web/WebNode.h" |
| 201 #include "public/web/WebPerformance.h" | 202 #include "public/web/WebPerformance.h" |
| 202 #include "public/web/WebPlugin.h" | 203 #include "public/web/WebPlugin.h" |
| 203 #include "public/web/WebPrintParams.h" | 204 #include "public/web/WebPrintParams.h" |
| 204 #include "public/web/WebPrintPresetOptions.h" | 205 #include "public/web/WebPrintPresetOptions.h" |
| 205 #include "public/web/WebRange.h" | 206 #include "public/web/WebRange.h" |
| 206 #include "public/web/WebScriptSource.h" | 207 #include "public/web/WebScriptSource.h" |
| 207 #include "public/web/WebSerializedScriptValue.h" | 208 #include "public/web/WebSerializedScriptValue.h" |
| 208 #include "public/web/WebTreeScopeType.h" | 209 #include "public/web/WebTreeScopeType.h" |
| (...skipping 1250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1459 | 1460 |
| 1460 WebLocalFrameImpl::WebLocalFrameImpl(WebTreeScopeType scope, WebFrameClient* cli
ent) | 1461 WebLocalFrameImpl::WebLocalFrameImpl(WebTreeScopeType scope, WebFrameClient* cli
ent) |
| 1461 : WebLocalFrame(scope) | 1462 : WebLocalFrame(scope) |
| 1462 , m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this)) | 1463 , m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this)) |
| 1463 , m_frameWidget(0) | 1464 , m_frameWidget(0) |
| 1464 , m_client(client) | 1465 , m_client(client) |
| 1465 , m_autofillClient(0) | 1466 , m_autofillClient(0) |
| 1466 , m_contentSettingsClient(0) | 1467 , m_contentSettingsClient(0) |
| 1467 , m_inputEventsScaleFactorForEmulation(1) | 1468 , m_inputEventsScaleFactorForEmulation(1) |
| 1468 , m_webDevToolsFrontend(0) | 1469 , m_webDevToolsFrontend(0) |
| 1470 , m_inputMethodController(new WebInputMethodControllerImpl(this)) |
| 1469 , m_selfKeepAlive(this) | 1471 , m_selfKeepAlive(this) |
| 1470 { | 1472 { |
| 1471 frameCount++; | 1473 frameCount++; |
| 1472 } | 1474 } |
| 1473 | 1475 |
| 1474 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, WebFrameClient
* client) | 1476 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, WebFrameClient
* client) |
| 1475 : WebLocalFrameImpl(oldWebFrame->inShadowTree() ? WebTreeScopeType::Shadow :
WebTreeScopeType::Document, client) | 1477 : WebLocalFrameImpl(oldWebFrame->inShadowTree() ? WebTreeScopeType::Shadow :
WebTreeScopeType::Document, client) |
| 1476 { | 1478 { |
| 1477 } | 1479 } |
| 1478 | 1480 |
| (...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2234 } else if (metric == "npnNegotiatedProtocol") { | 2236 } else if (metric == "npnNegotiatedProtocol") { |
| 2235 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2237 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
| 2236 } else if (metric == "wasAlternateProtocolAvailable") { | 2238 } else if (metric == "wasAlternateProtocolAvailable") { |
| 2237 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2239 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
| 2238 } else if (metric == "connectionInfo") { | 2240 } else if (metric == "connectionInfo") { |
| 2239 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2241 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2240 } | 2242 } |
| 2241 UseCounter::count(frame(), feature); | 2243 UseCounter::count(frame(), feature); |
| 2242 } | 2244 } |
| 2243 | 2245 |
| 2246 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const |
| 2247 { |
| 2248 return m_inputMethodController.get(); |
| 2249 } |
| 2250 |
| 2244 } // namespace blink | 2251 } // namespace blink |
| OLD | NEW |