Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Side by Side Diff: Source/web/WebDevToolsFrontendImpl.cpp

Issue 1100223003: bindings: Add empty checks for toV8() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/web/InspectorOverlayImpl.cpp ('k') | Source/web/WebPluginContainerImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 if (m_webFrame == frame) { 77 if (m_webFrame == frame) {
78 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 78 v8::Isolate* isolate = v8::Isolate::GetCurrent();
79 ScriptState* scriptState = ScriptState::forMainWorld(m_webFrame->frame() ); 79 ScriptState* scriptState = ScriptState::forMainWorld(m_webFrame->frame() );
80 ScriptState::Scope scope(scriptState); 80 ScriptState::Scope scope(scriptState);
81 81
82 if (m_devtoolsHost) 82 if (m_devtoolsHost)
83 m_devtoolsHost->disconnectClient(); 83 m_devtoolsHost->disconnectClient();
84 m_devtoolsHost = DevToolsHost::create(this, m_webFrame->frame()); 84 m_devtoolsHost = DevToolsHost::create(this, m_webFrame->frame());
85 v8::Local<v8::Object> global = scriptState->context()->Global(); 85 v8::Local<v8::Object> global = scriptState->context()->Global();
86 v8::Local<v8::Value> devtoolsHostObj = toV8(m_devtoolsHost.get(), global , scriptState->isolate()); 86 v8::Local<v8::Value> devtoolsHostObj = toV8(m_devtoolsHost.get(), global , scriptState->isolate());
87 ASSERT(!devtoolsHostObj.IsEmpty());
87 global->Set(v8AtomicString(isolate, "DevToolsHost"), devtoolsHostObj); 88 global->Set(v8AtomicString(isolate, "DevToolsHost"), devtoolsHostObj);
88 } 89 }
89 90
90 if (m_injectedScriptForOrigin.isEmpty()) 91 if (m_injectedScriptForOrigin.isEmpty())
91 return; 92 return;
92 93
93 String origin = frame->securityOrigin().toString(); 94 String origin = frame->securityOrigin().toString();
94 String script = m_injectedScriptForOrigin.get(origin); 95 String script = m_injectedScriptForOrigin.get(origin);
95 if (script.isEmpty()) 96 if (script.isEmpty())
96 return; 97 return;
(...skipping 27 matching lines...) Expand all
124 { 125 {
125 WebLocalFrameImpl::fromFrame(targetFrame)->viewImpl()->showContextMenuAtPoin t(x, y, menuProvider); 126 WebLocalFrameImpl::fromFrame(targetFrame)->viewImpl()->showContextMenuAtPoin t(x, y, menuProvider);
126 } 127 }
127 128
128 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, c onst String& source) 129 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, c onst String& source)
129 { 130 {
130 m_injectedScriptForOrigin.set(origin, source); 131 m_injectedScriptForOrigin.set(origin, source);
131 } 132 }
132 133
133 } // namespace blink 134 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/InspectorOverlayImpl.cpp ('k') | Source/web/WebPluginContainerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698