| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2010 Google Inc. All rights reserved. | 2  * Copyright (C) 2010 Google Inc. All rights reserved. | 
| 3  * | 3  * | 
| 4  * Redistribution and use in source and binary forms, with or without | 4  * Redistribution and use in source and binary forms, with or without | 
| 5  * modification, are permitted provided that the following conditions are | 5  * modification, are permitted provided that the following conditions are | 
| 6  * met: | 6  * met: | 
| 7  * | 7  * | 
| 8  *     * Redistributions of source code must retain the above copyright | 8  *     * Redistributions of source code must retain the above copyright | 
| 9  * notice, this list of conditions and the following disclaimer. | 9  * notice, this list of conditions and the following disclaimer. | 
| 10  *     * Redistributions in binary form must reproduce the above | 10  *     * Redistributions in binary form must reproduce the above | 
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 86         v8::Handle<v8::Object> global = scriptState->context()->Global(); | 86         v8::Handle<v8::Object> global = scriptState->context()->Global(); | 
| 87         v8::Handle<v8::Value> devtoolsHostObj = toV8(m_devtoolsHost.get(), globa
     l, scriptState->isolate()); | 87         v8::Handle<v8::Value> devtoolsHostObj = toV8(m_devtoolsHost.get(), globa
     l, scriptState->isolate()); | 
| 88         global->Set(v8::String::NewFromUtf8(isolate, "DevToolsHost"), devtoolsHo
     stObj); | 88         global->Set(v8::String::NewFromUtf8(isolate, "DevToolsHost"), devtoolsHo
     stObj); | 
| 89     } | 89     } | 
| 90 | 90 | 
| 91     if (m_injectedScriptForOrigin.isEmpty()) | 91     if (m_injectedScriptForOrigin.isEmpty()) | 
| 92         return; | 92         return; | 
| 93 | 93 | 
| 94     String origin = frame->securityOrigin().toString(); | 94     String origin = frame->securityOrigin().toString(); | 
| 95     String script = m_injectedScriptForOrigin.get(origin); | 95     String script = m_injectedScriptForOrigin.get(origin); | 
| 96     if (!script.isEmpty()) | 96     if (script.isEmpty()) | 
| 97         frame->frame()->script().executeScriptInMainWorld(script + "()"); | 97         return; | 
|  | 98     static int s_lastScriptId = 0; | 
|  | 99     StringBuilder scriptWithId; | 
|  | 100     scriptWithId.append(script); | 
|  | 101     scriptWithId.append('('); | 
|  | 102     scriptWithId.appendNumber(++s_lastScriptId); | 
|  | 103     scriptWithId.append(')'); | 
|  | 104     frame->frame()->script().executeScriptInMainWorld(scriptWithId.toString()); | 
| 98 } | 105 } | 
| 99 | 106 | 
| 100 void WebDevToolsFrontendImpl::sendMessageToBackend(const String& message) | 107 void WebDevToolsFrontendImpl::sendMessageToBackend(const String& message) | 
| 101 { | 108 { | 
| 102     if (m_client) | 109     if (m_client) | 
| 103         m_client->sendMessageToBackend(message); | 110         m_client->sendMessageToBackend(message); | 
| 104 } | 111 } | 
| 105 | 112 | 
| 106 void WebDevToolsFrontendImpl::sendMessageToEmbedder(const String& message) | 113 void WebDevToolsFrontendImpl::sendMessageToEmbedder(const String& message) | 
| 107 { | 114 { | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 118 { | 125 { | 
| 119     WebLocalFrameImpl::fromFrame(targetFrame)->viewImpl()->showContextMenuAtPoin
     t(x, y, menuProvider); | 126     WebLocalFrameImpl::fromFrame(targetFrame)->viewImpl()->showContextMenuAtPoin
     t(x, y, menuProvider); | 
| 120 } | 127 } | 
| 121 | 128 | 
| 122 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, c
     onst String& source) | 129 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, c
     onst String& source) | 
| 123 { | 130 { | 
| 124     m_injectedScriptForOrigin.set(origin, source); | 131     m_injectedScriptForOrigin.set(origin, source); | 
| 125 } | 132 } | 
| 126 | 133 | 
| 127 } // namespace blink | 134 } // namespace blink | 
| OLD | NEW | 
|---|