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

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

Issue 463433002: Oilpan: fix build after r179934. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 months 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/loader/DocumentLoader.cpp ('k') | Source/core/workers/SharedWorkerGlobalScope.cpp » ('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 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 break; 1385 break;
1386 } 1386 }
1387 } 1387 }
1388 return false; 1388 return false;
1389 } 1389 }
1390 case XFrameOptionsDeny: 1390 case XFrameOptionsDeny:
1391 return true; 1391 return true;
1392 case XFrameOptionsAllowAll: 1392 case XFrameOptionsAllowAll:
1393 return false; 1393 return false;
1394 case XFrameOptionsConflict: { 1394 case XFrameOptionsConflict: {
1395 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessage Source, ErrorMessageLevel, "Multiple 'X-Frame-Options' headers with conflicting values ('" + content + "') encountered when loading '" + url.elidedString() + "' . Falling back to 'DENY'."); 1395 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::crea te(JSMessageSource, ErrorMessageLevel, "Multiple 'X-Frame-Options' headers with conflicting values ('" + content + "') encountered when loading '" + url.elidedS tring() + "'. Falling back to 'DENY'.");
1396 consoleMessage->setRequestIdentifier(requestIdentifier); 1396 consoleMessage->setRequestIdentifier(requestIdentifier);
1397 m_frame->document()->addMessage(consoleMessage.release()); 1397 m_frame->document()->addMessage(consoleMessage.release());
1398 return true; 1398 return true;
1399 } 1399 }
1400 case XFrameOptionsInvalid: { 1400 case XFrameOptionsInvalid: {
1401 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessage Source, ErrorMessageLevel, "Invalid 'X-Frame-Options' header encountered when lo ading '" + url.elidedString() + "': '" + content + "' is not a recognized direct ive. The header will be ignored."); 1401 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::crea te(JSMessageSource, ErrorMessageLevel, "Invalid 'X-Frame-Options' header encount ered when loading '" + url.elidedString() + "': '" + content + "' is not a recog nized directive. The header will be ignored.");
1402 consoleMessage->setRequestIdentifier(requestIdentifier); 1402 consoleMessage->setRequestIdentifier(requestIdentifier);
1403 m_frame->document()->addMessage(consoleMessage.release()); 1403 m_frame->document()->addMessage(consoleMessage.release());
1404 return false; 1404 return false;
1405 } 1405 }
1406 default: 1406 default:
1407 ASSERT_NOT_REACHED(); 1407 ASSERT_NOT_REACHED();
1408 return false; 1408 return false;
1409 } 1409 }
1410 } 1410 }
1411 1411
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
1487 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1487 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1488 Frame* parentFrame = m_frame->tree().parent(); 1488 Frame* parentFrame = m_frame->tree().parent();
1489 if (parentFrame && parentFrame->isLocalFrame()) 1489 if (parentFrame && parentFrame->isLocalFrame())
1490 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1490 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1491 if (FrameOwner* frameOwner = m_frame->owner()) 1491 if (FrameOwner* frameOwner = m_frame->owner())
1492 flags |= frameOwner->sandboxFlags(); 1492 flags |= frameOwner->sandboxFlags();
1493 return flags; 1493 return flags;
1494 } 1494 }
1495 1495
1496 } // namespace blink 1496 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | Source/core/workers/SharedWorkerGlobalScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698