summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3eaf0f8)
It seems that it's not valid to do this only when the base layer's inval region
is not empty.
This is a partial revert of https://android-git.corp.google.com/g/#/c/142481.
Bug:
5501576
Change-Id: Ie608674e0b61e0d6280777583c64499ff5afe8a3
BaseLayerAndroid* base = new BaseLayerAndroid();
base->setContent(m_content);
BaseLayerAndroid* base = new BaseLayerAndroid();
base->setContent(m_content);
- if (!region->isEmpty()) {
- m_skipContentDraw = true;
- bool layoutSucceeded = layoutIfNeededRecursive(m_mainFrame);
- m_skipContentDraw = false;
- // Layout only fails if called during a layout.
- LOG_ASSERT(layoutSucceeded, "Can never be called recursively");
- }
+ m_skipContentDraw = true;
+ bool layoutSucceeded = layoutIfNeededRecursive(m_mainFrame);
+ m_skipContentDraw = false;
+ // Layout only fails if called during a layout.
+ LOG_ASSERT(layoutSucceeded, "Can never be called recursively");
#if USE(ACCELERATED_COMPOSITING)
// We set the background color
#if USE(ACCELERATED_COMPOSITING)
// We set the background color
- if (!region->isEmpty() && m_mainFrame && m_mainFrame->document()
+ if (m_mainFrame && m_mainFrame->document()
&& m_mainFrame->document()->body()) {
Document* document = m_mainFrame->document();
RefPtr<RenderStyle> style = document->styleForElementIgnoringPendingStylesheets(document->body());
&& m_mainFrame->document()->body()) {
Document* document = m_mainFrame->document();
RefPtr<RenderStyle> style = document->styleForElementIgnoringPendingStylesheets(document->body());