Chromium Code Reviews| 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 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1231 | 1231 |
| 1232 bool FrameLoader::dispatchNavigationTransitionData() | 1232 bool FrameLoader::dispatchNavigationTransitionData() |
| 1233 { | 1233 { |
| 1234 Vector<Document::TransitionElementData> elementData; | 1234 Vector<Document::TransitionElementData> elementData; |
| 1235 m_frame->document()->getTransitionElementData(elementData); | 1235 m_frame->document()->getTransitionElementData(elementData); |
| 1236 if (elementData.isEmpty() || !validateTransitionNavigationMode()) | 1236 if (elementData.isEmpty() || !validateTransitionNavigationMode()) |
| 1237 return false; | 1237 return false; |
| 1238 | 1238 |
| 1239 Vector<Document::TransitionElementData>::iterator iter = elementData.begin() ; | 1239 Vector<Document::TransitionElementData>::iterator iter = elementData.begin() ; |
| 1240 for (; iter != elementData.end(); ++iter) | 1240 for (; iter != elementData.end(); ++iter) |
| 1241 client()->dispatchAddNavigationTransitionData(iter->scope, iter->selecto r, iter->markup); | 1241 client()->dispatchAddNavigationTransitionData(iter->scope, iter->selecto r, iter->markup, iter->names, iter->rects); |
|
esprehn
2014/10/21 20:50:48
Seems like you should be passing a struct, passing
Zhen Wang
2014/10/21 21:36:48
ditto. See FrameLoaderClientImpl.cpp
| |
| 1242 | 1242 |
| 1243 return true; | 1243 return true; |
| 1244 } | 1244 } |
| 1245 | 1245 |
| 1246 void FrameLoader::loadWithNavigationAction(const NavigationAction& action, Frame LoadType type, PassRefPtrWillBeRawPtr<FormState> formState, const SubstituteData & substituteData, ContentSecurityPolicyCheck shouldCheckMainWorldContentSecurity Policy, ClientRedirectPolicy clientRedirect) | 1246 void FrameLoader::loadWithNavigationAction(const NavigationAction& action, Frame LoadType type, PassRefPtrWillBeRawPtr<FormState> formState, const SubstituteData & substituteData, ContentSecurityPolicyCheck shouldCheckMainWorldContentSecurity Policy, ClientRedirectPolicy clientRedirect) |
| 1247 { | 1247 { |
| 1248 ASSERT(client()->hasWebView()); | 1248 ASSERT(client()->hasWebView()); |
| 1249 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal) | 1249 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal) |
| 1250 return; | 1250 return; |
| 1251 | 1251 |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1442 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. | 1442 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. |
| 1443 Frame* parentFrame = m_frame->tree().parent(); | 1443 Frame* parentFrame = m_frame->tree().parent(); |
| 1444 if (parentFrame && parentFrame->isLocalFrame()) | 1444 if (parentFrame && parentFrame->isLocalFrame()) |
| 1445 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); | 1445 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); |
| 1446 if (FrameOwner* frameOwner = m_frame->owner()) | 1446 if (FrameOwner* frameOwner = m_frame->owner()) |
| 1447 flags |= frameOwner->sandboxFlags(); | 1447 flags |= frameOwner->sandboxFlags(); |
| 1448 return flags; | 1448 return flags; |
| 1449 } | 1449 } |
| 1450 | 1450 |
| 1451 } // namespace blink | 1451 } // namespace blink |
| OLD | NEW |