| 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 #include "web/MIDIClientProxy.h" | 207 #include "web/MIDIClientProxy.h" |
| 208 #include "web/NotificationPermissionClientImpl.h" | 208 #include "web/NotificationPermissionClientImpl.h" |
| 209 #include "web/PageOverlay.h" | 209 #include "web/PageOverlay.h" |
| 210 #include "web/RemoteBridgeFrameOwner.h" | 210 #include "web/RemoteBridgeFrameOwner.h" |
| 211 #include "web/SharedWorkerRepositoryClientImpl.h" | 211 #include "web/SharedWorkerRepositoryClientImpl.h" |
| 212 #include "web/SuspendableScriptExecutor.h" | 212 #include "web/SuspendableScriptExecutor.h" |
| 213 #include "web/SuspendableTaskRunner.h" | 213 #include "web/SuspendableTaskRunner.h" |
| 214 #include "web/TextFinder.h" | 214 #include "web/TextFinder.h" |
| 215 #include "web/WebDataSourceImpl.h" | 215 #include "web/WebDataSourceImpl.h" |
| 216 #include "web/WebDevToolsAgentImpl.h" | 216 #include "web/WebDevToolsAgentImpl.h" |
| 217 #include "web/WebDevToolsFrontendImpl.h" |
| 217 #include "web/WebFrameWidgetImpl.h" | 218 #include "web/WebFrameWidgetImpl.h" |
| 218 #include "web/WebPluginContainerImpl.h" | 219 #include "web/WebPluginContainerImpl.h" |
| 219 #include "web/WebRemoteFrameImpl.h" | 220 #include "web/WebRemoteFrameImpl.h" |
| 220 #include "web/WebViewImpl.h" | 221 #include "web/WebViewImpl.h" |
| 221 #include "wtf/CurrentTime.h" | 222 #include "wtf/CurrentTime.h" |
| 222 #include "wtf/HashMap.h" | 223 #include "wtf/HashMap.h" |
| 223 #include <algorithm> | 224 #include <algorithm> |
| 224 | 225 |
| 225 namespace blink { | 226 namespace blink { |
| 226 | 227 |
| (...skipping 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1552 | 1553 |
| 1553 WebLocalFrameImpl::WebLocalFrameImpl(WebFrameClient* client) | 1554 WebLocalFrameImpl::WebLocalFrameImpl(WebFrameClient* client) |
| 1554 : m_frameLoaderClientImpl(this) | 1555 : m_frameLoaderClientImpl(this) |
| 1555 , m_frameWidget(0) | 1556 , m_frameWidget(0) |
| 1556 , m_client(client) | 1557 , m_client(client) |
| 1557 , m_autofillClient(0) | 1558 , m_autofillClient(0) |
| 1558 , m_contentSettingsClient(0) | 1559 , m_contentSettingsClient(0) |
| 1559 , m_inputEventsScaleFactorForEmulation(1) | 1560 , m_inputEventsScaleFactorForEmulation(1) |
| 1560 , m_userMediaClientImpl(this) | 1561 , m_userMediaClientImpl(this) |
| 1561 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g
eolocationClient() : 0)) | 1562 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g
eolocationClient() : 0)) |
| 1562 , m_webDevToolsFrontend(0) | 1563 , m_webDevToolsFrontend(nullptr) |
| 1563 #if ENABLE(OILPAN) | 1564 #if ENABLE(OILPAN) |
| 1564 , m_selfKeepAlive(this) | 1565 , m_selfKeepAlive(this) |
| 1565 #endif | 1566 #endif |
| 1566 { | 1567 { |
| 1567 Platform::current()->incrementStatsCounter(webFrameActiveCount); | 1568 Platform::current()->incrementStatsCounter(webFrameActiveCount); |
| 1568 frameCount++; | 1569 frameCount++; |
| 1569 } | 1570 } |
| 1570 | 1571 |
| 1571 WebLocalFrameImpl::~WebLocalFrameImpl() | 1572 WebLocalFrameImpl::~WebLocalFrameImpl() |
| 1572 { | 1573 { |
| 1573 Platform::current()->decrementStatsCounter(webFrameActiveCount); | 1574 Platform::current()->decrementStatsCounter(webFrameActiveCount); |
| 1574 frameCount--; | 1575 frameCount--; |
| 1575 | 1576 |
| 1576 #if !ENABLE(OILPAN) | 1577 #if !ENABLE(OILPAN) |
| 1577 cancelPendingScopingEffort(); | 1578 cancelPendingScopingEffort(); |
| 1578 #endif | 1579 #endif |
| 1579 } | 1580 } |
| 1580 | 1581 |
| 1581 #if ENABLE(OILPAN) | 1582 #if ENABLE(OILPAN) |
| 1582 DEFINE_TRACE(WebLocalFrameImpl) | 1583 DEFINE_TRACE(WebLocalFrameImpl) |
| 1583 { | 1584 { |
| 1584 visitor->trace(m_frame); | 1585 visitor->trace(m_frame); |
| 1585 visitor->trace(m_textFinder); | 1586 visitor->trace(m_textFinder); |
| 1586 visitor->trace(m_printContext); | 1587 visitor->trace(m_printContext); |
| 1587 visitor->trace(m_geolocationClientProxy); | 1588 visitor->trace(m_geolocationClientProxy); |
| 1589 visitor->trace(m_webDevToolsFrontend); |
| 1588 visitor->template registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>(
this); | 1590 visitor->template registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>(
this); |
| 1589 WebFrame::traceFrames(visitor, this); | 1591 WebFrame::traceFrames(visitor, this); |
| 1590 } | 1592 } |
| 1591 #endif | 1593 #endif |
| 1592 | 1594 |
| 1593 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) | 1595 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) |
| 1594 { | 1596 { |
| 1595 m_frame = frame; | 1597 m_frame = frame; |
| 1596 | 1598 |
| 1597 // FIXME: we shouldn't add overhead to every frame by registering these obje
cts when they're not used. | 1599 // FIXME: we shouldn't add overhead to every frame by registering these obje
cts when they're not used. |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2027 { | 2029 { |
| 2028 m_frameWidget = frameWidget; | 2030 m_frameWidget = frameWidget; |
| 2029 } | 2031 } |
| 2030 | 2032 |
| 2031 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const | 2033 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const |
| 2032 { | 2034 { |
| 2033 return m_frameWidget; | 2035 return m_frameWidget; |
| 2034 } | 2036 } |
| 2035 | 2037 |
| 2036 } // namespace blink | 2038 } // namespace blink |
| OLD | NEW |