| Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
 | 
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
 | 
| index 382a9d020e2dce7c7ba2eee758962bee952611da..bbfd7efe2b9b3ff0616b944cdc02cf2ec29fb75e 100644
 | 
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
 | 
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
 | 
| @@ -813,7 +813,7 @@ void ComputedStyle::updatePropertySpecificDifferences(const ComputedStyle& other
 | 
|      }
 | 
|  }
 | 
|  
 | 
| -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)
 | 
| @@ -825,7 +825,7 @@ void ComputedStyle::addCursor(PassRefPtrWillBeRawPtr<StyleImage> image, bool hot
 | 
|      rareInheritedData.access()->cursorData->append(CursorData(image, hotSpotSpecified, hotSpot));
 | 
|  }
 | 
|  
 | 
| -void ComputedStyle::setCursorList(PassRefPtrWillBeRawPtr<CursorList> other)
 | 
| +void ComputedStyle::setCursorList(RawPtr<CursorList> other)
 | 
|  {
 | 
|      rareInheritedData.access()->cursorData = other;
 | 
|  }
 | 
| @@ -853,9 +853,9 @@ void ComputedStyle::clearContent()
 | 
|          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;
 | 
|      ContentData* lastContent = content.get();
 | 
|      while (lastContent && lastContent->next())
 | 
|          lastContent = lastContent->next();
 | 
| @@ -866,7 +866,7 @@ void ComputedStyle::appendContent(PassOwnPtrWillBeRawPtr<ContentData> contentDat
 | 
|          content = contentData;
 | 
|  }
 | 
|  
 | 
| -void ComputedStyle::setContent(PassRefPtrWillBeRawPtr<StyleImage> image, bool add)
 | 
| +void ComputedStyle::setContent(RawPtr<StyleImage> image, bool add)
 | 
|  {
 | 
|      if (!image)
 | 
|          return;
 | 
| @@ -881,7 +881,7 @@ void ComputedStyle::setContent(PassRefPtrWillBeRawPtr<StyleImage> image, bool ad
 | 
|  
 | 
|  void ComputedStyle::setContent(const String& string, bool add)
 | 
|  {
 | 
| -    OwnPtrWillBePersistent<ContentData>& content = rareNonInheritedData.access()->m_content;
 | 
| +    Persistent<ContentData>& content = rareNonInheritedData.access()->m_content;
 | 
|      if (add) {
 | 
|          ContentData* lastContent = content.get();
 | 
|          while (lastContent && lastContent->next())
 | 
| @@ -1086,7 +1086,7 @@ static FloatRoundedRect::Radii calcRadiiFor(const BorderData& border, LayoutSize
 | 
|  }
 | 
|  
 | 
|  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;
 | 
| @@ -1788,7 +1788,7 @@ LayoutRectOutsets ComputedStyle::imageOutsets(const NinePieceImage& image) const
 | 
|          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;
 | 
| 
 |