Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1240)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutTestHelper.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutTestHelper.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutTestHelper.h b/third_party/WebKit/Source/core/layout/LayoutTestHelper.h
index ec7183c3f7082e43c93762693b11e21be1e6b881..fb0aaf129fedfda32c30bbc5f29fd228cdc8fb16 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTestHelper.h
+++ b/third_party/WebKit/Source/core/layout/LayoutTestHelper.h
@@ -23,7 +23,7 @@ class RenderingTest : public testing::Test {
public:
virtual FrameSettingOverrideFunction settingOverrider() const { return nullptr; }
- RenderingTest(PassOwnPtrWillBeRawPtr<FrameLoaderClient> = nullptr);
+ RenderingTest(RawPtr<FrameLoaderClient> = nullptr);
protected:
void SetUp() override;
@@ -57,15 +57,15 @@ protected:
}
private:
- RefPtrWillBePersistent<LocalFrame> m_subframe;
- OwnPtrWillBePersistent<FrameLoaderClient> m_frameLoaderClient;
- OwnPtrWillBePersistent<FrameLoaderClient> m_childFrameLoaderClient;
+ Persistent<LocalFrame> m_subframe;
+ Persistent<FrameLoaderClient> m_frameLoaderClient;
+ Persistent<FrameLoaderClient> m_childFrameLoaderClient;
OwnPtr<DummyPageHolder> m_pageHolder;
};
class SingleChildFrameLoaderClient final : public EmptyFrameLoaderClient {
public:
- static PassOwnPtrWillBeRawPtr<SingleChildFrameLoaderClient> create() { return adoptPtrWillBeNoop(new SingleChildFrameLoaderClient); }
+ static RawPtr<SingleChildFrameLoaderClient> create() { return adoptPtrWillBeNoop(new SingleChildFrameLoaderClient); }
DEFINE_INLINE_VIRTUAL_TRACE()
{
@@ -81,14 +81,14 @@ public:
private:
SingleChildFrameLoaderClient() : m_child(nullptr) { }
- RefPtrWillBeMember<Frame> m_child;
+ Member<Frame> m_child;
};
class FrameLoaderClientWithParent final : public EmptyFrameLoaderClient {
public:
- static PassOwnPtrWillBeRawPtr<FrameLoaderClientWithParent> create(Frame* parent)
+ static RawPtr<FrameLoaderClientWithParent> create(Frame* parent)
{
- return adoptPtrWillBeNoop(new FrameLoaderClientWithParent(parent));
+ return new FrameLoaderClientWithParent(parent);
}
DEFINE_INLINE_VIRTUAL_TRACE()
@@ -102,7 +102,7 @@ public:
private:
explicit FrameLoaderClientWithParent(Frame* parent) : m_parent(parent) { }
- RefPtrWillBeMember<Frame> m_parent;
+ Member<Frame> m_parent;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698