| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 732 return frame() && frame()->view() && frame()->view()->verticalScrollbar(); | 732 return frame() && frame()->view() && frame()->view()->verticalScrollbar(); |
| 733 } | 733 } |
| 734 | 734 |
| 735 WebView* WebLocalFrameImpl::view() const | 735 WebView* WebLocalFrameImpl::view() const |
| 736 { | 736 { |
| 737 return viewImpl(); | 737 return viewImpl(); |
| 738 } | 738 } |
| 739 | 739 |
| 740 void WebLocalFrameImpl::setOpener(WebFrame* opener) | 740 void WebLocalFrameImpl::setOpener(WebFrame* opener) |
| 741 { | 741 { |
| 742 // TODO(alexmos): Remove this once didChangeOpener is implemented in | |
| 743 // content, as all opener updates will go through it, including disowned | |
| 744 // openers. | |
| 745 if (WebFrame::opener() && !opener && m_client) | |
| 746 m_client->didDisownOpener(this); | |
| 747 | |
| 748 WebFrame::setOpener(opener); | 742 WebFrame::setOpener(opener); |
| 749 | 743 |
| 750 ASSERT(m_frame); | 744 ASSERT(m_frame); |
| 751 if (m_frame && m_frame->document()) | 745 if (m_frame && m_frame->document()) |
| 752 m_frame->document()->initSecurityContext(); | 746 m_frame->document()->initSecurityContext(); |
| 753 } | 747 } |
| 754 | 748 |
| 755 WebDocument WebLocalFrameImpl::document() const | 749 WebDocument WebLocalFrameImpl::document() const |
| 756 { | 750 { |
| 757 if (!frame() || !frame()->document()) | 751 if (!frame() || !frame()->document()) |
| (...skipping 1438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2196 } | 2190 } |
| 2197 | 2191 |
| 2198 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const | 2192 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const |
| 2199 { | 2193 { |
| 2200 if (!frame()) | 2194 if (!frame()) |
| 2201 return WebSandboxFlags::None; | 2195 return WebSandboxFlags::None; |
| 2202 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); | 2196 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); |
| 2203 } | 2197 } |
| 2204 | 2198 |
| 2205 } // namespace blink | 2199 } // namespace blink |
| OLD | NEW |