diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp')
| -rw-r--r-- | Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp b/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp index 6bd5abb..ce1732b 100644 --- a/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp +++ b/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp @@ -36,7 +36,6 @@ #include "Frame.h" #include "InjectedScript.h" #include "InjectedScriptHost.h" -#include "InspectorController.h" #include "InspectorValues.h" #include "Node.h" #include "Page.h" @@ -147,8 +146,7 @@ v8::Handle<v8::Value> V8InjectedScriptHost::nodeForIdCallback(const v8::Argument if (!node) return v8::Undefined(); - InspectorController* ic = host->inspectorController(); - if (!ic) + if (!host->inspectorAgent()) return v8::Undefined(); return toV8(node); |