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

Side by Side Diff: Source/core/testing/Internals.cpp

Issue 644073003: Fixing crash with sig: blink::FrameConsole::addMessage (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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/core/frame/FrameConsole.cpp ('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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 1438 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 return InspectorCounters::counterValue(InspectorCounters::DocumentCounter); 1449 return InspectorCounters::counterValue(InspectorCounters::DocumentCounter);
1450 } 1450 }
1451 1451
1452 String Internals::dumpRefCountedInstanceCounts() const 1452 String Internals::dumpRefCountedInstanceCounts() const
1453 { 1453 {
1454 return WTF::dumpRefCountedInstanceCounts(); 1454 return WTF::dumpRefCountedInstanceCounts();
1455 } 1455 }
1456 1456
1457 Vector<String> Internals::consoleMessageArgumentCounts(Document* document) const 1457 Vector<String> Internals::consoleMessageArgumentCounts(Document* document) const
1458 { 1458 {
1459 LocalFrame* frame = document->frame(); 1459 FrameHost* host = document->frameHost();
1460 if (!frame) 1460 if (!host)
1461 return Vector<String>(); 1461 return Vector<String>();
1462 1462
1463 Vector<unsigned> counts = frame->console().messageStorage()->argumentCounts( ); 1463 Vector<unsigned> counts = host->consoleMessageStorage().argumentCounts();
1464 Vector<String> result(counts.size()); 1464 Vector<String> result(counts.size());
1465 for (size_t i = 0; i < counts.size(); i++) 1465 for (size_t i = 0; i < counts.size(); i++)
1466 result[i] = String::number(counts[i]); 1466 result[i] = String::number(counts[i]);
1467 return result; 1467 return result;
1468 } 1468 }
1469 1469
1470 Vector<unsigned long> Internals::setMemoryCacheCapacities(unsigned long minDeadB ytes, unsigned long maxDeadBytes, unsigned long totalBytes) 1470 Vector<unsigned long> Internals::setMemoryCacheCapacities(unsigned long minDeadB ytes, unsigned long maxDeadBytes, unsigned long totalBytes)
1471 { 1471 {
1472 Vector<unsigned long> result; 1472 Vector<unsigned long> result;
1473 result.append(memoryCache()->minDeadCapacity()); 1473 result.append(memoryCache()->minDeadCapacity());
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
2284 } 2284 }
2285 toHTMLPlugInElement(element)->setPlaceholder(DictionaryPluginPlaceholder::cr eate(element->document(), options)); 2285 toHTMLPlugInElement(element)->setPlaceholder(DictionaryPluginPlaceholder::cr eate(element->document(), options));
2286 } 2286 }
2287 2287
2288 Iterator* Internals::iterator(ScriptState* scriptState, ExceptionState& exceptio nState) 2288 Iterator* Internals::iterator(ScriptState* scriptState, ExceptionState& exceptio nState)
2289 { 2289 {
2290 return new InternalsIterator; 2290 return new InternalsIterator;
2291 } 2291 }
2292 2292
2293 } // namespace blink 2293 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameConsole.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698