11 files changed, 28 insertions, 22 deletions
diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
index 3be9bb653..ea69bf52f 100644
--- a/Source/WebCore/loader/DocumentLoader.cpp
+++ b/Source/WebCore/loader/DocumentLoader.cpp
@@ -364,8 +364,8 @@ void DocumentLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     info.addInstrumentedHashSet(m_multipartSubresourceLoaders);
     info.addInstrumentedHashSet(m_plugInStreamLoaders);
     info.addInstrumentedMember(m_substituteData);
-    info.addMember(m_pageTitle.string());
-    info.addMember(m_overrideEncoding);
+    info.addInstrumentedMember(m_pageTitle.string());
+    info.addInstrumentedMember(m_overrideEncoding);
     info.addVector(m_responses);
     info.addInstrumentedMember(m_originalRequest);
     info.addInstrumentedMember(m_originalRequestCopy);
@@ -376,7 +376,7 @@ void DocumentLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     info.addHashMap(m_pendingSubstituteResources);
     info.addInstrumentedHashSet(m_resourcesClientKnowsAbout);
     info.addVector(m_resourcesLoadedFromMemoryCacheForClientNotification);
-    info.addMember(m_clientRedirectSourceForHistory);
+    info.addInstrumentedMember(m_clientRedirectSourceForHistory);
     info.addInstrumentedMember(m_mainResourceData);
 }
 
diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index 23e9b6cc9..ca9ff0947 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -3236,10 +3236,10 @@ NetworkingContext* FrameLoader::networkingContext() const
 void FrameLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::Loader);
-    info.addInstrumentedMember(m_documentLoader.get());
-    info.addInstrumentedMember(m_provisionalDocumentLoader.get());
-    info.addInstrumentedMember(m_policyDocumentLoader.get());
-    info.addMember(m_outgoingReferrer);
+    info.addInstrumentedMember(m_documentLoader);
+    info.addInstrumentedMember(m_provisionalDocumentLoader);
+    info.addInstrumentedMember(m_policyDocumentLoader);
+    info.addInstrumentedMember(m_outgoingReferrer);
     info.addInstrumentedHashSet(m_openedFrames);
 }
 
diff --git a/Source/WebCore/loader/ImageLoader.cpp b/Source/WebCore/loader/ImageLoader.cpp
index e897f8a4e..8745346da 100644
--- a/Source/WebCore/loader/ImageLoader.cpp
+++ b/Source/WebCore/loader/ImageLoader.cpp
@@ -197,8 +197,14 @@ void ImageLoader::updateFromElement()
             newImage = document()->cachedResourceLoader()->requestImage(request);
 
         // If we do not have an image here, it means that a cross-site
-        // violation occurred.
-        m_failedLoadURL = !newImage ? attr : AtomicString();
+        // violation occurred, or that the image was blocked via Content
+        // Security Policy. Either way, trigger an error event.
+        if (!newImage) {
+            m_failedLoadURL = attr;
+            m_hasPendingErrorEvent = true;
+            errorEventSender().dispatchEventSoon(this);
+        } else
+            m_failedLoadURL = AtomicString();
     } else if (!attr.isNull()) {
         // Fire an error event if the url is empty.
         // FIXME: Should we fire this event asynchronoulsy via errorEventSender()?
diff --git a/Source/WebCore/loader/SubstituteData.cpp b/Source/WebCore/loader/SubstituteData.cpp
index 806bd1d8e..a269c3498 100644
--- a/Source/WebCore/loader/SubstituteData.cpp
+++ b/Source/WebCore/loader/SubstituteData.cpp
@@ -39,10 +39,10 @@ void SubstituteData::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::Loader);
     info.addInstrumentedMember(m_content);
-    info.addMember(m_mimeType);
-    info.addMember(m_textEncoding);
-    info.addMember(m_failingURL);
-    info.addMember(m_responseURL);
+    info.addInstrumentedMember(m_mimeType);
+    info.addInstrumentedMember(m_textEncoding);
+    info.addInstrumentedMember(m_failingURL);
+    info.addInstrumentedMember(m_responseURL);
 }
 
 }
diff --git a/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp b/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
index 7e44ebc28..498d2fa57 100644
--- a/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
+++ b/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
@@ -208,7 +208,7 @@ void CachedCSSStyleSheet::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo)
     CachedResource::reportMemoryUsage(memoryObjectInfo);
     info.addMember(m_decoder);
     info.addInstrumentedMember(m_parsedStyleSheetCache);
