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

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

Issue 185263002: Don't setStyle the RenderView every style recalc (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix chicken-egg assert in test Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3357 matching lines...) Expand 10 before | Expand all | Expand 10 after
3368 m_isTransparent = isTransparent; 3368 m_isTransparent = isTransparent;
3369 } 3369 }
3370 3370
3371 bool WebViewImpl::isTransparent() const 3371 bool WebViewImpl::isTransparent() const
3372 { 3372 {
3373 return m_isTransparent; 3373 return m_isTransparent;
3374 } 3374 }
3375 3375
3376 void WebViewImpl::setBaseBackgroundColor(WebColor color) 3376 void WebViewImpl::setBaseBackgroundColor(WebColor color)
3377 { 3377 {
3378 layout();
ojan 2014/03/03 03:30:52 Why was this change needed?
abarth-chromium 2014/03/03 03:50:12 The call to setBaseBackgroundColor on line 3386 de
3379
3378 if (m_baseBackgroundColor == color) 3380 if (m_baseBackgroundColor == color)
3379 return; 3381 return;
3380 3382
3381 m_baseBackgroundColor = color; 3383 m_baseBackgroundColor = color;
3382 3384
3383 if (m_page->mainFrame()) 3385 if (m_page->mainFrame())
3384 m_page->mainFrame()->view()->setBaseBackgroundColor(color); 3386 m_page->mainFrame()->view()->setBaseBackgroundColor(color);
3385 3387
3386 updateLayerTreeBackgroundColor(); 3388 updateLayerTreeBackgroundColor();
3387 } 3389 }
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
3981 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3983 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3982 3984
3983 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 3985 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
3984 return false; 3986 return false;
3985 3987
3986 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 3988 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
3987 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 3989 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
3988 } 3990 }
3989 3991
3990 } // namespace blink 3992 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698