Report the size of |CSSStyleSheetResource::m_decodedSheetText| as decoded size

third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 58 matching lines @@
       m_didNotifyFirstData(false) {}
 
 CSSStyleSheetResource::~CSSStyleSheetResource() {}
 
 void CSSStyleSheetResource::setParsedStyleSheetCache(
     StyleSheetContents* newSheet) {
   if (m_parsedStyleSheetCache)
     m_parsedStyleSheetCache->clearReferencedFromResource();
   m_parsedStyleSheetCache = newSheet;
   if (m_parsedStyleSheetCache)
     m_parsedStyleSheetCache->setReferencedFromResource(this);

[kouhei (in TOK), 2016/11/07 09:29:39]

Can we add a comment here:
// update decoded size to take parsed stylesheet cache into account.

[hiroshige, 2016/11/07 09:36:06]

Done.

+  updateDecodedSize();
 }
 
 DEFINE_TRACE(CSSStyleSheetResource) {
   visitor->trace(m_parsedStyleSheetCache);
   StyleSheetResource::trace(visitor);
 }
 
 void CSSStyleSheetResource::didAddClient(ResourceClient* c) {
   DCHECK(StyleSheetResourceClient::isExpectedType(c));
   // Resource::didAddClient() must be before setCSSStyleSheet(), because
@@ skipping 39 matching lines @@
   ResourceClientWalker<StyleSheetResourceClient> w(clients());
   while (StyleSheetResourceClient* c = w.next())
     c->didAppendFirstData(this);
   m_didNotifyFirstData = true;
 }
 
 void CSSStyleSheetResource::checkNotify() {
   // Decode the data to find out the encoding and cache the decoded sheet text.
   if (data()) {
     m_decodedSheetText = decodedText();
+    updateDecodedSize();
   }
 
   ResourceClientWalker<StyleSheetResourceClient> w(clients());
   while (StyleSheetResourceClient* c = w.next()) {
     markClientFinished(c);
     c->setCSSStyleSheet(resourceRequest().url(), response().url(), encoding(),
                         this);
   }
 
   // Clear raw bytes as now we have the full decoded sheet text.
   // We wait for all LinkStyle::setCSSStyleSheet to run (at least once)
   // as SubresourceIntegrity checks require raw bytes.
   // Note that LinkStyle::setCSSStyleSheet can be called from didAddClient too,
   // but is safe as we should have a cached ResourceIntegrityDisposition.
   clearData();
+  setEncodedSizeMemoryUsage(0);
 }
 
 void CSSStyleSheetResource::destroyDecodedDataIfPossible() {
   if (!m_parsedStyleSheetCache)
     return;
 
   setParsedStyleSheetCache(nullptr);
-  setDecodedSize(0);
 }
 
 void CSSStyleSheetResource::destroyDecodedDataForFailedRevalidation() {
   m_decodedSheetText = String();
+  updateDecodedSize();

[kouhei (in TOK), 2016/11/07 09:29:39]

Can we skip it here? destroyDecodedDataIfPossible will zero-out decoded size
anyway

[hiroshige, 2016/11/07 09:36:07]

I thought destroyDecodedDataIfPossible() doesn't call setParsedStyleSheetCache
(and setDecodedSize()) if m_parsedStyleSheetCache is nullptr, so I placed this
call here.
(I'm not sure whether this can happen though)

[kouhei (in TOK), 2016/11/07 09:57:42]

Makes sense. lgtm

   destroyDecodedDataIfPossible();
 }
 
 bool CSSStyleSheetResource::canUseSheet(MIMETypeCheck mimeTypeCheck) const {
   if (errorOccurred())
     return false;
 
   // This check exactly matches Firefox. Note that we grab the Content-Type
   // header directly because we want to see what the value is BEFORE content
   // sniffing. Firefox does this by setting a "type hint" on the channel. This
@@ skipping 34 matching lines @@
   DCHECK(sheet);
   DCHECK(sheet->isCacheableForResource());
 
   if (!memoryCache()->contains(this)) {
     // This stylesheet resource did conflict with another resource and was not
     // added to the cache.
     setParsedStyleSheetCache(nullptr);
     return;
   }
   setParsedStyleSheetCache(sheet);
-  setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes());
+}
+
+void CSSStyleSheetResource::updateDecodedSize() {
+  size_t decodedSize = m_decodedSheetText.charactersSizeInBytes();
+  if (m_parsedStyleSheetCache)
+    decodedSize += m_parsedStyleSheetCache->estimatedSizeInBytes();
+  setDecodedSize(decodedSize);
 }
 
 }  // namespace blink