Merge 139659

Source/WebCore/rendering/RenderObject.h

Index: Source/WebCore/rendering/RenderObject.h
===================================================================
--- Source/WebCore/rendering/RenderObject.h	(revision 140863)
+++ Source/WebCore/rendering/RenderObject.h	(working copy)
@@ -1271,6 +1271,13 @@
     return adjustForAbsoluteZoom(value, renderer->style());
 }
 
+#if ENABLE(SUBPIXEL_LAYOUT)
+inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, RenderObject* renderer)
+{
+    return adjustLayoutUnitForAbsoluteZoom(value, renderer->style());
+}
+#endif
+
 inline void adjustFloatQuadForAbsoluteZoom(FloatQuad& quad, RenderObject* renderer)
 {
     float zoom = renderer->style()->effectiveZoom();