diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebKit/cf | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebKit/cf')
| -rw-r--r-- | WebKit/cf/ChangeLog | 10 | ||||
| -rw-r--r-- | WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp | 17 |
2 files changed, 11 insertions, 16 deletions
diff --git a/WebKit/cf/ChangeLog b/WebKit/cf/ChangeLog index 957dce1..1efdd4d 100644 --- a/WebKit/cf/ChangeLog +++ b/WebKit/cf/ChangeLog @@ -1,3 +1,13 @@ +2010-10-18 Pavel Feldman <pfeldman@chromium.org> + + Reviewed by Simon Fraser. + + Web Inspector: [crash] when Inspector Open in CSSStyleSelector::loadPendingImages(). + https://bugs.webkit.org/show_bug.cgi?id=46224 + + * WebCoreSupport/WebInspectorClientCF.cpp: + (WebInspectorClient::sendMessageToFrontend): + 2010-06-14 Ilya Tikhonovsky <loislo@chromium.org> Reviewed by Pavel Feldman. diff --git a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp index dc5a186..62fdd4d 100644 --- a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp +++ b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp @@ -102,20 +102,5 @@ void WebInspectorClient::releaseFrontendPage() bool WebInspectorClient::sendMessageToFrontend(const String& message) { - if (!m_frontendPage) - return false; - - Frame* frame = m_frontendPage->mainFrame(); - if (!frame) - return false; - - ScriptController* scriptController = frame->script(); - if (!scriptController) - return false; - - String dispatchToFrontend("WebInspector.dispatchMessageFromBackend("); - dispatchToFrontend += message; - dispatchToFrontend += ");"; - scriptController->executeScript(dispatchToFrontend); - return true; + return doDispatchMessageOnFrontendPage(m_frontendPage, message); } |