Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/style/RenderStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 619 matching lines @@
 
     if (lastContent && !reuseContent)
         lastContent->m_next = newContentData;
     else
         content.set(newContentData);
 
     newContentData->m_content.m_counter = c;
     newContentData->m_type = CONTENT_COUNTER;
 }
 
-void RenderStyle::applyTransform(TransformationMatrix& transform, const IntSize& borderBoxSize, ApplyTransformOrigin applyOrigin) const
+void RenderStyle::applyTransform(TransformationMatrix& transform, const IntSize& borderBoxSize, bool includeTransformOrigin) const
 {
     // transform-origin brackets the transform with translate operations.
     // Optimize for the case where the only transform is a translation, since the transform-origin is irrelevant
     // in that case.
     bool applyTransformOrigin = false;
     unsigned s = rareNonInheritedData->m_transform->m_operations.operations().size();
     unsigned i;
-    if (applyOrigin == IncludeTransformOrigin) {
+    if (includeTransformOrigin) {
         for (i = 0; i < s; i++) {
             TransformOperation::OperationType type = rareNonInheritedData->m_transform->m_operations.operations()[i]->getOperationType();
             if (type != TransformOperation::TRANSLATE_X &&
                     type != TransformOperation::TRANSLATE_Y &&
                     type != TransformOperation::TRANSLATE) {
                 applyTransformOrigin = true;
                 break;
             }
         }
     }
@@ skipping 176 matching lines @@
 {
     FontDescription desc(fontDescription());
     desc.setSpecifiedSize(size);
     desc.setComputedSize(size);
     setFontDescription(desc);
     font().update(font().fontSelector());
 }
 
 } // namespace WebCore