Merge 142063

Source/WebCore/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 300 matching lines @@
 
             RefPtr<FormData> report = FormData::create(reportObject->toJSONString().utf8().data());
             PingLoader::sendViolationReport(m_parser->document()->frame(), m_reportURL, report);
 
             m_reportURL = KURL();
             m_originalURL = String();
             m_originalHTTPBody = String();
         }
 
         if (didBlockEntirePage)
-            m_parser->document()->frame()->navigationScheduler()->scheduleLocationChange(m_parser->document()->securityOrigin(), blankURL(), String());
+            m_parser->document()->frame()->navigationScheduler()->scheduleLocationChange(m_parser->document()->securityOrigin(), blankURL(), blankURL());
     }
 }
 
 bool XSSAuditor::filterStartToken(HTMLToken& token)
 {
     bool didBlockScript = eraseDangerousAttributesIfInjected(token);
 
     if (hasName(token, scriptTag)) {
         didBlockScript |= filterScriptToken(token);
         ASSERT(m_shouldAllowCDATA || !m_scriptTagNestingLevel);
@@ skipping 343 matching lines @@
     // something dangerous with the query string.  
     const KURL& documentURL = m_parser->document()->url();
     if (documentURL.host().isEmpty())
         return false;
 
     KURL resourceURL(documentURL, url);
     return (documentURL.host() == resourceURL.host() && resourceURL.query().isEmpty());
 }
 
 } // namespace WebCore