Changeset 223549 in webkit
- Timestamp:
- Oct 17, 2017 9:17:38 AM (7 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r223514 r223549 1 2017-10-17 Zalan Bujtas <zalan@apple.com> 2 3 [FrameView::layout cleanup] Merge InPreLayout blocks 4 https://bugs.webkit.org/show_bug.cgi?id=178373 5 6 Reviewed by Antti Koivisto. 7 8 Remove redundant comment and scoping. 9 10 No change in functionality. 11 12 * page/FrameView.cpp: 13 (WebCore::FrameView::layout): 14 1 15 2017-10-17 Antti Koivisto <antti@apple.com> 2 16 -
trunk/Source/WebCore/page/FrameView.cpp
r223432 r223549 1366 1366 Document& document = *frame().document(); 1367 1367 ASSERT(document.pageCacheState() == Document::NotInPageCache); 1368 RenderElement* root = nullptr; 1369 RenderLayer* layer = nullptr; 1370 bool subtree = false; 1368 1371 1369 1372 { … … 1399 1402 return; 1400 1403 1401 // Close block here so we can set up the font cache purge preventer, which we will still 1402 // want in scope even after we want m_layoutSchedulingEnabled to be restored again. 1403 // The next block sets m_layoutSchedulingEnabled back to false once again. 1404 } 1405 1406 m_layoutPhase = InPreLayout; 1407 1408 RenderLayer* layer = nullptr; 1409 bool subtree = false; 1410 RenderElement* root = nullptr; 1411 1412 ++m_nestedLayoutCount; 1413 1414 { 1415 SetForScope<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false); 1404 m_layoutPhase = InPreLayout; 1405 1406 ++m_nestedLayoutCount; 1416 1407 1417 1408 autoSizeIfEnabled();
Note: See TracChangeset
for help on using the changeset viewer.