Diff
Modified: trunk/Source/WebCore/ChangeLog (184146 => 184147)
--- trunk/Source/WebCore/ChangeLog 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/ChangeLog 2015-05-12 02:06:54 UTC (rev 184147)
@@ -1,3 +1,51 @@
+2015-05-11 Gyuyoung Kim <[email protected]>
+
+ Purge PassRefPtr in WebCore/rendering
+ https://bugs.webkit.org/show_bug.cgi?id=144872
+
+ Reviewed by Darin Adler.
+
+ As a step to remove PassRefPtr, this patch replaces PassRefPtr with Ref in WebCore/rendering.
+
+ No new tests, no behavior changes.
+
+ * rendering/HitTestingTransformState.h:
+ (WebCore::HitTestingTransformState::create):
+ * rendering/RenderLayer.cpp:
+ (WebCore::ClipRects::create):
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::create):
+ (WebCore::RenderTheme::themeForPage):
+ * rendering/RenderThemeGtk.h:
+ * rendering/RenderThemeIOS.h:
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderTheme::themeForPage):
+ (WebCore::RenderThemeIOS::create):
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderTheme::themeForPage):
+ (WebCore::RenderThemeMac::create):
+ * rendering/RenderThemeSafari.cpp:
+ (WebCore::RenderThemeSafari::create):
+ (WebCore::RenderTheme::themeForPage):
+ * rendering/RenderThemeSafari.h:
+ * rendering/RenderThemeWin.cpp:
+ (WebCore::RenderThemeWin::create):
+ (WebCore::RenderTheme::themeForPage):
+ * rendering/RenderThemeWin.h:
+ * rendering/TextAutoSizing.h:
+ (WebCore::TextAutoSizingValue::create):
+ * rendering/style/ShapeValue.h:
+ (WebCore::ShapeValue::createShapeValue):
+ (WebCore::ShapeValue::createBoxShapeValue):
+ (WebCore::ShapeValue::createImageValue):
+ * rendering/style/StyleCachedImage.h:
+ * rendering/style/StyleCachedImageSet.h:
+ * rendering/style/StyleGeneratedImage.h:
+ * rendering/style/StylePendingImage.h:
+ * rendering/style/StyleReflection.h:
+ (WebCore::StyleReflection::create):
+
2015-05-11 Eric Carlson <[email protected]>
[Mac] Update device picker icon when video tracks change
Modified: trunk/Source/WebCore/rendering/HitTestingTransformState.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/HitTestingTransformState.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/HitTestingTransformState.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -31,7 +31,7 @@
#include "FloatQuad.h"
#include "IntSize.h"
#include "TransformationMatrix.h"
-#include <wtf/PassRefPtr.h>
+#include <wtf/Ref.h>
#include <wtf/RefCounted.h>
namespace WebCore {
@@ -42,14 +42,14 @@
// differently than move()) so care has to be taken when this is done.
class HitTestingTransformState : public RefCounted<HitTestingTransformState> {
public:
- static PassRefPtr<HitTestingTransformState> create(const FloatPoint& p, const FloatQuad& quad, const FloatQuad& area)
+ static Ref<HitTestingTransformState> create(const FloatPoint& p, const FloatQuad& quad, const FloatQuad& area)
{
- return adoptRef(new HitTestingTransformState(p, quad, area));
+ return adoptRef(*new HitTestingTransformState(p, quad, area));
}
- static PassRefPtr<HitTestingTransformState> create(const HitTestingTransformState& other)
+ static Ref<HitTestingTransformState> create(const HitTestingTransformState& other)
{
- return adoptRef(new HitTestingTransformState(other));
+ return adoptRef(*new HitTestingTransformState(other));
}
enum TransformAccumulation { FlattenTransform, AccumulateTransform };
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-05-12 02:06:54 UTC (rev 184147)
@@ -137,14 +137,14 @@
class ClipRects {
WTF_MAKE_FAST_ALLOCATED;
public:
- static PassRefPtr<ClipRects> create()
+ static Ref<ClipRects> create()
{
- return adoptRef(new ClipRects);
+ return adoptRef(*new ClipRects);
}
- static PassRefPtr<ClipRects> create(const ClipRects& other)
+ static Ref<ClipRects> create(const ClipRects& other)
{
- return adoptRef(new ClipRects(other));
+ return adoptRef(*new ClipRects(other));
}
ClipRects() = default;
Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2015-05-12 02:06:54 UTC (rev 184147)
@@ -60,15 +60,15 @@
namespace WebCore {
-PassRefPtr<RenderTheme> RenderThemeGtk::create()
+Ref<RenderTheme> RenderThemeGtk::create()
{
- return adoptRef(new RenderThemeGtk());
+ return adoptRef(*new RenderThemeGtk());
}
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page*)
{
- static RenderTheme* rt = RenderThemeGtk::create().leakRef();
- return rt;
+ static RenderTheme& rt = RenderThemeGtk::create().leakRef();
+ return &rt;
}
static double getScreenDPI()
Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderThemeGtk.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -34,7 +34,7 @@
class RenderThemeGtk final : public RenderTheme {
public:
- static PassRefPtr<RenderTheme> create();
+ static Ref<RenderTheme> create();
#if ENABLE(DATALIST_ELEMENT)
// Returns size of one slider tick mark for a horizontal track.
Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderThemeIOS.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -37,7 +37,7 @@
class RenderThemeIOS final : public RenderTheme {
public:
- static PassRefPtr<RenderTheme> create();
+ static Ref<RenderTheme> create();
virtual int popupInternalPaddingRight(RenderStyle&) const override;
Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-05-12 02:06:54 UTC (rev 184147)
@@ -291,13 +291,13 @@
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page*)
{
- static RenderTheme* renderTheme = RenderThemeIOS::create().leakRef();
- return renderTheme;
+ static RenderTheme& renderTheme = RenderThemeIOS::create().leakRef();
+ return &renderTheme;
}
-PassRefPtr<RenderTheme> RenderThemeIOS::create()
+Ref<RenderTheme> RenderThemeIOS::create()
{
- return adoptRef(new RenderThemeIOS);
+ return adoptRef(*new RenderThemeIOS);
}
static String& _contentSizeCategory()
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -42,7 +42,7 @@
class RenderThemeMac final : public RenderTheme {
public:
- static PassRefPtr<RenderTheme> create();
+ static Ref<RenderTheme> create();
// A method asking if the control changes its tint when the window has focus or not.
virtual bool controlSupportsTints(const RenderObject&) const override;
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-05-12 02:06:54 UTC (rev 184147)
@@ -201,13 +201,13 @@
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page*)
{
- static RenderTheme* rt = RenderThemeMac::create().leakRef();
- return rt;
+ static RenderTheme& rt = RenderThemeMac::create().leakRef();
+ return &rt;
}
-PassRefPtr<RenderTheme> RenderThemeMac::create()
+Ref<RenderTheme> RenderThemeMac::create()
{
- return adoptRef(new RenderThemeMac);
+ return adoptRef(*new RenderThemeMac);
}
RenderThemeMac::RenderThemeMac()
Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2015-05-12 02:06:54 UTC (rev 184147)
@@ -73,24 +73,24 @@
leftPadding
};
-PassRefPtr<RenderTheme> RenderThemeSafari::create()
+Ref<RenderTheme> RenderThemeSafari::create()
{
- return adoptRef(new RenderThemeSafari);
+ return adoptRef(*new RenderThemeSafari);
}
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
{
- static RenderTheme* safariTheme = RenderThemeSafari::create().leakRef();
- static RenderTheme* windowsTheme = RenderThemeWin::create().leakRef();
+ static RenderTheme& safariTheme = RenderThemeSafari::create().leakRef();
+ static RenderTheme& windowsTheme = RenderThemeWin::create().leakRef();
// FIXME: This is called before Settings has been initialized by WebKit, so will return a
// potentially wrong answer the very first time it's called (see
// <https://bugs.webkit.org/show_bug.cgi?id=26493>).
if (Settings::shouldPaintNativeControls()) {
RenderTheme::setCustomFocusRingColor(safariTheme->platformFocusRingColor());
- return windowsTheme; // keep the reference of one.
+ return &windowsTheme;
}
- return safariTheme; // keep the reference of one.
+ return &safariTheme;
}
#ifdef DEBUG_ALL
Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderThemeSafari.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -47,7 +47,7 @@
class RenderThemeSafari : public RenderTheme {
public:
- static PassRefPtr<RenderTheme> create();
+ static Ref<RenderTheme> create();
// A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
// position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2015-05-12 02:06:54 UTC (rev 184147)
@@ -182,15 +182,15 @@
gWebKitIsBeingUnloaded = true;
}
-PassRefPtr<RenderTheme> RenderThemeWin::create()
+Ref<RenderTheme> RenderThemeWin::create()
{
- return adoptRef(new RenderThemeWin);
+ return adoptRef(*new RenderThemeWin);
}
PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
{
- static RenderTheme* winTheme = RenderThemeWin::create().leakRef();
- return winTheme;
+ static RenderTheme& winTheme = RenderThemeWin::create().leakRef();
+ return &winTheme;
}
RenderThemeWin::RenderThemeWin()
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/RenderThemeWin.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -49,7 +49,7 @@
class RenderThemeWin final: public RenderTheme {
public:
- static PassRefPtr<RenderTheme> create();
+ static Ref<RenderTheme> create();
virtual String extraDefaultStyleSheet() override;
virtual String extraQuirksStyleSheet() override;
Modified: trunk/Source/WebCore/rendering/TextAutoSizing.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/TextAutoSizing.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/TextAutoSizing.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -73,9 +73,9 @@
class TextAutoSizingValue : public RefCounted<TextAutoSizingValue> {
public:
- static PassRefPtr<TextAutoSizingValue> create()
+ static Ref<TextAutoSizingValue> create()
{
- return adoptRef(new TextAutoSizingValue);
+ return adoptRef(*new TextAutoSizingValue);
}
void addNode(Node*, float size);
Modified: trunk/Source/WebCore/rendering/style/ShapeValue.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/style/ShapeValue.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/style/ShapeValue.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -46,19 +46,19 @@
Image
};
- static PassRefPtr<ShapeValue> createShapeValue(PassRefPtr<BasicShape> shape, CSSBoxType cssBox)
+ static Ref<ShapeValue> createShapeValue(PassRefPtr<BasicShape> shape, CSSBoxType cssBox)
{
- return adoptRef(new ShapeValue(shape, cssBox));
+ return adoptRef(*new ShapeValue(shape, cssBox));
}
- static PassRefPtr<ShapeValue> createBoxShapeValue(CSSBoxType boxShape)
+ static Ref<ShapeValue> createBoxShapeValue(CSSBoxType boxShape)
{
- return adoptRef(new ShapeValue(boxShape));
+ return adoptRef(*new ShapeValue(boxShape));
}
- static PassRefPtr<ShapeValue> createImageValue(PassRefPtr<StyleImage> image)
+ static Ref<ShapeValue> createImageValue(PassRefPtr<StyleImage> image)
{
- return adoptRef(new ShapeValue(image));
+ return adoptRef(*new ShapeValue(image));
}
Type type() const { return m_type; }
Modified: trunk/Source/WebCore/rendering/style/StyleCachedImage.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/style/StyleCachedImage.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImage.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -35,7 +35,7 @@
class StyleCachedImage final : public StyleImage, private CachedImageClient {
WTF_MAKE_FAST_ALLOCATED;
public:
- static PassRefPtr<StyleCachedImage> create(CachedImage* image) { return adoptRef(new StyleCachedImage(image)); }
+ static Ref<StyleCachedImage> create(CachedImage* image) { return adoptRef(*new StyleCachedImage(image)); }
virtual ~StyleCachedImage();
virtual CachedImage* cachedImage() const override { return m_image.get(); }
Modified: trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -43,9 +43,9 @@
class StyleCachedImageSet final : public StyleImage, private CachedImageClient {
WTF_MAKE_FAST_ALLOCATED;
public:
- static PassRefPtr<StyleCachedImageSet> create(CachedImage* image, float imageScaleFactor, CSSImageSetValue* value)
+ static Ref<StyleCachedImageSet> create(CachedImage* image, float imageScaleFactor, CSSImageSetValue* value)
{
- return adoptRef(new StyleCachedImageSet(image, imageScaleFactor, value));
+ return adoptRef(*new StyleCachedImageSet(image, imageScaleFactor, value));
}
virtual ~StyleCachedImageSet();
Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -33,9 +33,9 @@
class StyleGeneratedImage final : public StyleImage {
public:
- static PassRefPtr<StyleGeneratedImage> create(Ref<CSSImageGeneratorValue>&& value)
+ static Ref<StyleGeneratedImage> create(Ref<CSSImageGeneratorValue>&& value)
{
- return adoptRef(new StyleGeneratedImage(WTF::move(value)));
+ return adoptRef(*new StyleGeneratedImage(WTF::move(value)));
}
CSSImageGeneratorValue& imageValue() { return m_imageGeneratorValue; }
Modified: trunk/Source/WebCore/rendering/style/StylePendingImage.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/style/StylePendingImage.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/style/StylePendingImage.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -43,7 +43,7 @@
class StylePendingImage final : public StyleImage {
public:
- static PassRefPtr<StylePendingImage> create(CSSValue* value) { return adoptRef(new StylePendingImage(value)); }
+ static Ref<StylePendingImage> create(CSSValue* value) { return adoptRef(*new StylePendingImage(value)); }
CSSImageValue* cssImageValue() const { return is<CSSImageValue>(m_value) ? downcast<CSSImageValue>(m_value) : nullptr; }
CSSImageGeneratorValue* cssImageGeneratorValue() const { return m_value && m_value->isImageGeneratorValue() ? static_cast<CSSImageGeneratorValue*>(m_value) : nullptr; }
Modified: trunk/Source/WebCore/rendering/style/StyleReflection.h (184146 => 184147)
--- trunk/Source/WebCore/rendering/style/StyleReflection.h 2015-05-12 01:54:51 UTC (rev 184146)
+++ trunk/Source/WebCore/rendering/style/StyleReflection.h 2015-05-12 02:06:54 UTC (rev 184147)
@@ -34,9 +34,9 @@
class StyleReflection : public RefCounted<StyleReflection> {
public:
- static PassRefPtr<StyleReflection> create()
+ static Ref<StyleReflection> create()
{
- return adoptRef(new StyleReflection);
+ return adoptRef(*new StyleReflection);
}
bool operator==(const StyleReflection& o) const
