| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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/WebNode.h" | 199 #include "public/web/WebNode.h" |
| 200 #include "public/web/WebPerformance.h" | 200 #include "public/web/WebPerformance.h" |
| 201 #include "public/web/WebPlugin.h" | 201 #include "public/web/WebPlugin.h" |
| 202 #include "public/web/WebPrintParams.h" | 202 #include "public/web/WebPrintParams.h" |
| 203 #include "public/web/WebPrintPresetOptions.h" | 203 #include "public/web/WebPrintPresetOptions.h" |
| 204 #include "public/web/WebRange.h" | 204 #include "public/web/WebRange.h" |
| 205 #include "public/web/WebScriptSource.h" | 205 #include "public/web/WebScriptSource.h" |
| 206 #include "public/web/WebSerializedScriptValue.h" | 206 #include "public/web/WebSerializedScriptValue.h" |
| 207 #include "public/web/WebTreeScopeType.h" |
| 207 #include "web/AssociatedURLLoader.h" | 208 #include "web/AssociatedURLLoader.h" |
| 208 #include "web/CompositionUnderlineVectorBuilder.h" | 209 #include "web/CompositionUnderlineVectorBuilder.h" |
| 209 #include "web/FindInPageCoordinates.h" | 210 #include "web/FindInPageCoordinates.h" |
| 210 #include "web/GeolocationClientProxy.h" | 211 #include "web/GeolocationClientProxy.h" |
| 211 #include "web/InspectorOverlayImpl.h" | 212 #include "web/InspectorOverlayImpl.h" |
| 212 #include "web/LocalFileSystemClient.h" | 213 #include "web/LocalFileSystemClient.h" |
| 213 #include "web/MIDIClientProxy.h" | 214 #include "web/MIDIClientProxy.h" |
| 214 #include "web/NotificationPermissionClientImpl.h" | 215 #include "web/NotificationPermissionClientImpl.h" |
| 215 #include "web/PageOverlay.h" | 216 #include "web/PageOverlay.h" |
| 216 #include "web/RemoteBridgeFrameOwner.h" | 217 #include "web/RemoteBridgeFrameOwner.h" |
| (...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1579 if (!frame()) | 1580 if (!frame()) |
| 1580 return WebString(); | 1581 return WebString(); |
| 1581 | 1582 |
| 1582 return WebString(frame()->layerTreeAsText(showDebugInfo ? LayerTreeIncludesD
ebugInfo : LayerTreeNormal)); | 1583 return WebString(frame()->layerTreeAsText(showDebugInfo ? LayerTreeIncludesD
ebugInfo : LayerTreeNormal)); |
| 1583 } | 1584 } |
| 1584 | 1585 |
| 1585 // WebLocalFrameImpl public ----------------------------------------------------
----- | 1586 // WebLocalFrameImpl public ----------------------------------------------------
----- |
| 1586 | 1587 |
| 1587 WebLocalFrame* WebLocalFrame::create(WebFrameClient* client) | 1588 WebLocalFrame* WebLocalFrame::create(WebFrameClient* client) |
| 1588 { | 1589 { |
| 1589 return WebLocalFrameImpl::create(client); | 1590 return WebLocalFrame::create(WebTreeScopeType::Document, client); |
| 1590 } | 1591 } |
| 1591 | 1592 |
| 1592 WebLocalFrameImpl* WebLocalFrameImpl::create(WebFrameClient* client) | 1593 WebLocalFrame* WebLocalFrame::create(WebTreeScopeType scope, WebFrameClient* cli
ent) |
| 1593 { | 1594 { |
| 1594 WebLocalFrameImpl* frame = new WebLocalFrameImpl(client); | 1595 return WebLocalFrameImpl::create(scope, client); |
| 1596 } |
| 1597 |
| 1598 WebLocalFrameImpl* WebLocalFrameImpl::create(WebTreeScopeType scope, WebFrameCli
ent* client) |
| 1599 { |
| 1600 WebLocalFrameImpl* frame = new WebLocalFrameImpl(scope, client); |
| 1595 #if ENABLE(OILPAN) | 1601 #if ENABLE(OILPAN) |
| 1596 return frame; | 1602 return frame; |
| 1597 #else | 1603 #else |
| 1598 return adoptRef(frame).leakRef(); | 1604 return adoptRef(frame).leakRef(); |
| 1599 #endif | 1605 #endif |
| 1600 } | 1606 } |
| 1601 | 1607 |
| 1602 WebLocalFrameImpl::WebLocalFrameImpl(WebFrameClient* client) | 1608 WebLocalFrameImpl::WebLocalFrameImpl(WebTreeScopeType scope, WebFrameClient* cli
ent) |
| 1603 : m_frameLoaderClientImpl(this) | 1609 : WebLocalFrame(scope) |
| 1610 , m_frameLoaderClientImpl(this) |
| 1604 , m_frameWidget(0) | 1611 , m_frameWidget(0) |
| 1605 , m_client(client) | 1612 , m_client(client) |
| 1606 , m_autofillClient(0) | 1613 , m_autofillClient(0) |
| 1607 , m_contentSettingsClient(0) | 1614 , m_contentSettingsClient(0) |
| 1608 , m_inputEventsScaleFactorForEmulation(1) | 1615 , m_inputEventsScaleFactorForEmulation(1) |
| 1609 , m_userMediaClientImpl(this) | 1616 , m_userMediaClientImpl(this) |
| 1610 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g
eolocationClient() : 0)) | 1617 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g
eolocationClient() : 0)) |
| 1611 , m_webDevToolsFrontend(0) | 1618 , m_webDevToolsFrontend(0) |
| 1612 #if ENABLE(OILPAN) | 1619 #if ENABLE(OILPAN) |
| 1613 , m_selfKeepAlive(this) | 1620 , m_selfKeepAlive(this) |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2106 { | 2113 { |
| 2107 m_frameWidget = frameWidget; | 2114 m_frameWidget = frameWidget; |
| 2108 } | 2115 } |
| 2109 | 2116 |
| 2110 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const | 2117 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const |
| 2111 { | 2118 { |
| 2112 return m_frameWidget; | 2119 return m_frameWidget; |
| 2113 } | 2120 } |
| 2114 | 2121 |
| 2115 } // namespace blink | 2122 } // namespace blink |
| OLD | NEW |