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

Side by Side Diff: Source/bindings/core/dart/DartInjectedScript.cpp

Issue 1677703002: Fix last remaining failing dart inspector layout test. Simplify scope-variables.html to not reach i… (Closed) Base URL: svn://svn.chromium.org/blink/branches/dart/2454_1
Patch Set: Created 4 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/dart/inspector/scope-variables-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) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 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 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 } 887 }
888 888
889 ASSERT(!exception); 889 ASSERT(!exception);
890 890
891 RefPtr<Location> locationJson = Location::create() 891 RefPtr<Location> locationJson = Location::create()
892 .setScriptId(debugServer.getScriptId(DartUtilities::toString(url), Dart_ CurrentIsolate())) 892 .setScriptId(debugServer.getScriptId(DartUtilities::toString(url), Dart_ CurrentIsolate()))
893 .setLineNumber(line - 1); 893 .setLineNumber(line - 1);
894 locationJson->setColumnNumber(column); 894 locationJson->setColumnNumber(column);
895 895
896 *result = FunctionDetails::create() 896 *result = FunctionDetails::create()
897 .setIsGenerator(true) 897 .setIsGenerator(false)
898 .setFunctionName(DartUtilities::toString(name)) 898 .setFunctionName(DartUtilities::toString(name))
899 .release(); 899 .release();
900 (*result)->setLocation(locationJson); 900 (*result)->setLocation(locationJson);
901 } 901 }
902 902
903 void addCompletions(Dart_Handle completions, RefPtr<TypeBuilder::Array<String> > * result) 903 void addCompletions(Dart_Handle completions, RefPtr<TypeBuilder::Array<String> > * result)
904 { 904 {
905 ASSERT(Dart_IsList(completions)); 905 ASSERT(Dart_IsList(completions));
906 intptr_t length = 0; 906 intptr_t length = 0;
907 Dart_ListLength(completions, &length); 907 Dart_ListLength(completions, &length);
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
1456 RefPtr<JSONValue> parsedObjectId = parseJSON(objectId); 1456 RefPtr<JSONValue> parsedObjectId = parseJSON(objectId);
1457 if (parsedObjectId && parsedObjectId->type() == JSONValue::TypeObject) { 1457 if (parsedObjectId && parsedObjectId->type() == JSONValue::TypeObject) {
1458 bool isDart = false; 1458 bool isDart = false;
1459 bool success = parsedObjectId->asObject()-> getBoolean("isDart", &isDart ); 1459 bool success = parsedObjectId->asObject()-> getBoolean("isDart", &isDart );
1460 return success && isDart; 1460 return success && isDart;
1461 } 1461 }
1462 return false; 1462 return false;
1463 } 1463 }
1464 1464
1465 } // namespace blink 1465 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/dart/inspector/scope-variables-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698