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

Unified Diff: Source/core/rendering/RenderBox.cpp

Issue 203743002: Fix "unreachable code" warnings (MSVC warning 4702) in Blink. (Closed) Base URL: svn://svn.chromium.org/blink/trunk/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderBox.cpp
===================================================================
--- Source/core/rendering/RenderBox.cpp (revision 169196)
+++ Source/core/rendering/RenderBox.cpp (working copy)
@@ -355,10 +355,11 @@
{
// FIXME: This optimization is incorrect as written.
// We need to be able to opt-in to this behavior only when
- // it's guarentted correct.
+ // it's guaranteed correct.
// Until then disabling this optimization to be safe.
+#if 1
Nico 2014/03/18 17:47:51 Just delete this code; if Eric wants to pick this
eseidel 2014/03/18 18:10:23 Sorry, this was an emergency fix done for a stable
Peter Kasting 2014/03/18 20:58:04 Eric, would you be willing to make this change sep
Nico 2014/03/19 10:20:05 You can change the function body to " // FIXME:
Peter Kasting 2014/03/19 20:50:01 Done.
return false;
-
+#else
// FIXME: There are likely many subclasses of RenderBlockFlow which
// cannot determine their layout just from style!
// Perhaps we should create a "PlainRenderBlockFlow"
@@ -377,6 +378,7 @@
&& style->paddingLeft().isFixed()
&& style->paddingRight().isFixed()
&& style->boxSizing() == CONTENT_BOX;
+#endif
}
LayoutUnit RenderBox::fixedOffsetWidth() const
« Source/build/scripts/make_css_value_keywords.py ('K') | « Source/core/css/RuleFeature.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698