webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 10 deletions

diff --git a/Source/WebCore/css/CSSLineBoxContainValue.h b/Source/WebCore/css/CSSLineBoxContainValue.h
index fa3aefd50..248b2337e 100644
--- a/Source/WebCore/css/CSSLineBoxContainValue.h
+++ b/Source/WebCore/css/CSSLineBoxContainValue.h
@@ -23,11 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CSSLineBoxContainValue_h
-#define CSSLineBoxContainValue_h
+#pragma once
 
 #include "CSSValue.h"
-#include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
@@ -35,13 +33,13 @@ namespace WebCore {
 class CSSPrimitiveValue;
 
 enum LineBoxContainFlags { LineBoxContainNone = 0x0, LineBoxContainBlock = 0x1, LineBoxContainInline = 0x2, LineBoxContainFont = 0x4, LineBoxContainGlyphs = 0x8,
-                           LineBoxContainReplaced = 0x10, LineBoxContainInlineBox = 0x20 };
+                           LineBoxContainReplaced = 0x10, LineBoxContainInlineBox = 0x20, LineBoxContainInitialLetter = 0x40 };
 typedef unsigned LineBoxContain;
 
 // Used for text-CSSLineBoxContain and box-CSSLineBoxContain
-class CSSLineBoxContainValue : public CSSValue {
+class CSSLineBoxContainValue final : public CSSValue {
 public:
-    static PassRef<CSSLineBoxContainValue> create(LineBoxContain value)
+    static Ref<CSSLineBoxContainValue> create(LineBoxContain value)
     {
         return adoptRef(*new CSSLineBoxContainValue(value));
     }
@@ -56,8 +54,6 @@ private:
     LineBoxContain m_value;
 };
 
-CSS_VALUE_TYPE_CASTS(CSSLineBoxContainValue, isLineBoxContainValue())
+} // namespace WebCore
 
-} // namespace
-
-#endif
+SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSLineBoxContainValue, isLineBoxContainValue())