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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 #include "core/page/FocusController.h" | 150 #include "core/page/FocusController.h" |
151 #include "core/page/FrameTree.h" | 151 #include "core/page/FrameTree.h" |
152 #include "core/page/Page.h" | 152 #include "core/page/Page.h" |
153 #include "core/page/PrintContext.h" | 153 #include "core/page/PrintContext.h" |
154 #include "core/paint/PaintLayer.h" | 154 #include "core/paint/PaintLayer.h" |
155 #include "core/paint/TransformRecorder.h" | 155 #include "core/paint/TransformRecorder.h" |
156 #include "core/style/StyleInheritedData.h" | 156 #include "core/style/StyleInheritedData.h" |
157 #include "core/timing/DOMWindowPerformance.h" | 157 #include "core/timing/DOMWindowPerformance.h" |
158 #include "core/timing/Performance.h" | 158 #include "core/timing/Performance.h" |
159 #include "modules/app_banner/AppBannerController.h" | 159 #include "modules/app_banner/AppBannerController.h" |
| 160 #include "modules/installation/InstallationServiceImpl.h" |
160 #include "modules/screen_orientation/ScreenOrientationControllerImpl.h" | 161 #include "modules/screen_orientation/ScreenOrientationControllerImpl.h" |
161 #include "platform/ScriptForbiddenScope.h" | 162 #include "platform/ScriptForbiddenScope.h" |
162 #include "platform/UserGestureIndicator.h" | 163 #include "platform/UserGestureIndicator.h" |
163 #include "platform/WebFrameScheduler.h" | 164 #include "platform/WebFrameScheduler.h" |
164 #include "platform/clipboard/ClipboardUtilities.h" | 165 #include "platform/clipboard/ClipboardUtilities.h" |
165 #include "platform/fonts/FontCache.h" | 166 #include "platform/fonts/FontCache.h" |
166 #include "platform/graphics/GraphicsContext.h" | 167 #include "platform/graphics/GraphicsContext.h" |
167 #include "platform/graphics/GraphicsLayerClient.h" | 168 #include "platform/graphics/GraphicsLayerClient.h" |
168 #include "platform/graphics/paint/ClipRecorder.h" | 169 #include "platform/graphics/paint/ClipRecorder.h" |
169 #include "platform/graphics/paint/DisplayItemCacheSkipper.h" | 170 #include "platform/graphics/paint/DisplayItemCacheSkipper.h" |
(...skipping 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1563 !parent() && !opener() && | 1564 !parent() && !opener() && |
1564 frame()->settings()->shouldReuseGlobalForUnownedMainFrame()) { | 1565 frame()->settings()->shouldReuseGlobalForUnownedMainFrame()) { |
1565 frame()->document()->getSecurityOrigin()->grantUniversalAccess(); | 1566 frame()->document()->getSecurityOrigin()->grantUniversalAccess(); |
1566 } | 1567 } |
1567 | 1568 |
1568 // TODO(dominickn): This interface should be document-scoped rather than | 1569 // TODO(dominickn): This interface should be document-scoped rather than |
1569 // frame-scoped, as the resulting banner event is dispatched to | 1570 // frame-scoped, as the resulting banner event is dispatched to |
1570 // frame()->document(). | 1571 // frame()->document(). |
1571 frame()->interfaceRegistry()->addInterface(WTF::bind( | 1572 frame()->interfaceRegistry()->addInterface(WTF::bind( |
1572 &AppBannerController::bindMojoRequest, wrapWeakPersistent(frame()))); | 1573 &AppBannerController::bindMojoRequest, wrapWeakPersistent(frame()))); |
| 1574 |
| 1575 frame()->interfaceRegistry()->addInterface(WTF::bind( |
| 1576 &InstallationServiceImpl::create, wrapWeakPersistent(frame()))); |
1573 } | 1577 } |
1574 } | 1578 } |
1575 | 1579 |
1576 LocalFrame* WebLocalFrameImpl::createChildFrame( | 1580 LocalFrame* WebLocalFrameImpl::createChildFrame( |
1577 const FrameLoadRequest& request, | 1581 const FrameLoadRequest& request, |
1578 const AtomicString& name, | 1582 const AtomicString& name, |
1579 HTMLFrameOwnerElement* ownerElement) { | 1583 HTMLFrameOwnerElement* ownerElement) { |
1580 DCHECK(m_client); | 1584 DCHECK(m_client); |
1581 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); | 1585 TRACE_EVENT0("blink", "WebLocalFrameImpl::createChildframe"); |
1582 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() | 1586 WebTreeScopeType scope = frame()->document() == ownerElement->treeScope() |
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2353 ->frameScheduler() | 2357 ->frameScheduler() |
2354 ->unthrottledTaskRunner() | 2358 ->unthrottledTaskRunner() |
2355 ->toSingleThreadTaskRunner(); | 2359 ->toSingleThreadTaskRunner(); |
2356 } | 2360 } |
2357 | 2361 |
2358 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { | 2362 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { |
2359 return m_inputMethodController.get(); | 2363 return m_inputMethodController.get(); |
2360 } | 2364 } |
2361 | 2365 |
2362 } // namespace blink | 2366 } // namespace blink |
OLD | NEW |