| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 #include "core/loader/appcache/ApplicationCacheHost.h" | 73 #include "core/loader/appcache/ApplicationCacheHost.h" |
| 74 #include "core/page/ChromeClient.h" | 74 #include "core/page/ChromeClient.h" |
| 75 #include "core/page/CreateWindow.h" | 75 #include "core/page/CreateWindow.h" |
| 76 #include "core/page/FrameTree.h" | 76 #include "core/page/FrameTree.h" |
| 77 #include "core/page/Page.h" | 77 #include "core/page/Page.h" |
| 78 #include "core/page/WindowFeatures.h" | 78 #include "core/page/WindowFeatures.h" |
| 79 #include "core/page/scrolling/ScrollingCoordinator.h" | 79 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 80 #include "core/svg/graphics/SVGImage.h" | 80 #include "core/svg/graphics/SVGImage.h" |
| 81 #include "core/xml/parser/XMLDocumentParser.h" | 81 #include "core/xml/parser/XMLDocumentParser.h" |
| 82 #include "platform/Logging.h" | 82 #include "platform/Logging.h" |
| 83 #include "platform/PluginScriptForbiddenScope.h" |
| 83 #include "platform/UserGestureIndicator.h" | 84 #include "platform/UserGestureIndicator.h" |
| 84 #include "platform/network/HTTPParsers.h" | 85 #include "platform/network/HTTPParsers.h" |
| 85 #include "platform/network/ResourceRequest.h" | 86 #include "platform/network/ResourceRequest.h" |
| 86 #include "platform/scroll/ScrollAnimator.h" | 87 #include "platform/scroll/ScrollAnimator.h" |
| 87 #include "platform/weborigin/SecurityOrigin.h" | 88 #include "platform/weborigin/SecurityOrigin.h" |
| 88 #include "platform/weborigin/SecurityPolicy.h" | 89 #include "platform/weborigin/SecurityPolicy.h" |
| 89 #include "public/platform/WebURLRequest.h" | 90 #include "public/platform/WebURLRequest.h" |
| 90 #include "wtf/TemporaryChange.h" | 91 #include "wtf/TemporaryChange.h" |
| 91 #include "wtf/text/CString.h" | 92 #include "wtf/text/CString.h" |
| 92 #include "wtf/text/WTFString.h" | 93 #include "wtf/text/WTFString.h" |
| (...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 995 { | 996 { |
| 996 if (m_didAccessInitialDocumentTimer.isActive()) { | 997 if (m_didAccessInitialDocumentTimer.isActive()) { |
| 997 m_didAccessInitialDocumentTimer.stop(); | 998 m_didAccessInitialDocumentTimer.stop(); |
| 998 didAccessInitialDocumentTimerFired(0); | 999 didAccessInitialDocumentTimerFired(0); |
| 999 } | 1000 } |
| 1000 } | 1001 } |
| 1001 | 1002 |
| 1002 void FrameLoader::commitProvisionalLoad() | 1003 void FrameLoader::commitProvisionalLoad() |
| 1003 { | 1004 { |
| 1004 ASSERT(client()->hasWebView()); | 1005 ASSERT(client()->hasWebView()); |
| 1006 PluginScriptForbiddenScope forbidPluginDestructorScripting; |
| 1005 RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader; | 1007 RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader; |
| 1006 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); | 1008 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); |
| 1007 | 1009 |
| 1008 // Check if the destination page is allowed to access the previous page's ti
ming information. | 1010 // Check if the destination page is allowed to access the previous page's ti
ming information. |
| 1009 if (m_frame->document()) { | 1011 if (m_frame->document()) { |
| 1010 RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(pdl->requ
est().url()); | 1012 RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(pdl->requ
est().url()); |
| 1011 pdl->timing().setHasSameOriginAsPreviousDocument(securityOrigin->canRequ
est(m_frame->document()->url())); | 1013 pdl->timing().setHasSameOriginAsPreviousDocument(securityOrigin->canRequ
est(m_frame->document()->url())); |
| 1012 } | 1014 } |
| 1013 | 1015 |
| 1014 if (m_documentLoader) { | 1016 if (m_documentLoader) { |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1471 // FIXME: We need a way to propagate insecure requests policy flags to | 1473 // FIXME: We need a way to propagate insecure requests policy flags to |
| 1472 // out-of-process frames. For now, we'll always use default behavior. | 1474 // out-of-process frames. For now, we'll always use default behavior. |
| 1473 if (!parentFrame->isLocalFrame()) | 1475 if (!parentFrame->isLocalFrame()) |
| 1474 return nullptr; | 1476 return nullptr; |
| 1475 | 1477 |
| 1476 ASSERT(toLocalFrame(parentFrame)->document()); | 1478 ASSERT(toLocalFrame(parentFrame)->document()); |
| 1477 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; | 1479 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; |
| 1478 } | 1480 } |
| 1479 | 1481 |
| 1480 } // namespace blink | 1482 } // namespace blink |
| OLD | NEW |