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(); |
} |