| 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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 } | 491 } |
| 492 checkCompleted(); | 492 checkCompleted(); |
| 493 } | 493 } |
| 494 | 494 |
| 495 void FrameLoader::scheduleCheckCompleted() | 495 void FrameLoader::scheduleCheckCompleted() |
| 496 { | 496 { |
| 497 if (!m_checkTimer.isActive()) | 497 if (!m_checkTimer.isActive()) |
| 498 m_checkTimer.startOneShot(0, FROM_HERE); | 498 m_checkTimer.startOneShot(0, FROM_HERE); |
| 499 } | 499 } |
| 500 | 500 |
| 501 LocalFrame* FrameLoader::opener() | 501 Frame* FrameLoader::opener() |
| 502 { | 502 { |
| 503 // FIXME: Temporary hack to stage converting locations that really should be
Frame. | 503 return client() ? client()->opener() : 0; |
| 504 return client() ? toLocalFrame(client()->opener()) : 0; | |
| 505 } | 504 } |
| 506 | 505 |
| 507 void FrameLoader::setOpener(LocalFrame* opener) | 506 void FrameLoader::setOpener(LocalFrame* opener) |
| 508 { | 507 { |
| 509 // If the frame is already detached, the opener has already been cleared. | 508 // If the frame is already detached, the opener has already been cleared. |
| 510 if (client()) | 509 if (client()) |
| 511 client()->setOpener(opener); | 510 client()->setOpener(opener); |
| 512 } | 511 } |
| 513 | 512 |
| 514 bool FrameLoader::allowPlugins(ReasonForCallingAllowPlugins reason) | 513 bool FrameLoader::allowPlugins(ReasonForCallingAllowPlugins reason) |
| (...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1487 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. | 1486 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. |
| 1488 Frame* parentFrame = m_frame->tree().parent(); | 1487 Frame* parentFrame = m_frame->tree().parent(); |
| 1489 if (parentFrame && parentFrame->isLocalFrame()) | 1488 if (parentFrame && parentFrame->isLocalFrame()) |
| 1490 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); | 1489 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); |
| 1491 if (FrameOwner* frameOwner = m_frame->owner()) | 1490 if (FrameOwner* frameOwner = m_frame->owner()) |
| 1492 flags |= frameOwner->sandboxFlags(); | 1491 flags |= frameOwner->sandboxFlags(); |
| 1493 return flags; | 1492 return flags; |
| 1494 } | 1493 } |
| 1495 | 1494 |
| 1496 } // namespace blink | 1495 } // namespace blink |
| OLD | NEW |