| 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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 #include "core/page/PrintContext.h" | 124 #include "core/page/PrintContext.h" |
| 125 #include "core/rendering/HitTestResult.h" | 125 #include "core/rendering/HitTestResult.h" |
| 126 #include "core/rendering/RenderBox.h" | 126 #include "core/rendering/RenderBox.h" |
| 127 #include "core/rendering/RenderFrame.h" | 127 #include "core/rendering/RenderFrame.h" |
| 128 #include "core/rendering/RenderLayer.h" | 128 #include "core/rendering/RenderLayer.h" |
| 129 #include "core/rendering/RenderObject.h" | 129 #include "core/rendering/RenderObject.h" |
| 130 #include "core/rendering/RenderTreeAsText.h" | 130 #include "core/rendering/RenderTreeAsText.h" |
| 131 #include "core/rendering/RenderView.h" | 131 #include "core/rendering/RenderView.h" |
| 132 #include "core/rendering/style/StyleInheritedData.h" | 132 #include "core/rendering/style/StyleInheritedData.h" |
| 133 #include "core/timing/Performance.h" | 133 #include "core/timing/Performance.h" |
| 134 #include "modules/geolocation/GeofencingController.h" |
| 134 #include "modules/geolocation/GeolocationController.h" | 135 #include "modules/geolocation/GeolocationController.h" |
| 135 #include "modules/notifications/NotificationController.h" | 136 #include "modules/notifications/NotificationController.h" |
| 136 #include "modules/notifications/NotificationPermissionClient.h" | 137 #include "modules/notifications/NotificationPermissionClient.h" |
| 137 #include "modules/screen_orientation/ScreenOrientationController.h" | 138 #include "modules/screen_orientation/ScreenOrientationController.h" |
| 138 #include "platform/TraceEvent.h" | 139 #include "platform/TraceEvent.h" |
| 139 #include "platform/UserGestureIndicator.h" | 140 #include "platform/UserGestureIndicator.h" |
| 140 #include "platform/clipboard/ClipboardUtilities.h" | 141 #include "platform/clipboard/ClipboardUtilities.h" |
| 141 #include "platform/fonts/FontCache.h" | 142 #include "platform/fonts/FontCache.h" |
| 142 #include "platform/graphics/GraphicsContext.h" | 143 #include "platform/graphics/GraphicsContext.h" |
| 143 #include "platform/graphics/GraphicsLayerClient.h" | 144 #include "platform/graphics/GraphicsLayerClient.h" |
| (...skipping 1382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1526 // FIXME: we shouldn't add overhead to every frame by registering these obje
cts when they're not used. | 1527 // FIXME: we shouldn't add overhead to every frame by registering these obje
cts when they're not used. |
| 1527 if (m_frame) { | 1528 if (m_frame) { |
| 1528 OwnPtr<NotificationPresenterImpl> notificationPresenter = adoptPtr(new N
otificationPresenterImpl()); | 1529 OwnPtr<NotificationPresenterImpl> notificationPresenter = adoptPtr(new N
otificationPresenterImpl()); |
| 1529 if (m_client) | 1530 if (m_client) |
| 1530 notificationPresenter->initialize(m_client->notificationPresenter())
; | 1531 notificationPresenter->initialize(m_client->notificationPresenter())
; |
| 1531 | 1532 |
| 1532 provideNotification(*m_frame, notificationPresenter.release()); | 1533 provideNotification(*m_frame, notificationPresenter.release()); |
| 1533 proviceNotificationPermissionClientTo(*m_frame, NotificationPermissionCl
ientImpl::create()); | 1534 proviceNotificationPermissionClientTo(*m_frame, NotificationPermissionCl
ientImpl::create()); |
| 1534 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); | 1535 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); |
| 1535 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); | 1536 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); |
| 1537 provideGeofencingControllerTo(*m_frame, m_client ? m_client->geofencingC
lient() : 0); |
| 1536 m_geolocationClientProxy->setController(GeolocationController::from(m_fr
ame.get())); | 1538 m_geolocationClientProxy->setController(GeolocationController::from(m_fr
ame.get())); |
| 1537 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web
MIDIClient() : 0)); | 1539 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web
MIDIClient() : 0)); |
| 1538 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | 1540 if (RuntimeEnabledFeatures::screenOrientationEnabled()) |
| 1539 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client
->webScreenOrientationClient() : 0); | 1541 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client
->webScreenOrientationClient() : 0); |
| 1540 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); | 1542 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); |
| 1541 } | 1543 } |
| 1542 } | 1544 } |
| 1543 | 1545 |
| 1544 PassRefPtr<LocalFrame> WebLocalFrameImpl::initializeWebCoreFrame(FrameHost* host
, FrameOwner* owner, const AtomicString& name, const AtomicString& fallbackName) | 1546 PassRefPtr<LocalFrame> WebLocalFrameImpl::initializeWebCoreFrame(FrameHost* host
, FrameOwner* owner, const AtomicString& name, const AtomicString& fallbackName) |
| 1545 { | 1547 { |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1841 | 1843 |
| 1842 void WebLocalFrameImpl::invalidateAll() const | 1844 void WebLocalFrameImpl::invalidateAll() const |
| 1843 { | 1845 { |
| 1844 ASSERT(frame() && frame()->view()); | 1846 ASSERT(frame() && frame()->view()); |
| 1845 FrameView* view = frame()->view(); | 1847 FrameView* view = frame()->view(); |
| 1846 view->invalidateRect(view->frameRect()); | 1848 view->invalidateRect(view->frameRect()); |
| 1847 invalidateScrollbar(); | 1849 invalidateScrollbar(); |
| 1848 } | 1850 } |
| 1849 | 1851 |
| 1850 } // namespace blink | 1852 } // namespace blink |
| OLD | NEW |