Title: [159666] trunk/Source/WebCore
- Revision
- 159666
- Author
- [email protected]
- Date
- 2013-11-21 18:59:45 -0800 (Thu, 21 Nov 2013)
Log Message
Fix WinCairo unreachable code warnings in SimpleLineLayout.cpp
https://bugs.webkit.org/show_bug.cgi?id=124704
Patch by Laszlo Vidacs <[email protected]> on 2013-11-21
Reviewed by Antti Koivisto.
Fix unreachable code warnings using conditional directives.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (159665 => 159666)
--- trunk/Source/WebCore/ChangeLog 2013-11-22 02:57:41 UTC (rev 159665)
+++ trunk/Source/WebCore/ChangeLog 2013-11-22 02:59:45 UTC (rev 159666)
@@ -1,3 +1,15 @@
+2013-11-21 Laszlo Vidacs <[email protected]>
+
+ Fix WinCairo unreachable code warnings in SimpleLineLayout.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=124704
+
+ Reviewed by Antti Koivisto.
+
+ Fix unreachable code warnings using conditional directives.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseFor):
+
2013-11-21 Mark Rowe <[email protected]>
<https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.
Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (159665 => 159666)
--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2013-11-22 02:57:41 UTC (rev 159665)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2013-11-22 02:59:45 UTC (rev 159666)
@@ -94,7 +94,7 @@
// FIXME: Non-mac platforms are hitting ASSERT(run.charactersLength() >= run.length())
// https://bugs.webkit.org/show_bug.cgi?id=123338
return false;
-#endif
+#else
if (!flow.frame().settings().simpleLineLayoutEnabled())
return false;
if (!flow.firstChild())
@@ -204,6 +204,7 @@
return false;
return true;
+#endif
}
struct Style {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
