Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(517)

Side by Side Diff: Source/core/loader/FrameLoader.cpp

Issue 654953002: Navigation transitions (web to native app): Get names and rects of transition elements (Step 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use struct for transition element Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 1234
1235 bool FrameLoader::dispatchNavigationTransitionData() 1235 bool FrameLoader::dispatchNavigationTransitionData()
1236 { 1236 {
1237 Vector<Document::TransitionElementData> elementData; 1237 Vector<Document::TransitionElementData> elementData;
1238 m_frame->document()->getTransitionElementData(elementData); 1238 m_frame->document()->getTransitionElementData(elementData);
1239 if (elementData.isEmpty() || !validateTransitionNavigationMode()) 1239 if (elementData.isEmpty() || !validateTransitionNavigationMode())
1240 return false; 1240 return false;
1241 1241
1242 Vector<Document::TransitionElementData>::iterator iter = elementData.begin() ; 1242 Vector<Document::TransitionElementData>::iterator iter = elementData.begin() ;
1243 for (; iter != elementData.end(); ++iter) 1243 for (; iter != elementData.end(); ++iter)
1244 client()->dispatchAddNavigationTransitionData(iter->scope, iter->selecto r, iter->markup); 1244 client()->dispatchAddNavigationTransitionData(*iter);
1245 1245
1246 return true; 1246 return true;
1247 } 1247 }
1248 1248
1249 void FrameLoader::loadWithNavigationAction(const NavigationAction& action, Frame LoadType type, PassRefPtrWillBeRawPtr<FormState> formState, const SubstituteData & substituteData, ContentSecurityPolicyCheck shouldCheckMainWorldContentSecurity Policy, ClientRedirectPolicy clientRedirect) 1249 void FrameLoader::loadWithNavigationAction(const NavigationAction& action, Frame LoadType type, PassRefPtrWillBeRawPtr<FormState> formState, const SubstituteData & substituteData, ContentSecurityPolicyCheck shouldCheckMainWorldContentSecurity Policy, ClientRedirectPolicy clientRedirect)
1250 { 1250 {
1251 ASSERT(client()->hasWebView()); 1251 ASSERT(client()->hasWebView());
1252 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal) 1252 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal)
1253 return; 1253 return;
1254 1254
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1445 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1446 Frame* parentFrame = m_frame->tree().parent(); 1446 Frame* parentFrame = m_frame->tree().parent();
1447 if (parentFrame && parentFrame->isLocalFrame()) 1447 if (parentFrame && parentFrame->isLocalFrame())
1448 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1448 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1449 if (FrameOwner* frameOwner = m_frame->owner()) 1449 if (FrameOwner* frameOwner = m_frame->owner())
1450 flags |= frameOwner->sandboxFlags(); 1450 flags |= frameOwner->sandboxFlags();
1451 return flags; 1451 return flags;
1452 } 1452 }
1453 1453
1454 } // namespace blink 1454 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698