| OLD | NEW |
| 1 /* | 1 /* |
| 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
| 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
| 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
| 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. | 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. |
| 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ | 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ |
| 7 | 7 |
| 8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
| 9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
| 10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
| (...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 859 | 859 |
| 860 if (!frame()) | 860 if (!frame()) |
| 861 return; | 861 return; |
| 862 | 862 |
| 863 String message; | 863 String message; |
| 864 if (!m_document || m_document->url().isNull()) | 864 if (!m_document || m_document->url().isNull()) |
| 865 message = "Unsafe attempt to load URL " + url.elidedString() + '.'; | 865 message = "Unsafe attempt to load URL " + url.elidedString() + '.'; |
| 866 else | 866 else |
| 867 message = "Unsafe attempt to load URL " + url.elidedString() + " from fr
ame with URL " + m_document->url().elidedString() + ". Domains, protocols and po
rts must match.\n"; | 867 message = "Unsafe attempt to load URL " + url.elidedString() + " from fr
ame with URL " + m_document->url().elidedString() + ". Domains, protocols and po
rts must match.\n"; |
| 868 | 868 |
| 869 frame()->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLe
vel, message); | 869 frame()->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLe
vel, message, 0, ForceParserStateCollection); |
| 870 } | 870 } |
| 871 | 871 |
| 872 void ResourceFetcher::setAutoLoadImages(bool enable) | 872 void ResourceFetcher::setAutoLoadImages(bool enable) |
| 873 { | 873 { |
| 874 if (enable == m_autoLoadImages) | 874 if (enable == m_autoLoadImages) |
| 875 return; | 875 return; |
| 876 | 876 |
| 877 m_autoLoadImages = enable; | 877 m_autoLoadImages = enable; |
| 878 | 878 |
| 879 if (!m_autoLoadImages) | 879 if (!m_autoLoadImages) |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1285 } | 1285 } |
| 1286 #endif | 1286 #endif |
| 1287 | 1287 |
| 1288 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions() | 1288 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions() |
| 1289 { | 1289 { |
| 1290 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SendCallbacks, SniffCon
tent, BufferData, AllowStoredCredentials, ClientRequestedCredentials, AskClientF
orCrossOriginCredentials, DoSecurityCheck, CheckContentSecurityPolicy, UseDefaul
tOriginRestrictionsForType, DocumentContext)); | 1290 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SendCallbacks, SniffCon
tent, BufferData, AllowStoredCredentials, ClientRequestedCredentials, AskClientF
orCrossOriginCredentials, DoSecurityCheck, CheckContentSecurityPolicy, UseDefaul
tOriginRestrictionsForType, DocumentContext)); |
| 1291 return options; | 1291 return options; |
| 1292 } | 1292 } |
| 1293 | 1293 |
| 1294 } | 1294 } |
| OLD | NEW |