From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 27 Jun 2017 06:07:23 +0000
Subject: webkitgtk-2.16.5

---
 .../rendering/style/StyleBackgroundData.cpp        | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'Source/WebCore/rendering/style/StyleBackgroundData.cpp')

diff --git a/Source/WebCore/rendering/style/StyleBackgroundData.cpp b/Source/WebCore/rendering/style/StyleBackgroundData.cpp
index c51b8255f..ae3835c79 100644
--- a/Source/WebCore/rendering/style/StyleBackgroundData.cpp
+++ b/Source/WebCore/rendering/style/StyleBackgroundData.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Apple Inc. 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
@@ -28,36 +28,36 @@
 namespace WebCore {
 
 StyleBackgroundData::StyleBackgroundData()
-    : m_background(BackgroundFillLayer)
-    , m_color(RenderStyle::initialBackgroundColor())
+    : background(BackgroundFillLayer)
+    , color(RenderStyle::initialBackgroundColor())
 {
 }
 
-inline StyleBackgroundData::StyleBackgroundData(const StyleBackgroundData& o)
+inline StyleBackgroundData::StyleBackgroundData(const StyleBackgroundData& other)
     : RefCounted<StyleBackgroundData>()
-    , m_background(o.m_background)
-    , m_color(o.m_color)
-    , m_outline(o.m_outline)
+    , background(other.background)
+    , color(other.color)
+    , outline(other.outline)
 {
 }
 
-PassRef<StyleBackgroundData> StyleBackgroundData::copy() const
+Ref<StyleBackgroundData> StyleBackgroundData::copy() const
 {
     return adoptRef(*new StyleBackgroundData(*this));
 }
 
-bool StyleBackgroundData::operator==(const StyleBackgroundData& o) const
+bool StyleBackgroundData::operator==(const StyleBackgroundData& other) const
 {
-    return m_background == o.m_background && m_color == o.m_color && m_outline == o.m_outline;
+    return background == other.background && color == other.color && outline == other.outline;
 }
 
 bool StyleBackgroundData::isEquivalentForPainting(const StyleBackgroundData& other) const
 {
-    if (m_background != other.m_background || m_color != other.m_color)
+    if (background != other.background || color != other.color)
         return false;
-    if (!m_outline.isVisible() && !other.m_outline.isVisible())
+    if (!outline.isVisible() && !other.outline.isVisible())
         return true;
-    return m_outline == other.m_outline;
+    return outline == other.outline;
 }
 
 } // namespace WebCore
-- 
cgit v1.2.1