Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sky/engine/config.h" | 5 #include "sky/engine/config.h" |
| 6 #include "sky/engine/core/page/PageAnimator.h" | 6 #include "sky/engine/core/page/PageAnimator.h" |
| 7 | 7 |
| 8 #include "sky/engine/core/animation/DocumentAnimations.h" | 8 #include "sky/engine/core/animation/DocumentAnimations.h" |
| 9 #include "sky/engine/core/dom/Document.h" | 9 #include "sky/engine/core/dom/Document.h" |
| 10 #include "sky/engine/core/frame/FrameView.h" | 10 #include "sky/engine/core/frame/FrameView.h" |
| 11 #include "sky/engine/core/frame/LocalFrame.h" | 11 #include "sky/engine/core/frame/LocalFrame.h" |
| 12 #include "sky/engine/core/page/ChromeClient.h" | 12 #include "sky/engine/core/page/ChromeClient.h" |
| 13 #include "sky/engine/core/page/Page.h" | 13 #include "sky/engine/core/page/Page.h" |
| 14 #include "sky/engine/core/painting/PaintingTasks.h" | |
| 14 #include "sky/engine/platform/Logging.h" | 15 #include "sky/engine/platform/Logging.h" |
| 15 | 16 |
| 16 namespace blink { | 17 namespace blink { |
| 17 | 18 |
| 18 PageAnimator::PageAnimator(Page* page) | 19 PageAnimator::PageAnimator(Page* page) |
| 19 : m_page(page) | 20 : m_page(page) |
| 20 , m_servicingAnimations(false) | 21 , m_servicingAnimations(false) |
| 21 , m_updatingLayoutAndStyleForPainting(false) | 22 , m_updatingLayoutAndStyleForPainting(false) |
| 22 { | 23 { |
| 23 } | 24 } |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 38 return; | 39 return; |
| 39 m_page->scheduleVisualUpdate(); | 40 m_page->scheduleVisualUpdate(); |
| 40 } | 41 } |
| 41 | 42 |
| 42 void PageAnimator::updateLayoutAndStyleForPainting(LocalFrame* rootFrame) | 43 void PageAnimator::updateLayoutAndStyleForPainting(LocalFrame* rootFrame) |
| 43 { | 44 { |
| 44 RefPtr<FrameView> view = rootFrame->view(); | 45 RefPtr<FrameView> view = rootFrame->view(); |
| 45 | 46 |
| 46 TemporaryChange<bool> servicing(m_updatingLayoutAndStyleForPainting, true); | 47 TemporaryChange<bool> servicing(m_updatingLayoutAndStyleForPainting, true); |
| 47 | 48 |
| 48 // In order for our child HWNDs (NativeWindowWidgets) to update properly, | |
| 49 // they need to be told that we are updating the screen. The problem is that | |
| 50 // the native widgets need to recalculate their clip region and not overlap | |
| 51 // any of our non-native widgets. To force the resizing, call | |
| 52 // setFrameRect(). This will be a quick operation for most frames, but the | |
| 53 // NativeWindowWidgets will update a proper clipping region. | |
| 54 view->setFrameRect(view->frameRect()); | 49 view->setFrameRect(view->frameRect()); |
| 50 view->updateLayoutAndStyleForPainting(); | |
| 55 | 51 |
| 56 // setFrameRect may have the side-effect of causing existing page layout to | 52 // TODO(abarth): Remove these calls to updateLayoutAndStyleForPainting |
| 57 // be invalidated, so layout needs to be called last. | 53 // once requestPaint callbacks can't dirty layout. |
| 54 while (PaintingTasks::serviceRequests()) | |
| 55 view->updateLayoutAndStyleForPainting(); | |
| 58 view->updateLayoutAndStyleForPainting(); | 56 view->updateLayoutAndStyleForPainting(); |
|
ojan
2015/03/20 02:35:14
Is this call needed?
abarth-chromium
2015/03/20 02:54:51
serviceRequests returns if there are more requests
ojan
2015/03/20 03:38:02
Don't know if this is intentional, but if you hit
| |
| 57 | |
| 58 PaintingTasks::drainCommits(); | |
| 59 | |
| 60 ASSERT(m_page->mainFrame()->document()->lifecycle().state() == DocumentLifec ycle::StyleAndLayoutClean); | |
| 59 } | 61 } |
| 60 | 62 |
| 61 } | 63 } |
| OLD | NEW |