Oilpan: Remove WillBe types (part 9)

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * 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 795 matching lines @@
                 || rareInheritedData->visitedLinkTextFillColor() != other.rareInheritedData->visitedLinkTextFillColor()
                 || rareInheritedData->visitedLinkTextStrokeColor() != other.rareInheritedData->visitedLinkTextStrokeColor()
                 || rareInheritedData->visitedLinkTextEmphasisColor() != other.rareInheritedData->visitedLinkTextEmphasisColor()
                 || rareInheritedData->textEmphasisFill != other.rareInheritedData->textEmphasisFill
                 || rareInheritedData->appliedTextDecorations != other.rareInheritedData->appliedTextDecorations)) {
                 diff.setTextDecorationOrColorChanged();
         }
     }
 }
 
-void ComputedStyle::addCursor(PassRefPtrWillBeRawPtr<StyleImage> image, bool hotSpotSpecified, const IntPoint& hotSpot)
+void ComputedStyle::addCursor(RawPtr<StyleImage> image, bool hotSpotSpecified, const IntPoint& hotSpot)
 {
     if (!rareInheritedData.access()->cursorData) {
 #if ENABLE(OILPAN)
         rareInheritedData.access()->cursorData = new CursorList;
 #else
         rareInheritedData.access()->cursorData = CursorList::create();
 #endif
     }
     rareInheritedData.access()->cursorData->append(CursorData(image, hotSpotSpecified, hotSpot));
 }
 
-void ComputedStyle::setCursorList(PassRefPtrWillBeRawPtr<CursorList> other)
+void ComputedStyle::setCursorList(RawPtr<CursorList> other)
 {
     rareInheritedData.access()->cursorData = other;
 }
 
 void ComputedStyle::setQuotes(PassRefPtr<QuotesData> q)
 {
     rareInheritedData.access()->quotes = q;
 }
 
 void ComputedStyle::clearCursorList()
 {
     if (rareInheritedData->cursorData)
         rareInheritedData.access()->cursorData = nullptr;
 }
 
 void ComputedStyle::addCallbackSelector(const String& selector)
 {
     if (!rareNonInheritedData->m_callbackSelectors.contains(selector))
         rareNonInheritedData.access()->m_callbackSelectors.append(selector);
 }
 
 void ComputedStyle::clearContent()
 {
     if (rareNonInheritedData->m_content)
         rareNonInheritedData.access()->m_content = nullptr;
 }
 
-void ComputedStyle::appendContent(PassOwnPtrWillBeRawPtr<ContentData> contentData)
+void ComputedStyle::appendContent(RawPtr<ContentData> contentData)
 {
-    OwnPtrWillBePersistent<ContentData>& content = rareNonInheritedData.access()->m_content;
+    Persistent<ContentData>& content = rareNonInheritedData.access()->m_content;
     if (!content) {
         content = contentData;
         return;
     }
     ContentData* lastContent = content.get();
     while (lastContent->next())
         lastContent = lastContent->next();
     lastContent->setNext(contentData);
 }
 
-void ComputedStyle::setContent(PassRefPtrWillBeRawPtr<StyleImage> image)
+void ComputedStyle::setContent(RawPtr<StyleImage> image)
 {
     appendContent(ContentData::create(image));
 }
 
 void ComputedStyle::setContent(const String& string)
 {
-    OwnPtrWillBePersistent<ContentData>& content = rareNonInheritedData.access()->m_content;
+    Persistent<ContentData>& content = rareNonInheritedData.access()->m_content;
     if (!content) {
         content = ContentData::create(string);
         return;
     }
 
     ContentData* lastContent = content.get();
     while (lastContent->next())
         lastContent = lastContent->next();
 
     // We attempt to merge with the last ContentData if possible.
@@ skipping 168 matching lines @@
             floatValueForLength(border.topLeft().height(), size.height().toFloat())),
         FloatSize(floatValueForLength(border.topRight().width(), size.width().toFloat()),
             floatValueForLength(border.topRight().height(), size.height().toFloat())),
         FloatSize(floatValueForLength(border.bottomLeft().width(), size.width().toFloat()),
             floatValueForLength(border.bottomLeft().height(), size.height().toFloat())),
         FloatSize(floatValueForLength(border.bottomRight().width(), size.width().toFloat()),
             floatValueForLength(border.bottomRight().height(), size.height().toFloat())));
 }
 
 StyleImage* ComputedStyle::listStyleImage() const { return rareInheritedData->listStyleImage.get(); }
-void ComputedStyle::setListStyleImage(PassRefPtrWillBeRawPtr<StyleImage> v)
+void ComputedStyle::setListStyleImage(RawPtr<StyleImage> v)
 {
     if (rareInheritedData->listStyleImage != v)
         rareInheritedData.access()->listStyleImage = v;
 }
 
 Color ComputedStyle::color() const { return inherited->color; }
 Color ComputedStyle::visitedLinkColor() const { return inherited->visitedLinkColor; }
 void ComputedStyle::setColor(const Color& v) { SET_VAR(inherited, color, v); }
 void ComputedStyle::setVisitedLinkColor(const Color& v) { SET_VAR(inherited, visitedLinkColor, v); }
 
@@ skipping 681 matching lines @@
 
 LayoutRectOutsets ComputedStyle::imageOutsets(const NinePieceImage& image) const
 {
     return LayoutRectOutsets(
         NinePieceImage::computeOutset(image.outset().top(), borderTopWidth()),
         NinePieceImage::computeOutset(image.outset().right(), borderRightWidth()),
         NinePieceImage::computeOutset(image.outset().bottom(), borderBottomWidth()),
         NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth()));
 }
 
-void ComputedStyle::setBorderImageSource(PassRefPtrWillBeRawPtr<StyleImage> image)
+void ComputedStyle::setBorderImageSource(RawPtr<StyleImage> image)
 {
     if (surround->border.m_image.image() == image.get())
         return;
     surround.access()->border.m_image.setImage(image);
 }
 
 void ComputedStyle::setBorderImageSlices(const LengthBox& slices)
 {
     if (surround->border.m_image.imageSlices() == slices)
         return;
@@ skipping 79 matching lines @@
     if (!shadowList)
         return false;
     for (size_t i = shadowList->shadows().size(); i--; ) {
         if (shadowList->shadows()[i].color().isCurrentColor())
             return true;
     }
     return false;
 }
 
 } // namespace blink