| 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 #include "core/rendering/RenderBox.h" | 155 #include "core/rendering/RenderBox.h" |
| 156 #include "core/rendering/RenderFrame.h" | 156 #include "core/rendering/RenderFrame.h" |
| 157 #include "core/rendering/RenderLayer.h" | 157 #include "core/rendering/RenderLayer.h" |
| 158 #include "core/rendering/RenderObject.h" | 158 #include "core/rendering/RenderObject.h" |
| 159 #include "core/rendering/RenderTreeAsText.h" | 159 #include "core/rendering/RenderTreeAsText.h" |
| 160 #include "core/rendering/RenderView.h" | 160 #include "core/rendering/RenderView.h" |
| 161 #include "core/rendering/style/StyleInheritedData.h" | 161 #include "core/rendering/style/StyleInheritedData.h" |
| 162 #include "core/timing/Performance.h" | 162 #include "core/timing/Performance.h" |
| 163 #include "core/xml/DocumentXPathEvaluator.h" | 163 #include "core/xml/DocumentXPathEvaluator.h" |
| 164 #include "core/xml/XPathResult.h" | 164 #include "core/xml/XPathResult.h" |
| 165 #include "platform/TraceEvent.h" | |
| 166 #include "platform/UserGestureIndicator.h" | 165 #include "platform/UserGestureIndicator.h" |
| 167 #include "platform/clipboard/ClipboardUtilities.h" | 166 #include "platform/clipboard/ClipboardUtilities.h" |
| 168 #include "platform/fonts/FontCache.h" | 167 #include "platform/fonts/FontCache.h" |
| 169 #include "platform/graphics/GraphicsContext.h" | 168 #include "platform/graphics/GraphicsContext.h" |
| 170 #include "platform/graphics/GraphicsLayerClient.h" | 169 #include "platform/graphics/GraphicsLayerClient.h" |
| 171 #include "platform/graphics/skia/SkiaUtils.h" | 170 #include "platform/graphics/skia/SkiaUtils.h" |
| 172 #include "platform/network/ResourceRequest.h" | 171 #include "platform/network/ResourceRequest.h" |
| 173 #include "platform/scroll/ScrollbarTheme.h" | 172 #include "platform/scroll/ScrollbarTheme.h" |
| 174 #include "platform/scroll/ScrollTypes.h" | 173 #include "platform/scroll/ScrollTypes.h" |
| 175 #include "platform/weborigin/KURL.h" | 174 #include "platform/weborigin/KURL.h" |
| 176 #include "platform/weborigin/SchemeRegistry.h" | 175 #include "platform/weborigin/SchemeRegistry.h" |
| 177 #include "platform/weborigin/SecurityPolicy.h" | 176 #include "platform/weborigin/SecurityPolicy.h" |
| 178 #include "public/platform/Platform.h" | 177 #include "public/platform/Platform.h" |
| 179 #include "public/platform/WebFloatPoint.h" | 178 #include "public/platform/WebFloatPoint.h" |
| 180 #include "public/platform/WebFloatRect.h" | 179 #include "public/platform/WebFloatRect.h" |
| 181 #include "public/platform/WebLayer.h" | 180 #include "public/platform/WebLayer.h" |
| 182 #include "public/platform/WebPoint.h" | 181 #include "public/platform/WebPoint.h" |
| 183 #include "public/platform/WebRect.h" | 182 #include "public/platform/WebRect.h" |
| 184 #include "public/platform/WebSize.h" | 183 #include "public/platform/WebSize.h" |
| 185 #include "public/platform/WebURLError.h" | 184 #include "public/platform/WebURLError.h" |
| 186 #include "public/platform/WebVector.h" | 185 #include "public/platform/WebVector.h" |
| 187 #include "wtf/CurrentTime.h" | 186 #include "wtf/CurrentTime.h" |
| 188 #include "wtf/HashMap.h" | 187 #include "wtf/HashMap.h" |
| 188 #include "wtf/TraceEvent.h" |
| 189 | 189 |
| 190 using namespace WebCore; | 190 using namespace WebCore; |
| 191 | 191 |
| 192 namespace blink { | 192 namespace blink { |
| 193 | 193 |
| 194 static int frameCount = 0; | 194 static int frameCount = 0; |
| 195 | 195 |
| 196 // Key for a StatsCounter tracking how many WebFrames are active. | 196 // Key for a StatsCounter tracking how many WebFrames are active. |
| 197 static const char webFrameActiveCount[] = "WebFrameActiveCount"; | 197 static const char webFrameActiveCount[] = "WebFrameActiveCount"; |
| 198 | 198 |
| (...skipping 2283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2482 | 2482 |
| 2483 // There is a possibility that the frame being detached was the only | 2483 // There is a possibility that the frame being detached was the only |
| 2484 // pending one. We need to make sure final replies can be sent. | 2484 // pending one. We need to make sure final replies can be sent. |
| 2485 flushCurrentScopingEffort(m_findRequestIdentifier); | 2485 flushCurrentScopingEffort(m_findRequestIdentifier); |
| 2486 | 2486 |
| 2487 cancelPendingScopingEffort(); | 2487 cancelPendingScopingEffort(); |
| 2488 } | 2488 } |
| 2489 } | 2489 } |
| 2490 | 2490 |
| 2491 } // namespace blink | 2491 } // namespace blink |
| OLD | NEW |