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

Side by Side Diff: Source/bindings/core/v8/V8Binding.cpp

Issue 366223006: createTreeWalker and createNodeIterator should deal with null NodeFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use fully qualified variable name Created 6 years, 5 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 | « LayoutTests/fast/dom/TreeWalker/TreeWalker-basic-expected.txt ('k') | no next file » | 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) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 }; 142 };
143 143
144 v8::ArrayBuffer::Allocator* v8ArrayBufferAllocator() 144 v8::ArrayBuffer::Allocator* v8ArrayBufferAllocator()
145 { 145 {
146 DEFINE_STATIC_LOCAL(ArrayBufferAllocator, arrayBufferAllocator, ()); 146 DEFINE_STATIC_LOCAL(ArrayBufferAllocator, arrayBufferAllocator, ());
147 return &arrayBufferAllocator; 147 return &arrayBufferAllocator;
148 } 148 }
149 149
150 PassRefPtrWillBeRawPtr<NodeFilter> toNodeFilter(v8::Handle<v8::Value> callback, v8::Handle<v8::Object> creationContext, ScriptState* scriptState) 150 PassRefPtrWillBeRawPtr<NodeFilter> toNodeFilter(v8::Handle<v8::Value> callback, v8::Handle<v8::Object> creationContext, ScriptState* scriptState)
151 { 151 {
152 if (callback->IsNull())
153 return nullptr;
152 RefPtrWillBeRawPtr<NodeFilter> filter = NodeFilter::create(); 154 RefPtrWillBeRawPtr<NodeFilter> filter = NodeFilter::create();
153 155
154 v8::Handle<v8::Object> filterWrapper = toV8(filter, creationContext, scriptS tate->isolate()).As<v8::Object>(); 156 v8::Handle<v8::Object> filterWrapper = toV8(filter, creationContext, scriptS tate->isolate()).As<v8::Object>();
155 157
156 RefPtrWillBeRawPtr<NodeFilterCondition> condition = V8NodeFilterCondition::c reate(callback, filterWrapper, scriptState); 158 RefPtrWillBeRawPtr<NodeFilterCondition> condition = V8NodeFilterCondition::c reate(callback, filterWrapper, scriptState);
157 filter->setCondition(condition.release()); 159 filter->setCondition(condition.release());
158 160
159 return filter.release(); 161 return filter.release();
160 } 162 }
161 163
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 PassRefPtr<TraceEvent::ConvertableToTraceFormat> devToolsTraceEventData(Executio nContext* context, v8::Handle<v8::Function> function, v8::Isolate* isolate) 934 PassRefPtr<TraceEvent::ConvertableToTraceFormat> devToolsTraceEventData(Executio nContext* context, v8::Handle<v8::Function> function, v8::Isolate* isolate)
933 { 935 {
934 int scriptId = 0; 936 int scriptId = 0;
935 String resourceName; 937 String resourceName;
936 int lineNumber = 1; 938 int lineNumber = 1;
937 GetDevToolsFunctionInfo(function, isolate, scriptId, resourceName, lineNumbe r); 939 GetDevToolsFunctionInfo(function, isolate, scriptId, resourceName, lineNumbe r);
938 return InspectorFunctionCallEvent::data(context, scriptId, resourceName, lin eNumber); 940 return InspectorFunctionCallEvent::data(context, scriptId, resourceName, lin eNumber);
939 } 941 }
940 942
941 } // namespace WebCore 943 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/TreeWalker/TreeWalker-basic-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698