Switch line layout to LayoutUnit.

Source/core/layout/LayoutObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 88 matching lines @@
 namespace {
 
 static bool gModifyLayoutTreeStructureAnyState = false;
 
 static bool gDisablePaintInvalidationStateAsserts = false;
 
 } // namespace
 
 using namespace HTMLNames;
 
+const LayoutUnit& caretWidth()

[eae, 2015/05/26 18:56:31]

I'm curious, why did you switch this to me a function?

[szager1, 2015/05/27 05:59:42]

Previously, this was a global static variable, but there's no way that I know of
to declare a global static class instance.  Is there a better way to do this?

+{
+    static LayoutUnit gCaretWidth(1);
+    return gCaretWidth;
+}
+
 #if ENABLE(ASSERT)
 
 LayoutObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope(LayoutObject& layoutObject)
     : m_layoutObject(layoutObject)
     , m_preexistingForbidden(m_layoutObject.isSetNeedsLayoutForbidden())
 {
     m_layoutObject.setNeedsLayoutIsForbidden(true);
 }
 
 LayoutObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope()
@@ skipping 3181 matching lines @@
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     } else {
         fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
     }
 }
 
 #endif