Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2322073006: Turn off the old compositing path for SPv2. (Closed)
Patch Set: none Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 3505 matching lines...) Expand 10 before | Expand all | Expand 10 after
3516 return IntSize(); 3516 return IntSize();
3517 LayoutViewItem root = page()->deprecatedLocalMainFrame()->contentLayoutItem( ); 3517 LayoutViewItem root = page()->deprecatedLocalMainFrame()->contentLayoutItem( );
3518 if (root.isNull()) 3518 if (root.isNull())
3519 return IntSize(); 3519 return IntSize();
3520 return root.documentRect().size(); 3520 return root.documentRect().size();
3521 } 3521 }
3522 3522
3523 WebSize WebViewImpl::contentsPreferredMinimumSize() 3523 WebSize WebViewImpl::contentsPreferredMinimumSize()
3524 { 3524 {
3525 if (mainFrameImpl()) 3525 if (mainFrameImpl())
3526 mainFrameImpl()->frame()->view()->updateLifecycleToCompositingCleanPlusS crolling(); 3526 mainFrameImpl()->frame()->view()->updateAllLifecyclePhasesExceptPaint();
3527 3527
3528 Document* document = m_page->mainFrame()->isLocalFrame() ? m_page->deprecate dLocalMainFrame()->document() : nullptr; 3528 Document* document = m_page->mainFrame()->isLocalFrame() ? m_page->deprecate dLocalMainFrame()->document() : nullptr;
3529 if (!document || document->layoutViewItem().isNull() || !document->documentE lement() || !document->documentElement()->layoutBox()) 3529 if (!document || document->layoutViewItem().isNull() || !document->documentE lement() || !document->documentElement()->layoutBox())
3530 return WebSize(); 3530 return WebSize();
3531 3531
3532 int widthScaled = document->layoutViewItem().minPreferredLogicalWidth().roun d(); // Already accounts for zoom. 3532 int widthScaled = document->layoutViewItem().minPreferredLogicalWidth().roun d(); // Already accounts for zoom.
3533 int heightScaled = document->documentElement()->layoutBox()->scrollHeight(). round(); 3533 int heightScaled = document->documentElement()->layoutBox()->scrollHeight(). round();
3534 return IntSize(widthScaled, heightScaled); 3534 return IntSize(widthScaled, heightScaled);
3535 } 3535 }
3536 3536
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after
4607 return nullptr; 4607 return nullptr;
4608 return focusedFrame; 4608 return focusedFrame;
4609 } 4609 }
4610 4610
4611 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const 4611 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const
4612 { 4612 {
4613 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4613 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4614 } 4614 }
4615 4615
4616 } // namespace blink 4616 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698