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 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1251 return true; | 1251 return true; |
1252 } | 1252 } |
1253 | 1253 |
1254 bool FrameLoader::dispatchNavigationTransitionData() | 1254 bool FrameLoader::dispatchNavigationTransitionData() |
1255 { | 1255 { |
1256 Vector<Document::TransitionElementData> elementData; | 1256 Vector<Document::TransitionElementData> elementData; |
1257 m_frame->document()->getTransitionElementData(elementData); | 1257 m_frame->document()->getTransitionElementData(elementData); |
1258 if (elementData.isEmpty() || !validateTransitionNavigationMode()) | 1258 if (elementData.isEmpty() || !validateTransitionNavigationMode()) |
1259 return false; | 1259 return false; |
1260 | 1260 |
1261 Vector<Document::TransitionElementData>::iterator iter = elementData.begin()
; | 1261 for (auto& element : elementData) |
1262 for (; iter != elementData.end(); ++iter) | 1262 client()->dispatchAddNavigationTransitionData(element); |
1263 client()->dispatchAddNavigationTransitionData(*iter); | |
1264 | 1263 |
1265 return true; | 1264 return true; |
1266 } | 1265 } |
1267 | 1266 |
1268 void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty
pe, NavigationPolicy navigationPolicy) | 1267 void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty
pe, NavigationPolicy navigationPolicy) |
1269 { | 1268 { |
1270 ASSERT(client()->hasWebView()); | 1269 ASSERT(client()->hasWebView()); |
1271 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No
Dismissal) | 1270 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No
Dismissal) |
1272 return; | 1271 return; |
1273 | 1272 |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1481 | 1480 |
1482 // FIXME: We need a way to propagate strict mixed content checking flags to | 1481 // FIXME: We need a way to propagate strict mixed content checking flags to |
1483 // out-of-process frames. For now, we'll always enforce. | 1482 // out-of-process frames. For now, we'll always enforce. |
1484 if (!parentFrame->isLocalFrame()) | 1483 if (!parentFrame->isLocalFrame()) |
1485 return true; | 1484 return true; |
1486 | 1485 |
1487 return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedConten
tChecking(); | 1486 return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedConten
tChecking(); |
1488 } | 1487 } |
1489 | 1488 |
1490 } // namespace blink | 1489 } // namespace blink |
OLD | NEW |