third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp - Issue 1442643003: Oilpan: move WebPluginLoadObserver to the heap.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1442643003: Oilpan: move WebPluginLoadObserver to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: provide clearPluginContainer() w/ non-Oilpan only Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

index f759d64c16db09e33474834105355075a067529e..f3280030098f998aee477f75977de7e109fe9c65 100644

--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

@@ -472,7 +472,7 @@ void FrameLoaderClientImpl::dispatchDidCommitLoad(HistoryItem* item, HistoryComm

void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad(

const ResourceError& error, HistoryCommitType commitType)

{

- OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().provisionalDocumentLoader());

+ OwnPtrWillBeRawPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().provisionalDocumentLoader());

m_webFrame->didFail(error, true, commitType);

if (observer)

observer->didFailLoading(error);

@@ -480,7 +480,7 @@ void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad(

void FrameLoaderClientImpl::dispatchDidFailLoad(const ResourceError& error, HistoryCommitType commitType)

{

- OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().documentLoader());

+ OwnPtrWillBeRawPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().documentLoader());

m_webFrame->didFail(error, false, commitType);

if (observer)

observer->didFailLoading(error);

@@ -492,7 +492,7 @@ void FrameLoaderClientImpl::dispatchDidFailLoad(const ResourceError& error, Hist

void FrameLoaderClientImpl::dispatchDidFinishLoad()

{

- OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().documentLoader());

+ OwnPtrWillBeRawPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().documentLoader());

if (m_webFrame->client())

m_webFrame->client()->didFinishLoad(m_webFrame);

@@ -838,7 +838,7 @@ ObjectContentType FrameLoaderClientImpl::objectContentType(

return ObjectContentNone;

}

-PassOwnPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver(DocumentLoader* loader)

+PassOwnPtrWillBeRawPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver(DocumentLoader* loader)

{

return WebDataSourceImpl::fromDocumentLoader(loader)->releasePluginLoadObserver();

}