Index: Source/web/ChromeClientImpl.cpp |
diff --git a/Source/web/ChromeClientImpl.cpp b/Source/web/ChromeClientImpl.cpp |
index 6ce09ebc41cc2a801a73e7cc1b49dea998855db0..357617096656c3405cbf671b62ddb1811ba48459 100644 |
--- a/Source/web/ChromeClientImpl.cpp |
+++ b/Source/web/ChromeClientImpl.cpp |
@@ -365,7 +365,7 @@ void ChromeClientImpl::setResizable(bool value) |
bool ChromeClientImpl::shouldReportDetailedMessageForSource(const String& url) |
{ |
WebLocalFrameImpl* webframe = m_webView->mainFrameImpl(); |
- return webframe->client() && webframe->client()->shouldReportDetailedMessageForSource(url); |
+ return webframe && webframe->client() && webframe->client()->shouldReportDetailedMessageForSource(url); |
} |
void ChromeClientImpl::addMessageToConsole(LocalFrame* localFrame, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID, const String& stackTrace) |
@@ -837,6 +837,10 @@ void ChromeClientImpl::handleKeyboardEventOnTextField(HTMLInputElement& inputEle |
void ChromeClientImpl::forwardInputEvent( |
WebCore::Frame* frame, WebCore::Event* event) |
{ |
+ // FIXME: Break input events for now, but don't crash. |
+ if (frame->isRemoteFrame()) { |
+ return; |
+ } |
WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(toLocalFrameTemporary(frame)); |
// This is only called when we have out-of-process iframes, which |