Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760

1 files changed, 27 insertions, 0 deletions

diff --git a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
index 0d66b83..dc5a186 100644
--- a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
+++ b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
@@ -53,6 +53,8 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
+#include <WebCore/Frame.h>
+#include <WebCore/Page.h>
 #include <WebCore/PlatformString.h>
 
 #include <wtf/RetainPtr.h>
@@ -92,3 +94,28 @@ void WebInspectorClient::storeSetting(const String& key, const String& setting)
     RetainPtr<CFStringRef> preferencesKey(AdoptCF, createKeyForPreferences(key));
     CFPreferencesSetAppValue(preferencesKey.get(), objectToStore.get(), kCFPreferencesCurrentApplication);
 }
+
+void WebInspectorClient::releaseFrontendPage()
+{
+    m_frontendPage = 0;
+}
+
+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;
+}