-    info.addMember(m_decodedSheetText);
+    info.addInstrumentedMember(m_decodedSheetText);
 }
 
 }
diff --git a/Source/WebCore/loader/cache/CachedResource.cpp b/Source/WebCore/loader/cache/CachedResource.cpp
index c619ddad6..d7abcae84 100755
--- a/Source/WebCore/loader/cache/CachedResource.cpp
+++ b/Source/WebCore/loader/cache/CachedResource.cpp
@@ -806,11 +806,11 @@ void CachedResource::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CachedResource);
     info.addMember(m_resourceRequest);
     info.addHashSet(m_clients);
-    info.addMember(m_accept);
+    info.addInstrumentedMember(m_accept);
     info.addInstrumentedMember(m_loader);
-    info.addMember(m_response);
+    info.addInstrumentedMember(m_response);
     info.addInstrumentedMember(m_data);
-    info.addMember(m_cachedMetadata.get());
+    info.addMember(m_cachedMetadata);
     info.addInstrumentedMember(m_nextInAllResourcesList);
     info.addInstrumentedMember(m_prevInAllResourcesList);
     info.addInstrumentedMember(m_nextInLiveResourcesList);
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
index 7b5646538..b258c057f 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -883,7 +883,7 @@ void CachedResourceLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo)
     MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::Loader);
     info.addHashMap(m_documentResources);
     for (DocumentResourceMap::const_iterator i = m_documentResources.begin(); i != m_documentResources.end(); ++i) {
-        info.addMember(i->first);
+        info.addInstrumentedMember(i->first);
         info.addInstrumentedMember(i->second);
     }
     info.addHashSet(m_validatedURLs);
diff --git a/Source/WebCore/loader/cache/CachedScript.cpp b/Source/WebCore/loader/cache/CachedScript.cpp
index 7e7f26905..12c9fe573 100644
--- a/Source/WebCore/loader/cache/CachedScript.cpp
+++ b/Source/WebCore/loader/cache/CachedScript.cpp
@@ -131,7 +131,7 @@ void CachedScript::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CachedResourceScript);
     CachedResource::reportMemoryUsage(memoryObjectInfo);
-    info.addMember(m_script);
+    info.addInstrumentedMember(m_script);
     info.addMember(m_decoder);
 #if USE(JSC)
     info.addMember(m_sourceProviderCache);
diff --git a/Source/WebCore/loader/cache/CachedShader.cpp b/Source/WebCore/loader/cache/CachedShader.cpp
index 72eb5c053..a31abd050 100644
--- a/Source/WebCore/loader/cache/CachedShader.cpp
+++ b/Source/WebCore/loader/cache/CachedShader.cpp
@@ -73,7 +73,7 @@ void CachedShader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CachedResourceShader);
     CachedResource::reportMemoryUsage(memoryObjectInfo);
     info.addMember(m_decoder);
-    info.addMember(m_shaderString);
+    info.addInstrumentedMember(m_shaderString);
 }
 
 } // namespace WebCore
diff --git a/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp b/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp
index d14d5f2a3..0e771618b 100644
--- a/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp
+++ b/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp
@@ -101,7 +101,7 @@ void CachedXSLStyleSheet::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo)
 {
     MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CachedResourceXSLT);
     CachedResource::reportMemoryUsage(memoryObjectInfo);
-    info.addMember(m_sheet);
+    info.addInstrumentedMember(m_sheet);
     info.addMember(m_decoder);
 }
 
diff --git a/Source/WebCore/loader/cache/MemoryCache.cpp b/Source/WebCore/loader/cache/MemoryCache.cpp
index 50f45cd12..66111d73f 100644
--- a/Source/WebCore/loader/cache/MemoryCache.cpp
+++ b/Source/WebCore/loader/cache/MemoryCache.cpp
@@ -721,7 +721,7 @@ void MemoryCache::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     info.addHashMap(m_resources);
     CachedResourceMap::const_iterator e = m_resources.end();
     for (CachedResourceMap::const_iterator i = m_resources.begin(); i != e; ++i) {
-        info.addMember(i->first);
+        info.addInstrumentedMember(i->first);
         info.addInstrumentedMember(i->second);
     }
     info.addVector(m_allResources);