| 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 #include "core/loader/NavigationScheduler.h" | 151 #include "core/loader/NavigationScheduler.h" |
| 152 #include "core/page/FocusController.h" | 152 #include "core/page/FocusController.h" |
| 153 #include "core/page/FrameTree.h" | 153 #include "core/page/FrameTree.h" |
| 154 #include "core/page/Page.h" | 154 #include "core/page/Page.h" |
| 155 #include "core/page/PrintContext.h" | 155 #include "core/page/PrintContext.h" |
| 156 #include "core/paint/PaintLayer.h" | 156 #include "core/paint/PaintLayer.h" |
| 157 #include "core/paint/TransformRecorder.h" | 157 #include "core/paint/TransformRecorder.h" |
| 158 #include "core/style/StyleInheritedData.h" | 158 #include "core/style/StyleInheritedData.h" |
| 159 #include "core/timing/DOMWindowPerformance.h" | 159 #include "core/timing/DOMWindowPerformance.h" |
| 160 #include "core/timing/Performance.h" | 160 #include "core/timing/Performance.h" |
| 161 #include "modules/app_banner/AppBannerController.h" | |
| 162 #include "modules/installation/InstallationServiceImpl.h" | |
| 163 #include "platform/ScriptForbiddenScope.h" | 161 #include "platform/ScriptForbiddenScope.h" |
| 164 #include "platform/UserGestureIndicator.h" | 162 #include "platform/UserGestureIndicator.h" |
| 165 #include "platform/WebFrameScheduler.h" | 163 #include "platform/WebFrameScheduler.h" |
| 166 #include "platform/clipboard/ClipboardUtilities.h" | 164 #include "platform/clipboard/ClipboardUtilities.h" |
| 167 #include "platform/fonts/FontCache.h" | 165 #include "platform/fonts/FontCache.h" |
| 168 #include "platform/graphics/GraphicsContext.h" | 166 #include "platform/graphics/GraphicsContext.h" |
| 169 #include "platform/graphics/GraphicsLayerClient.h" | 167 #include "platform/graphics/GraphicsLayerClient.h" |
| 170 #include "platform/graphics/paint/ClipRecorder.h" | 168 #include "platform/graphics/paint/ClipRecorder.h" |
| 171 #include "platform/graphics/paint/DisplayItemCacheSkipper.h" | 169 #include "platform/graphics/paint/DisplayItemCacheSkipper.h" |
| 172 #include "platform/graphics/paint/DrawingRecorder.h" | 170 #include "platform/graphics/paint/DrawingRecorder.h" |
| 173 #include "platform/graphics/paint/PaintRecordBuilder.h" | 171 #include "platform/graphics/paint/PaintRecordBuilder.h" |
| 174 #include "platform/graphics/skia/SkiaUtils.h" | 172 #include "platform/graphics/skia/SkiaUtils.h" |
| 175 #include "platform/heap/Handle.h" | 173 #include "platform/heap/Handle.h" |
| 176 #include "platform/instrumentation/tracing/TraceEvent.h" | 174 #include "platform/instrumentation/tracing/TraceEvent.h" |
| 177 #include "platform/loader/fetch/ResourceFetcher.h" | 175 #include "platform/loader/fetch/ResourceFetcher.h" |
| 178 #include "platform/loader/fetch/ResourceRequest.h" | 176 #include "platform/loader/fetch/ResourceRequest.h" |
| 179 #include "platform/loader/fetch/SubstituteData.h" | 177 #include "platform/loader/fetch/SubstituteData.h" |
| 180 #include "platform/scroll/ScrollTypes.h" | 178 #include "platform/scroll/ScrollTypes.h" |
| 181 #include "platform/scroll/ScrollbarTheme.h" | 179 #include "platform/scroll/ScrollbarTheme.h" |
| 182 #include "platform/weborigin/KURL.h" | 180 #include "platform/weborigin/KURL.h" |
| 183 #include "platform/weborigin/SchemeRegistry.h" | 181 #include "platform/weborigin/SchemeRegistry.h" |
| 184 #include "platform/weborigin/SecurityPolicy.h" | 182 #include "platform/weborigin/SecurityPolicy.h" |
| 185 #include "public/platform/InterfaceProvider.h" | |
| 186 #include "public/platform/InterfaceRegistry.h" | |
| 187 #include "public/platform/WebDoubleSize.h" | 183 #include "public/platform/WebDoubleSize.h" |
| 188 #include "public/platform/WebFloatPoint.h" | 184 #include "public/platform/WebFloatPoint.h" |
| 189 #include "public/platform/WebFloatRect.h" | 185 #include "public/platform/WebFloatRect.h" |
| 190 #include "public/platform/WebLayer.h" | 186 #include "public/platform/WebLayer.h" |
| 191 #include "public/platform/WebPoint.h" | 187 #include "public/platform/WebPoint.h" |
| 192 #include "public/platform/WebRect.h" | 188 #include "public/platform/WebRect.h" |
| 193 #include "public/platform/WebSecurityOrigin.h" | 189 #include "public/platform/WebSecurityOrigin.h" |
| 194 #include "public/platform/WebSize.h" | 190 #include "public/platform/WebSize.h" |
| 195 #include "public/platform/WebURLError.h" | 191 #include "public/platform/WebURLError.h" |
| 196 #include "public/platform/WebVector.h" | 192 #include "public/platform/WebVector.h" |
| (...skipping 1424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1621 // during init(). Note that this may dispatch JS events; the frame may be | 1617 // during init(). Note that this may dispatch JS events; the frame may be |
| 1622 // detached after init() returns. | 1618 // detached after init() returns. |
| 1623 frame()->init(); | 1619 frame()->init(); |
| 1624 if (frame()) { | 1620 if (frame()) { |
| 1625 if (frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() && | 1621 if (frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() && |
| 1626 !parent() && !opener() && | 1622 !parent() && !opener() && |
| 1627 frame()->settings()->getShouldReuseGlobalForUnownedMainFrame()) { | 1623 frame()->settings()->getShouldReuseGlobalForUnownedMainFrame()) { |
| 1628 frame()->document()->getSecurityOrigin()->grantUniversalAccess(); | 1624 frame()->document()->getSecurityOrigin()->grantUniversalAccess(); |
| 1629 } | 1625 } |
| 1630 | 1626 |
| 1631 // TODO(dominickn): This interface should be document-scoped rather than | |
| 1632 // frame-scoped, as the resulting banner event is dispatched to | |
| 1633 // frame()->document(). | |
| 1634 frame()->interfaceRegistry()->addInterface(WTF::bind( | |
| 1635 &AppBannerController::bindMojoRequest, wrapWeakPersistent(frame()))); | |
| 1636 | |
| 1637 frame()->interfaceRegistry()->addInterface(WTF::bind( | |
| 1638 &InstallationServiceImpl::create, wrapWeakPersistent(frame()))); | |
| 1639 if (!owner) { | 1627 if (!owner) { |
| 1640 // This trace event is needed to detect the main frame of the | 1628 // This trace event is needed to detect the main frame of the |
| 1641 // renderer in telemetry metrics. See crbug.com/692112#c11. | 1629 // renderer in telemetry metrics. See crbug.com/692112#c11. |
| 1642 TRACE_EVENT_INSTANT1("loading", "markAsMainFrame", | 1630 TRACE_EVENT_INSTANT1("loading", "markAsMainFrame", |
| 1643 TRACE_EVENT_SCOPE_THREAD, "frame", frame()); | 1631 TRACE_EVENT_SCOPE_THREAD, "frame", frame()); |
| 1644 } | 1632 } |
| 1645 } | 1633 } |
| 1646 } | 1634 } |
| 1647 | 1635 |
| 1648 LocalFrame* WebLocalFrameImpl::createChildFrame( | 1636 LocalFrame* WebLocalFrameImpl::createChildFrame( |
| (...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2515 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2503 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
| 2516 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2504 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2517 } else { | 2505 } else { |
| 2518 clipHtml = | 2506 clipHtml = |
| 2519 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2507 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
| 2520 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2508 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2521 } | 2509 } |
| 2522 } | 2510 } |
| 2523 | 2511 |
| 2524 } // namespace blink | 2512 } // namespace blink |
| OLD | NEW |