Rename members of StyleSurroundData and ComputedStyle.

third_party/WebKit/Source/core/layout/LayoutTheme.cpp

 /**
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
  *
  * 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.
  *
@@ skipping 141 matching lines @@
             static_cast<int>(style.borderLeftWidth())) {
           style.setBorderLeftWidth(borderBox.left().value());
           if (borderBox.left().value())
             style.setBorderLeftWidth(borderBox.left().value());
           else
             style.resetBorderLeft();
         }
 
         // Padding
         LengthBox paddingBox = m_platformTheme->controlPadding(
-            part, style.font().getFontDescription(), style.paddingBox(),
+            part, style.font().getFontDescription(), style.padding(),
             style.effectiveZoom());
-        if (paddingBox != style.paddingBox())
-          style.setPaddingBox(paddingBox);
+        if (paddingBox != style.padding())
+          style.setPadding(paddingBox);
 
         // Whitespace
         if (m_platformTheme->controlRequiresPreWhiteSpace(part))
           style.setWhiteSpace(EWhiteSpace::kPre);
 
         // Width / Height
         // The width and height here are affected by the zoom.
         // FIXME: Check is flawed, since it doesn't take min-width/max-width
         // into account.
         LengthSize controlSize = m_platformTheme->controlSize(
@@ skipping 735 matching lines @@
   // padding - not honored by WinIE, needs to be removed.
   style.resetPadding();
 
   // border - honored by WinIE, but looks terrible (just paints in the control
   // box and turns off the Windows XP theme)
   // for now, we will not honor it.
   style.resetBorder();
 }
 
 }  // namespace blink