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

Unified Diff: third_party/WebKit/Source/web/WebFrame.cpp

Issue 1865813002: Remove RawPtr from Source/web/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 8 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/web/WebFrame.cpp
diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp
index c44e647745ca5b521494c2395301877467faaaf9..fa88262f30b2b16ec7d07a2597be5bcf1699a740 100644
--- a/third_party/WebKit/Source/web/WebFrame.cpp
+++ b/third_party/WebKit/Source/web/WebFrame.cpp
@@ -28,10 +28,7 @@ namespace blink {
bool WebFrame::swap(WebFrame* frame)
{
using std::swap;
- RawPtr<Frame> oldFrame = toImplBase()->frame();
-#if !ENABLE(OILPAN)
- RefPtr<WebFrameImplBase> protectThis = toImplBase();
-#endif
+ Frame* oldFrame = toImplBase()->frame();
// Unload the current Document in this frame: this calls unload handlers,
// detaches child frames, etc. Since this runs script, make sure this frame
@@ -72,13 +69,6 @@ bool WebFrame::swap(WebFrame* frame)
AtomicString name = oldFrame->tree().name();
AtomicString uniqueName = oldFrame->tree().uniqueName();
FrameOwner* owner = oldFrame->owner();
-#if !ENABLE(OILPAN)
- // Persistence of a remote frame owner is complicated in the pre-Oilpan
- // world. Please see RemoteFrameOwner::setContentFrame() for the details.
- RefPtr<RemoteFrameOwner> remoteOwnerProtector;
- if (owner && owner->isRemote())
- remoteOwnerProtector = toRemoteFrameOwner(owner);
-#endif
v8::HandleScope handleScope(v8::Isolate::GetCurrent());
HashMap<DOMWrapperWorld*, v8::Local<v8::Object>> globals;
@@ -276,7 +266,7 @@ WebFrame* WebFrame::findChildByName(const WebString& name) const
WebFrame* WebFrame::fromFrameOwnerElement(const WebElement& webElement)
{
- Element* element = RawPtr<Element>(webElement).get();
+ Element* element = webElement;
if (!element->isFrameOwnerElement())
return nullptr;
« no previous file with comments | « third_party/WebKit/Source/web/WebFormElement.cpp ('k') | third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698