Title: [148476] branches/safari-536.30-branch/Source/WebCore
Diff
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (148475 => 148476)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-04-15 23:17:51 UTC (rev 148475)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-04-15 23:26:27 UTC (rev 148476)
@@ -1,5 +1,13 @@
2013-04-15 Roger Fong <[email protected]>
+ Build fix for r148472.
+
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::setBlendedFontSize):
+ * rendering/style/RenderStyle.h:
+
+2013-04-15 Roger Fong <[email protected]>
+
Merged r138821.
01/04/13 John Mellor <[email protected]>
Modified: branches/safari-536.30-branch/Source/WebCore/rendering/style/RenderStyle.cpp (148475 => 148476)
--- branches/safari-536.30-branch/Source/WebCore/rendering/style/RenderStyle.cpp 2013-04-15 23:17:51 UTC (rev 148475)
+++ branches/safari-536.30-branch/Source/WebCore/rendering/style/RenderStyle.cpp 2013-04-15 23:26:27 UTC (rev 148476)
@@ -1152,8 +1152,8 @@
void RenderStyle::setBlendedFontSize(int size)
{
float sizef = (float)size;
- ASSERT(isfinite(sizef);
- if (!isfinite(sizef || size < 0)
+ ASSERT(isfinite(sizef));
+ if (!isfinite(sizef) || size < 0)
size = 0;
else
size = min(maximumAllowedFontSize, sizef);
Modified: branches/safari-536.30-branch/Source/WebCore/rendering/style/RenderStyle.h (148475 => 148476)
--- branches/safari-536.30-branch/Source/WebCore/rendering/style/RenderStyle.h 2013-04-15 23:17:51 UTC (rev 148475)
+++ branches/safari-536.30-branch/Source/WebCore/rendering/style/RenderStyle.h 2013-04-15 23:26:27 UTC (rev 148476)
@@ -90,7 +90,6 @@
#include "SVGRenderStyle.h"
#endif
-
template<typename T, typename U> inline bool compareEqual(const T& t, const U& u) { return t == static_cast<T>(u); }
#define SET_VAR(group, variable, value) \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
