Chromium Code Reviews| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 144 #include "core/rendering/RenderFrame.h" | 144 #include "core/rendering/RenderFrame.h" |
| 145 #include "core/rendering/RenderLayer.h" | 145 #include "core/rendering/RenderLayer.h" |
| 146 #include "core/rendering/RenderObject.h" | 146 #include "core/rendering/RenderObject.h" |
| 147 #include "core/rendering/RenderTreeAsText.h" | 147 #include "core/rendering/RenderTreeAsText.h" |
| 148 #include "core/rendering/RenderView.h" | 148 #include "core/rendering/RenderView.h" |
| 149 #include "core/rendering/style/StyleInheritedData.h" | 149 #include "core/rendering/style/StyleInheritedData.h" |
| 150 #include "core/timing/Performance.h" | 150 #include "core/timing/Performance.h" |
| 151 #include "modules/geolocation/GeolocationController.h" | 151 #include "modules/geolocation/GeolocationController.h" |
| 152 #include "modules/notifications/NotificationController.h" | 152 #include "modules/notifications/NotificationController.h" |
| 153 #include "modules/notifications/NotificationPermissionClient.h" | 153 #include "modules/notifications/NotificationPermissionClient.h" |
| 154 #include "modules/push_messaging/PushController.h" | |
| 154 #include "modules/screen_orientation/ScreenOrientationController.h" | 155 #include "modules/screen_orientation/ScreenOrientationController.h" |
| 155 #include "platform/TraceEvent.h" | 156 #include "platform/TraceEvent.h" |
| 156 #include "platform/UserGestureIndicator.h" | 157 #include "platform/UserGestureIndicator.h" |
| 157 #include "platform/clipboard/ClipboardUtilities.h" | 158 #include "platform/clipboard/ClipboardUtilities.h" |
| 158 #include "platform/fonts/FontCache.h" | 159 #include "platform/fonts/FontCache.h" |
| 159 #include "platform/graphics/GraphicsContext.h" | 160 #include "platform/graphics/GraphicsContext.h" |
| 160 #include "platform/graphics/GraphicsLayerClient.h" | 161 #include "platform/graphics/GraphicsLayerClient.h" |
| 161 #include "platform/graphics/skia/SkiaUtils.h" | 162 #include "platform/graphics/skia/SkiaUtils.h" |
| 162 #include "platform/heap/Handle.h" | 163 #include "platform/heap/Handle.h" |
| 163 #include "platform/network/ResourceRequest.h" | 164 #include "platform/network/ResourceRequest.h" |
| (...skipping 1411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1575 } | 1576 } |
| 1576 #endif | 1577 #endif |
| 1577 | 1578 |
| 1578 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) | 1579 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) |
| 1579 { | 1580 { |
| 1580 m_frame = frame; | 1581 m_frame = frame; |
| 1581 | 1582 |
| 1582 // FIXME: we shouldn't add overhead to every frame by registering these obje cts when they're not used. | 1583 // FIXME: we shouldn't add overhead to every frame by registering these obje cts when they're not used. |
| 1583 if (m_frame) { | 1584 if (m_frame) { |
| 1584 OwnPtr<NotificationPresenterImpl> notificationPresenter = adoptPtr(new N otificationPresenterImpl()); | 1585 OwnPtr<NotificationPresenterImpl> notificationPresenter = adoptPtr(new N otificationPresenterImpl()); |
| 1585 if (m_client) | 1586 if (m_client) { |
| 1586 notificationPresenter->initialize(m_client->notificationPresenter()) ; | 1587 notificationPresenter->initialize(m_client->notificationPresenter()) ; |
| 1588 providePushControllerTo(*m_frame, m_client->pushClient()); | |
|
Peter Beverloo
2014/10/29 11:25:07
Hmm. The WebPushClient should probably be moved to
Michael van Ouwerkerk
2014/11/11 17:20:06
I don't think that's necessary. It's more complex
| |
| 1589 } | |
| 1587 | 1590 |
| 1588 provideNotification(*m_frame, notificationPresenter.release()); | 1591 provideNotification(*m_frame, notificationPresenter.release()); |
| 1589 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl ientImpl::create()); | 1592 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl ientImpl::create()); |
| 1590 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); | 1593 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); |
| 1591 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); | 1594 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); |
| 1592 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get())); | 1595 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get())); |
| 1593 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web MIDIClient() : 0)); | 1596 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web MIDIClient() : 0)); |
| 1594 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); | 1597 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); |
| 1595 | 1598 |
| 1596 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | 1599 if (RuntimeEnabledFeatures::screenOrientationEnabled()) |
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1969 | 1972 |
| 1970 void WebLocalFrameImpl::invalidateAll() const | 1973 void WebLocalFrameImpl::invalidateAll() const |
| 1971 { | 1974 { |
| 1972 ASSERT(frame() && frame()->view()); | 1975 ASSERT(frame() && frame()->view()); |
| 1973 FrameView* view = frame()->view(); | 1976 FrameView* view = frame()->view(); |
| 1974 view->invalidateRect(view->frameRect()); | 1977 view->invalidateRect(view->frameRect()); |
| 1975 invalidateScrollbar(); | 1978 invalidateScrollbar(); |
| 1976 } | 1979 } |
| 1977 | 1980 |
| 1978 } // namespace blink | 1981 } // namespace blink |
| OLD | NEW |