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

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

Issue 7552031: Merge 92678 - Web Inspector: assertion failure in InspectorDOMStorageResource::bind when opening ... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 4 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 | « Source/WebCore/ChangeLog ('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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 if (it->second->isSameHostAndType(frame, isLocalStorage)) 174 if (it->second->isSameHostAndType(frame, isLocalStorage))
175 return; 175 return;
176 } 176 }
177 177
178 RefPtr<Storage> domStorage = Storage::create(frame, storageArea); 178 RefPtr<Storage> domStorage = Storage::create(frame, storageArea);
179 RefPtr<InspectorDOMStorageResource> resource = InspectorDOMStorageResource:: create(domStorage.get(), isLocalStorage, frame); 179 RefPtr<InspectorDOMStorageResource> resource = InspectorDOMStorageResource:: create(domStorage.get(), isLocalStorage, frame);
180 180
181 m_resources.set(resource->id(), resource); 181 m_resources.set(resource->id(), resource);
182 182
183 // Resources are only bound while visible. 183 // Resources are only bound while visible.
184 if (m_frontend) 184 if (m_enabled)
185 resource->bind(m_frontend); 185 resource->bind(m_frontend);
186 } 186 }
187 187
188 void InspectorDOMStorageAgent::clearResources() 188 void InspectorDOMStorageAgent::clearResources()
189 { 189 {
190 m_resources.clear(); 190 m_resources.clear();
191 } 191 }
192 192
193 193
194 } // namespace WebCore 194 } // namespace WebCore
195 195
196 #endif // ENABLE(INSPECTOR) && ENABLE(DOM_STORE) 196 #endif // ENABLE(INSPECTOR) && ENABLE(DOM_STORE)
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698