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

Side by Side Diff: Source/WebCore/inspector/InspectorIndexedDBAgent.cpp

Issue 10125008: Merge 114373 - Web Inspector: [Chromium] Crash when inspecting empty IndexedDB object store. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 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
« no previous file with comments | « no previous file | 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 * 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 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 m_idbCursor->continueFunction(0, this, ec); 458 m_idbCursor->continueFunction(0, this, ec);
459 m_idbCursor->postSuccessHandlerCallback(); 459 m_idbCursor->postSuccessHandlerCallback();
460 m_idbTransaction->didCompleteTaskEvents(); 460 m_idbTransaction->didCompleteTaskEvents();
461 } 461 }
462 462
463 void end(bool hasMore) 463 void end(bool hasMore)
464 { 464 {
465 if (!m_frontendProvider->frontend()) 465 if (!m_frontendProvider->frontend())
466 return; 466 return;
467 467
468 m_idbCursor->postSuccessHandlerCallback(); 468 if (m_idbCursor)
469 m_idbCursor->postSuccessHandlerCallback();
469 m_idbTransaction->didCompleteTaskEvents(); 470 m_idbTransaction->didCompleteTaskEvents();
470 471
471 switch (m_cursorType) { 472 switch (m_cursorType) {
472 case ObjectStoreDataCursor: 473 case ObjectStoreDataCursor:
473 m_frontendProvider->frontend()->objectStoreDataLoaded(m_requestId, m _result.release(), hasMore); 474 m_frontendProvider->frontend()->objectStoreDataLoaded(m_requestId, m _result.release(), hasMore);
474 break; 475 break;
475 case IndexDataCursor: 476 case IndexDataCursor:
476 m_frontendProvider->frontend()->indexDataLoaded(m_requestId, m_resul t.release(), hasMore); 477 m_frontendProvider->frontend()->indexDataLoaded(m_requestId, m_resul t.release(), hasMore);
477 break; 478 break;
478 } 479 }
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 return; 693 return;
693 } 694 }
694 695
695 RefPtr<DataLoaderCallback> dataLoaderCallback = DataLoaderCallback::create(m _frontendProvider, requestId, injectedScript, objectStoreName, indexName, idbKey Range, skipCount, pageSize); 696 RefPtr<DataLoaderCallback> dataLoaderCallback = DataLoaderCallback::create(m _frontendProvider, requestId, injectedScript, objectStoreName, indexName, idbKey Range, skipCount, pageSize);
696 dataLoaderCallback->start(idbFactory, document->securityOrigin(), document-> frame(), databaseName); 697 dataLoaderCallback->start(idbFactory, document->securityOrigin(), document-> frame(), databaseName);
697 } 698 }
698 699
699 } // namespace WebCore 700 } // namespace WebCore
700 701
701 #endif // ENABLE(INSPECTOR) && ENABLE(INDEXED_DATABASE) 702 #endif // ENABLE(INSPECTOR) && ENABLE(INDEXED_DATABASE)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698