Index: Source/web/WebViewImpl.cpp |
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp |
index a702afc94dfd29e9d25ff316072bf0ba60b6486a..d89b373f3b7ab89b0f773d35498b9aa7dfec788a 100644 |
--- a/Source/web/WebViewImpl.cpp |
+++ b/Source/web/WebViewImpl.cpp |
@@ -209,10 +209,10 @@ const double WebView::maxTextSizeMultiplier = 3.0; |
// Used to defer all page activity in cases where the embedder wishes to run |
// a nested event loop. Using a stack enables nesting of message loop invocations. |
-static Vector<ScopedPageLoadDeferrer*>& pageLoadDeferrerStack() |
+static WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer> >& pageLoadDeferrerStack() |
{ |
- DEFINE_STATIC_LOCAL(Vector<ScopedPageLoadDeferrer*>, deferrerStack, ()); |
- return deferrerStack; |
+ DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer> > >, deferrerStack, (adoptPtrWillBeNoop(new WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer> > ()))); |
+ return *deferrerStack; |
} |
// Ensure that the WebDragOperation enum values stay in sync with the original |
@@ -315,16 +315,30 @@ void WebView::didExitModalLoop() |
{ |
ASSERT(pageLoadDeferrerStack().size()); |
- delete pageLoadDeferrerStack().last(); |
+ ScopedPageLoadDeferrer* deferrer = pageLoadDeferrerStack().last(); |
+#if ENABLE(OILPAN) |
+ deferrer->dispose(); |
+#else |
+ delete deferrer; |
haraken
2014/09/08 07:25:59
Can we use OwnPtr<ScopedPageLoadDeferrer> and avoi
sof
2014/09/08 21:17:46
I don't quite see where you're going with this.
|
+#endif |
pageLoadDeferrerStack().removeLast(); |
} |
void WebViewImpl::setMainFrame(WebFrame* frame) |
{ |
- if (frame->isWebLocalFrame()) |
+ if (frame->isWebLocalFrame()) { |
+#if ENABLE(OILPAN) |
+ m_localMainFrame = toWebLocalFrameImpl(frame); |
+ m_remoteMainFrame.clear(); |
haraken
2014/09/08 07:25:59
Can we add an ASSERT somewhere to verify that only
sof
2014/09/08 21:17:47
assert added to ~WebViewImpl.
|
+#endif |
toWebLocalFrameImpl(frame)->initializeCoreFrame(&page()->frameHost(), 0, nullAtom, nullAtom); |
- else |
+ } else { |
+#if ENABLE(OILPAN) |
+ m_localMainFrame.clear(); |
+ m_remoteMainFrame = toWebRemoteFrameImpl(frame); |
+#endif |
toWebRemoteFrameImpl(frame)->initializeCoreFrame(&page()->frameHost(), 0, nullAtom); |
+ } |
} |
void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient) |
@@ -954,7 +968,7 @@ bool WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event) |
return true; |
} |
- RefPtr<Frame> focusedFrame = focusedCoreFrame(); |
+ RefPtrWillBeRawPtr<Frame> focusedFrame = focusedCoreFrame(); |
if (focusedFrame && focusedFrame->isRemoteFrameTemporary()) { |
WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(toLocalFrameTemporary(focusedFrame.get())); |
webFrame->client()->forwardInputEvent(&event); |
@@ -964,7 +978,7 @@ bool WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event) |
if (!focusedFrame || !focusedFrame->isLocalFrame()) |
return false; |
- RefPtr<LocalFrame> frame = toLocalFrame(focusedFrame.get()); |
+ LocalFrame* frame = toLocalFrame(focusedFrame.get()); |
PlatformKeyboardEventBuilder evt(event); |
@@ -2020,7 +2034,7 @@ void WebViewImpl::setFocus(bool enable) |
m_page->focusController().setFocused(enable); |
if (enable) { |
m_page->focusController().setActive(true); |
- RefPtr<Frame> focusedFrame = m_page->focusController().focusedFrame(); |
+ RefPtrWillBeRawPtr<Frame> focusedFrame = m_page->focusController().focusedFrame(); |
if (focusedFrame && focusedFrame->isLocalFrame()) { |
LocalFrame* localFrame = toLocalFrame(focusedFrame.get()); |
Element* element = localFrame->document()->focusedElement(); |
@@ -2053,7 +2067,7 @@ void WebViewImpl::setFocus(bool enable) |
if (!frame) |
return; |
- RefPtr<Frame> focusedFrame = m_page->focusController().focusedFrame(); |
+ RefPtrWillBeRawPtr<Frame> focusedFrame = m_page->focusController().focusedFrame(); |
if (focusedFrame && focusedFrame->isLocalFrame()) { |
// Finish an ongoing composition to delete the composition node. |
if (toLocalFrame(focusedFrame.get())->inputMethodController().hasComposition()) { |
@@ -2663,7 +2677,7 @@ void WebViewImpl::setInitialFocus(bool reverse) |
void WebViewImpl::clearFocusedElement() |
{ |
- RefPtr<Frame> frame = focusedCoreFrame(); |
+ RefPtrWillBeRawPtr<Frame> frame = focusedCoreFrame(); |
if (!frame || !frame->isLocalFrame()) |
return; |