Split StyleSurroundData::offset into separate members.

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 704 matching lines @@
     return m_surround->border.bottomRight();
   }
   void setBorderBottomRightRadius(const LengthSize& s) {
     SET_VAR(m_surround, border.m_bottomRight, s);
   }
 
   // Offset properties.
   static Length initialOffset() { return Length(); }
 
   // left
-  const Length& left() const { return m_surround->offset.left(); }
-  void setLeft(const Length& v) { SET_VAR(m_surround, offset.m_left, v); }
+  const Length& left() const { return m_surround->m_left; }
+  void setLeft(const Length& v) { SET_VAR(m_surround, m_left, v); }
 
   // right
-  const Length& right() const { return m_surround->offset.right(); }
-  void setRight(const Length& v) { SET_VAR(m_surround, offset.m_right, v); }
+  const Length& right() const { return m_surround->m_right; }
+  void setRight(const Length& v) { SET_VAR(m_surround, m_right, v); }
 
   // top
-  const Length& top() const { return m_surround->offset.top(); }
-  void setTop(const Length& v) { SET_VAR(m_surround, offset.m_top, v); }
+  const Length& top() const { return m_surround->m_top; }
+  void setTop(const Length& v) { SET_VAR(m_surround, m_top, v); }
 
   // bottom
-  const Length& bottom() const { return m_surround->offset.bottom(); }
-  void setBottom(const Length& v) { SET_VAR(m_surround, offset.m_bottom, v); }
+  const Length& bottom() const { return m_surround->m_bottom; }
+  void setBottom(const Length& v) { SET_VAR(m_surround, m_bottom, v); }
 
   // box-shadow (aka -webkit-box-shadow)
   static ShadowList* initialBoxShadow() { return 0; }
   ShadowList* boxShadow() const {
     return m_rareNonInheritedData->m_boxShadow.get();
   }
   void setBoxShadow(PassRefPtr<ShadowList>);
 
   // box-sizing (aka -webkit-box-sizing)
   static EBoxSizing initialBoxSizing() { return EBoxSizing::kContentBox; }
@@ skipping 2449 matching lines @@
 
   // Clip utility functions.
   const Length& clipLeft() const { return m_visual->clip.left(); }
   const Length& clipRight() const { return m_visual->clip.right(); }
   const Length& clipTop() const { return m_visual->clip.top(); }
   const Length& clipBottom() const { return m_visual->clip.bottom(); }
 
   // Offset utility functions.
   // Accessors for positioned object edges that take into account writing mode.
   const Length& logicalLeft() const {
-    return m_surround->offset.logicalLeft(getWritingMode());
+    return LengthBox::logicalLeft(getWritingMode(), left(), top());
   }
   const Length& logicalRight() const {
-    return m_surround->offset.logicalRight(getWritingMode());
+    return LengthBox::logicalRight(getWritingMode(), right(), bottom());
   }
   const Length& logicalTop() const {
-    return m_surround->offset.before(getWritingMode());
+    return LengthBox::before(getWritingMode(), top(), left(), right());
   }
   const Length& logicalBottom() const {
-    return m_surround->offset.after(getWritingMode());
+    return LengthBox::after(getWritingMode(), bottom(), left(), right());
+  }
+  bool offsetEqual(const ComputedStyle& other) const {
+    return left() == other.left() && right() == other.right() &&
+           top() == other.top() && bottom() == other.bottom();
   }
 
   // Whether or not a positioned element requires normal flow x/y to be computed
   // to determine its position.
   bool hasAutoLeftAndRight() const {
     return left().isAuto() && right().isAuto();
   }
   bool hasAutoTopAndBottom() const {
     return top().isAuto() && bottom().isAuto();
   }
@@ skipping 619 matching lines @@
   m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h