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

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: review fix 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
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1229 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 1240
1241 bool FrameLoader::dispatchNavigationTransitionData() 1241 bool FrameLoader::dispatchNavigationTransitionData()
1242 { 1242 {
1243 Vector<Document::TransitionElementData> elementData; 1243 Vector<Document::TransitionElementData> elementData;
1244 m_frame->document()->getTransitionElementData(elementData); 1244 m_frame->document()->getTransitionElementData(elementData);
1245 if (elementData.isEmpty() || !validateTransitionNavigationMode()) 1245 if (elementData.isEmpty() || !validateTransitionNavigationMode())
1246 return false; 1246 return false;
1247 1247
1248 Vector<Document::TransitionElementData>::iterator iter = elementData.begin() ; 1248 Vector<Document::TransitionElementData>::iterator iter = elementData.begin() ;
1249 for (; iter != elementData.end(); ++iter) 1249 for (; iter != elementData.end(); ++iter)
1250 client()->dispatchAddNavigationTransitionData(iter->scope, iter->selecto r, iter->markup); 1250 client()->dispatchAddNavigationTransitionData(*iter);
1251 1251
1252 return true; 1252 return true;
1253 } 1253 }
1254 1254
1255 void FrameLoader::loadWithNavigationAction(const NavigationAction& action, Frame LoadType type, PassRefPtrWillBeRawPtr<FormState> formState, const SubstituteData & substituteData, ContentSecurityPolicyCheck shouldCheckMainWorldContentSecurity Policy, ClientRedirectPolicy clientRedirect) 1255 void FrameLoader::loadWithNavigationAction(const NavigationAction& action, Frame LoadType type, PassRefPtrWillBeRawPtr<FormState> formState, const SubstituteData & substituteData, ContentSecurityPolicyCheck shouldCheckMainWorldContentSecurity Policy, ClientRedirectPolicy clientRedirect)
1256 { 1256 {
1257 ASSERT(client()->hasWebView()); 1257 ASSERT(client()->hasWebView());
1258 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal) 1258 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal)
1259 return; 1259 return;
1260 1260
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1453 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1453 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1454 Frame* parentFrame = m_frame->tree().parent(); 1454 Frame* parentFrame = m_frame->tree().parent();
1455 if (parentFrame && parentFrame->isLocalFrame()) 1455 if (parentFrame && parentFrame->isLocalFrame())
1456 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1456 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1457 if (FrameOwner* frameOwner = m_frame->owner()) 1457 if (FrameOwner* frameOwner = m_frame->owner())
1458 flags |= frameOwner->sandboxFlags(); 1458 flags |= frameOwner->sandboxFlags();
1459 return flags; 1459 return flags;
1460 } 1460 }
1461 1461
1462 } // namespace blink 1462 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698