diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/rendering/style/StyleBackgroundData.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/rendering/style/StyleBackgroundData.cpp')
| -rw-r--r-- | Source/WebCore/rendering/style/StyleBackgroundData.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
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 |