| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 | 547 |
| 548 bool ChromeClientImpl::TabsToLinks() { | 548 bool ChromeClientImpl::TabsToLinks() { |
| 549 return web_view_->TabsToLinks(); | 549 return web_view_->TabsToLinks(); |
| 550 } | 550 } |
| 551 | 551 |
| 552 void ChromeClientImpl::InvalidateRect(const IntRect& update_rect) { | 552 void ChromeClientImpl::InvalidateRect(const IntRect& update_rect) { |
| 553 if (!update_rect.IsEmpty()) | 553 if (!update_rect.IsEmpty()) |
| 554 web_view_->InvalidateRect(update_rect); | 554 web_view_->InvalidateRect(update_rect); |
| 555 } | 555 } |
| 556 | 556 |
| 557 void ChromeClientImpl::ScheduleAnimation(FrameViewBase* frame_view_base) { | 557 void ChromeClientImpl::ScheduleAnimation(LocalFrame* frame) { |
| 558 DCHECK(frame_view_base->IsFrameView()); | 558 frame = frame->LocalFrameRoot(); |
| 559 FrameView* view = ToFrameView(frame_view_base); | |
| 560 LocalFrame* frame = view->GetFrame().LocalFrameRoot(); | |
| 561 | |
| 562 // If the frame is still being created, it might not yet have a WebWidget. | 559 // If the frame is still being created, it might not yet have a WebWidget. |
| 563 // FIXME: Is this the right thing to do? Is there a way to avoid having | 560 // FIXME: Is this the right thing to do? Is there a way to avoid having |
| 564 // a local frame root that doesn't have a WebWidget? During initialization | 561 // a local frame root that doesn't have a WebWidget? During initialization |
| 565 // there is no content to draw so this call serves no purpose. | 562 // there is no content to draw so this call serves no purpose. |
| 566 if (WebLocalFrameImpl::FromFrame(frame) && | 563 if (WebLocalFrameImpl::FromFrame(frame) && |
| 567 WebLocalFrameImpl::FromFrame(frame)->FrameWidget()) | 564 WebLocalFrameImpl::FromFrame(frame)->FrameWidget()) |
| 568 WebLocalFrameImpl::FromFrame(frame)->FrameWidget()->ScheduleAnimation(); | 565 WebLocalFrameImpl::FromFrame(frame)->FrameWidget()->ScheduleAnimation(); |
| 569 } | 566 } |
| 570 | 567 |
| 571 IntRect ChromeClientImpl::ViewportToScreen( | 568 IntRect ChromeClientImpl::ViewportToScreen( |
| (...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1233 if (RuntimeEnabledFeatures::presentationEnabled()) | 1230 if (RuntimeEnabledFeatures::presentationEnabled()) |
| 1234 PresentationController::ProvideTo(frame, client->PresentationClient()); | 1231 PresentationController::ProvideTo(frame, client->PresentationClient()); |
| 1235 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { | 1232 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { |
| 1236 ProvideAudioOutputDeviceClientTo(frame, | 1233 ProvideAudioOutputDeviceClientTo(frame, |
| 1237 new AudioOutputDeviceClientImpl(frame)); | 1234 new AudioOutputDeviceClientImpl(frame)); |
| 1238 } | 1235 } |
| 1239 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); | 1236 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); |
| 1240 } | 1237 } |
| 1241 | 1238 |
| 1242 } // namespace blink | 1239 } // namespace blink |
| OLD | NEW |