Small XSSAuditor cleanup.

Source/core/html/parser/XSSAuditor.cpp

 /*
  * Copyright (C) 2011 Adam Barth. All Rights Reserved.
  * Copyright (C) 2011 Daniel Bates (dbates@intudata.com).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 184 matching lines @@
     }
     return false;
 }
 
 XSSAuditor::XSSAuditor()
     : m_isEnabled(false)
     , m_xssProtection(ContentSecurityPolicy::FilterReflectedXSS)
     , m_didSendValidCSPHeader(false)
     , m_didSendValidXSSProtectionHeader(false)
     , m_state(Uninitialized)
+    , m_scriptTagFoundInRequest(false)
     , m_scriptTagNestingLevel(0)
     , m_encoding(UTF8Encoding())
 {
     // Although tempting to call init() at this point, the various objects
     // we want to reference might not all have been constructed yet.
 }
 
 void XSSAuditor::initForFragment()
 {
     ASSERT(isMainThread());
@@ skipping 159 matching lines @@
     ASSERT(m_scriptTagNestingLevel);
     if (hasName(request.token, scriptTag)) {
         m_scriptTagNestingLevel--;
         ASSERT(request.shouldAllowCDATA || !m_scriptTagNestingLevel);
     }
 }
 
 bool XSSAuditor::filterCharacterToken(const FilterTokenRequest& request)
 {
     ASSERT(m_scriptTagNestingLevel);
-    if (isContainedInRequest(m_cachedDecodedSnippet) && isContainedInRequest(decodedSnippetForJavaScript(request))) {
+    if (m_scriptTagFoundInRequest && isContainedInRequest(decodedSnippetForJavaScript(request))) {
         request.token.eraseCharacters();
         request.token.appendToCharacter(' '); // Technically, character tokens can't be empty.
         return true;
     }
     return false;
 }
 
 bool XSSAuditor::filterScriptToken(const FilterTokenRequest& request)
 {
     ASSERT(request.token.type() == HTMLToken::StartTag);
     ASSERT(hasName(request.token, scriptTag));
 
-    m_cachedDecodedSnippet = decodedSnippetForName(request);
-
     bool didBlockScript = false;
-    if (isContainedInRequest(decodedSnippetForName(request))) {
+    m_scriptTagFoundInRequest = isContainedInRequest(decodedSnippetForName(request));
+    if (m_scriptTagFoundInRequest) {
         didBlockScript |= eraseAttributeIfInjected(request, srcAttr, blankURL().string(), SrcLikeAttribute);
         didBlockScript |= eraseAttributeIfInjected(request, XLinkNames::hrefAttr, blankURL().string(), SrcLikeAttribute);
     }
-
     return didBlockScript;
 }
 
 bool XSSAuditor::filterObjectToken(const FilterTokenRequest& request)
 {
     ASSERT(request.token.type() == HTMLToken::StartTag);
     ASSERT(hasName(request.token, objectTag));
 
     bool didBlockScript = false;
     if (isContainedInRequest(decodedSnippetForName(request))) {
@@ skipping 299 matching lines @@
         return false;
 
     KURL resourceURL(m_documentURL, url);
     return (m_documentURL.host() == resourceURL.host() && resourceURL.query().isEmpty());
 }
 
 bool XSSAuditor::isSafeToSendToAnotherThread() const
 {
     return m_documentURL.isSafeToSendToAnotherThread()
         && m_decodedURL.isSafeToSendToAnotherThread()
-        && m_decodedHTTPBody.isSafeToSendToAnotherThread()
-        && m_cachedDecodedSnippet.isSafeToSendToAnotherThread();
+        && m_decodedHTTPBody.isSafeToSendToAnotherThread();
 }
 
 } // namespace WebCore