Rename members of StyleSurroundData and ComputedStyle.

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

Index: third_party/WebKit/Source/core/layout/LayoutTheme.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTheme.cpp b/third_party/WebKit/Source/core/layout/LayoutTheme.cpp
index 26784f061487390f76c7d33cf5f21f1b656d67d9..149cb93de6d81c71d3af06833ce034636d9e96f8 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTheme.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTheme.cpp
@@ -159,10 +159,10 @@ void LayoutTheme::adjustStyle(ComputedStyle& style, Element* e) {
 
         // 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))