| Index: third_party/WebKit/Source/core/frame/Frame.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/Frame.cpp b/third_party/WebKit/Source/core/frame/Frame.cpp
|
| index f89aeca20b0f146cd01e8296a1ac3299a7e5f8b3..a7bda7e682f5e4fe7a8f2099f1f9b9411701c2d8 100644
|
| --- a/third_party/WebKit/Source/core/frame/Frame.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/Frame.cpp
|
| @@ -102,7 +102,7 @@ void Frame::detach(FrameDetachType type)
|
|
|
| void Frame::detachChildren()
|
| {
|
| - typedef WillBeHeapVector<RefPtrWillBeMember<Frame>> FrameVector;
|
| + typedef HeapVector<Member<Frame>> FrameVector;
|
| FrameVector childrenToDetach;
|
| childrenToDetach.reserveCapacity(tree().childCount());
|
| for (Frame* child = tree().firstChild(); child; child = child->tree().nextSibling())
|
| @@ -154,7 +154,7 @@ HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const
|
|
|
| static ChromeClient& emptyChromeClient()
|
| {
|
| - DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<EmptyChromeClient>, client, (EmptyChromeClient::create()));
|
| + DEFINE_STATIC_LOCAL(Persistent<EmptyChromeClient>, client, (EmptyChromeClient::create()));
|
| return *client;
|
| }
|
|
|
|
|