| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 8 * Copyright (C) 2011 Google Inc. All rights reserved. | 8 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 9 * | 9 * |
| 10 * Redistribution and use in source and binary forms, with or without | 10 * Redistribution and use in source and binary forms, with or without |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 #include "core/page/CreateWindow.h" | 78 #include "core/page/CreateWindow.h" |
| 79 #include "core/page/EventHandler.h" | 79 #include "core/page/EventHandler.h" |
| 80 #include "core/page/FrameTree.h" | 80 #include "core/page/FrameTree.h" |
| 81 #include "core/page/Page.h" | 81 #include "core/page/Page.h" |
| 82 #include "core/page/WindowFeatures.h" | 82 #include "core/page/WindowFeatures.h" |
| 83 #include "core/page/scrolling/ScrollingCoordinator.h" | 83 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 84 #include "core/svg/graphics/SVGImage.h" | 84 #include "core/svg/graphics/SVGImage.h" |
| 85 #include "core/xml/parser/XMLDocumentParser.h" | 85 #include "core/xml/parser/XMLDocumentParser.h" |
| 86 #include "platform/Logging.h" | 86 #include "platform/Logging.h" |
| 87 #include "platform/UserGestureIndicator.h" | 87 #include "platform/UserGestureIndicator.h" |
| 88 #include "platform/geometry/FloatRect.h" | |
| 89 #include "platform/network/HTTPParsers.h" | 88 #include "platform/network/HTTPParsers.h" |
| 90 #include "platform/network/ResourceRequest.h" | 89 #include "platform/network/ResourceRequest.h" |
| 91 #include "platform/scroll/ScrollAnimator.h" | 90 #include "platform/scroll/ScrollAnimator.h" |
| 92 #include "platform/weborigin/SecurityOrigin.h" | 91 #include "platform/weborigin/SecurityOrigin.h" |
| 93 #include "platform/weborigin/SecurityPolicy.h" | 92 #include "platform/weborigin/SecurityPolicy.h" |
| 94 #include "public/platform/WebURLRequest.h" | 93 #include "public/platform/WebURLRequest.h" |
| 95 #include "wtf/TemporaryChange.h" | 94 #include "wtf/TemporaryChange.h" |
| 96 #include "wtf/text/CString.h" | 95 #include "wtf/text/CString.h" |
| 97 #include "wtf/text/WTFString.h" | 96 #include "wtf/text/WTFString.h" |
| 98 | 97 |
| (...skipping 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1399 | 1398 |
| 1400 // FIXME: We need a way to propagate strict mixed content checking flags to | 1399 // FIXME: We need a way to propagate strict mixed content checking flags to |
| 1401 // out-of-process frames. For now, we'll always enforce. | 1400 // out-of-process frames. For now, we'll always enforce. |
| 1402 if (!parentFrame->isLocalFrame()) | 1401 if (!parentFrame->isLocalFrame()) |
| 1403 return true; | 1402 return true; |
| 1404 | 1403 |
| 1405 return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedConten
tChecking(); | 1404 return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedConten
tChecking(); |
| 1406 } | 1405 } |
| 1407 | 1406 |
| 1408 } // namespace blink | 1407 } // namespace blink |
| OLD | NEW |