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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 317493002: Change FrameTree to return Frames instead of LocalFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed conflicts Created 6 years, 6 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
« Source/web/WebLocalFrameImpl.cpp ('K') | « Source/web/WebLocalFrameImpl.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 7e01dcd7ec4abdcb1b1114aa8160bb284f31b9e5..6830c5a31258b5468bf0b558fbce411711527b74 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -2453,9 +2453,11 @@ WebFrame* WebViewImpl::findFrameByName(
{
if (!relativeToFrame)
relativeToFrame = mainFrame();
- LocalFrame* frame = toWebLocalFrameImpl(relativeToFrame)->frame();
+ Frame* frame = toWebLocalFrameImpl(relativeToFrame)->frame();
frame = frame->tree().find(name);
- return WebLocalFrameImpl::fromFrame(frame);
+ if (!frame->isLocalFrame())
+ return 0;
+ return WebLocalFrameImpl::fromFrame(toLocalFrame(frame));
dcheng 2014/06/04 18:06:37 Ditto--add a FIXME here. Either this should only d
kenrb 2014/06/04 20:34:47 Done.
}
WebFrame* WebViewImpl::focusedFrame()
@@ -3237,8 +3239,10 @@ void WebViewImpl::dragTargetDrop(const WebPoint& clientPoint,
void WebViewImpl::spellingMarkers(WebVector<uint32_t>* markers)
{
Vector<uint32_t> result;
- for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
- const WillBeHeapVector<DocumentMarker*>& documentMarkers = frame->document()->markers().markers();
+ for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ if (!frame->isLocalFrame())
+ continue;
+ const WillBeHeapVector<DocumentMarker*>& documentMarkers = toLocalFrame(frame)->document()->markers().markers();
for (size_t i = 0; i < documentMarkers.size(); ++i)
result.append(documentMarkers[i]->hash());
}
@@ -3436,9 +3440,10 @@ void WebViewImpl::hidePopups()
void WebViewImpl::setIsTransparent(bool isTransparent)
{
// Set any existing frames to be transparent.
- LocalFrame* frame = m_page->mainFrame();
+ Frame* frame = m_page->mainFrame();
while (frame) {
- frame->view()->setTransparent(isTransparent);
+ if (frame->isLocalFrame())
+ toLocalFrame(frame)->view()->setTransparent(isTransparent);
frame = frame->tree().traverseNext();
}
« Source/web/WebLocalFrameImpl.cpp ('K') | « Source/web/WebLocalFrameImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698