| 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 #include "core/page/Performance.h" | 166 #include "core/page/Performance.h" |
| 167 #include "core/page/PrintContext.h" | 167 #include "core/page/PrintContext.h" |
| 168 #include "core/page/Settings.h" | 168 #include "core/page/Settings.h" |
| 169 #include "core/platform/AsyncFileSystem.h" | 169 #include "core/platform/AsyncFileSystem.h" |
| 170 #include "core/platform/ScrollTypes.h" | 170 #include "core/platform/ScrollTypes.h" |
| 171 #include "core/platform/ScrollbarTheme.h" | 171 #include "core/platform/ScrollbarTheme.h" |
| 172 #include "core/platform/chromium/ClipboardUtilitiesChromium.h" | 172 #include "core/platform/chromium/ClipboardUtilitiesChromium.h" |
| 173 #include "core/platform/chromium/TraceEvent.h" | 173 #include "core/platform/chromium/TraceEvent.h" |
| 174 #include "core/platform/graphics/FontCache.h" | 174 #include "core/platform/graphics/FontCache.h" |
| 175 #include "core/platform/graphics/GraphicsContext.h" | 175 #include "core/platform/graphics/GraphicsContext.h" |
| 176 #include "core/platform/graphics/GraphicsLayerClient.h" |
| 176 #include "core/platform/graphics/skia/SkiaUtils.h" | 177 #include "core/platform/graphics/skia/SkiaUtils.h" |
| 177 #include "core/platform/network/ResourceHandle.h" | 178 #include "core/platform/network/ResourceHandle.h" |
| 178 #include "core/platform/network/ResourceRequest.h" | 179 #include "core/platform/network/ResourceRequest.h" |
| 179 #include "core/rendering/HitTestResult.h" | 180 #include "core/rendering/HitTestResult.h" |
| 180 #include "core/rendering/RenderBox.h" | 181 #include "core/rendering/RenderBox.h" |
| 181 #include "core/rendering/RenderFrame.h" | 182 #include "core/rendering/RenderFrame.h" |
| 182 #include "core/rendering/RenderLayer.h" | 183 #include "core/rendering/RenderLayer.h" |
| 183 #include "core/rendering/RenderObject.h" | 184 #include "core/rendering/RenderObject.h" |
| 184 #include "core/rendering/RenderTreeAsText.h" | 185 #include "core/rendering/RenderTreeAsText.h" |
| 185 #include "core/rendering/RenderView.h" | 186 #include "core/rendering/RenderView.h" |
| (...skipping 1914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2100 if (!frame()) | 2101 if (!frame()) |
| 2101 return false; | 2102 return false; |
| 2102 return frame()->editor()->selectionStartHasMarkerFor(DocumentMarker::Spellin
g, from, length); | 2103 return frame()->editor()->selectionStartHasMarkerFor(DocumentMarker::Spellin
g, from, length); |
| 2103 } | 2104 } |
| 2104 | 2105 |
| 2105 WebString WebFrameImpl::layerTreeAsText(bool showDebugInfo) const | 2106 WebString WebFrameImpl::layerTreeAsText(bool showDebugInfo) const |
| 2106 { | 2107 { |
| 2107 if (!frame()) | 2108 if (!frame()) |
| 2108 return WebString(); | 2109 return WebString(); |
| 2109 | 2110 |
| 2110 LayerTreeFlags flags = showDebugInfo ? LayerTreeFlagsIncludeDebugInfo : 0; | 2111 return WebString(frame()->layerTreeAsText(showDebugInfo ? LayerTreeIncludesD
ebugInfo : LayerTreeNormal)); |
| 2111 return WebString(frame()->layerTreeAsText(flags)); | |
| 2112 } | 2112 } |
| 2113 | 2113 |
| 2114 // WebFrameImpl public --------------------------------------------------------- | 2114 // WebFrameImpl public --------------------------------------------------------- |
| 2115 | 2115 |
| 2116 PassRefPtr<WebFrameImpl> WebFrameImpl::create(WebFrameClient* client) | 2116 PassRefPtr<WebFrameImpl> WebFrameImpl::create(WebFrameClient* client) |
| 2117 { | 2117 { |
| 2118 return adoptRef(new WebFrameImpl(client)); | 2118 return adoptRef(new WebFrameImpl(client)); |
| 2119 } | 2119 } |
| 2120 | 2120 |
| 2121 WebFrameImpl::WebFrameImpl(WebFrameClient* client) | 2121 WebFrameImpl::WebFrameImpl(WebFrameClient* client) |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2504 | 2504 |
| 2505 // There is a possibility that the frame being detached was the only | 2505 // There is a possibility that the frame being detached was the only |
| 2506 // pending one. We need to make sure final replies can be sent. | 2506 // pending one. We need to make sure final replies can be sent. |
| 2507 flushCurrentScopingEffort(m_findRequestIdentifier); | 2507 flushCurrentScopingEffort(m_findRequestIdentifier); |
| 2508 | 2508 |
| 2509 cancelPendingScopingEffort(); | 2509 cancelPendingScopingEffort(); |
| 2510 } | 2510 } |
| 2511 } | 2511 } |
| 2512 | 2512 |
| 2513 } // namespace WebKit | 2513 } // namespace WebKit |
| OLD | NEW |