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

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: Created 5 years, 8 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
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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 if (m_webFrame == frame) { 78 if (m_webFrame == frame) {
79 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 79 v8::Isolate* isolate = v8::Isolate::GetCurrent();
80 ScriptState* scriptState = ScriptState::forMainWorld(m_webFrame->frame() ); 80 ScriptState* scriptState = ScriptState::forMainWorld(m_webFrame->frame() );
81 ScriptState::Scope scope(scriptState); 81 ScriptState::Scope scope(scriptState);
82 82
83 if (m_devtoolsHost) 83 if (m_devtoolsHost)
84 m_devtoolsHost->disconnectClient(); 84 m_devtoolsHost->disconnectClient();
85 m_devtoolsHost = DevToolsHost::create(this, m_webFrame->frame()); 85 m_devtoolsHost = DevToolsHost::create(this, m_webFrame->frame());
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 ASSERT(!devtoolsHostObj.IsEmpty());
haraken 2015/04/28 04:24:59 Who guarantees this is not empty?
bashi 2015/04/28 05:41:53 This is DevTool related code so I just guessed tha
88 global->Set(v8AtomicString(isolate, "DevToolsHost"), devtoolsHostObj); 89 global->Set(v8AtomicString(isolate, "DevToolsHost"), devtoolsHostObj);
89 } 90 }
90 91
91 if (m_injectedScriptForOrigin.isEmpty()) 92 if (m_injectedScriptForOrigin.isEmpty())
92 return; 93 return;
93 94
94 String origin = frame->securityOrigin().toString(); 95 String origin = frame->securityOrigin().toString();
95 String script = m_injectedScriptForOrigin.get(origin); 96 String script = m_injectedScriptForOrigin.get(origin);
96 if (script.isEmpty()) 97 if (script.isEmpty())
97 return; 98 return;
(...skipping 27 matching lines...) Expand all
125 { 126 {
126 WebLocalFrameImpl::fromFrame(targetFrame)->viewImpl()->showContextMenuAtPoin t(x, y, menuProvider); 127 WebLocalFrameImpl::fromFrame(targetFrame)->viewImpl()->showContextMenuAtPoin t(x, y, menuProvider);
127 } 128 }
128 129
129 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, c onst String& source) 130 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, c onst String& source)
130 { 131 {
131 m_injectedScriptForOrigin.set(origin, source); 132 m_injectedScriptForOrigin.set(origin, source);
132 } 133 }
133 134
134 } // namespace blink 135 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698