| 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 1789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1800 { | 1800 { |
| 1801 return m_devToolsAgent.get(); | 1801 return m_devToolsAgent.get(); |
| 1802 } | 1802 } |
| 1803 | 1803 |
| 1804 WebLocalFrameImpl* WebLocalFrameImpl::localRoot() | 1804 WebLocalFrameImpl* WebLocalFrameImpl::localRoot() |
| 1805 { | 1805 { |
| 1806 // This can't use the LocalFrame::localFrameRoot, since it may be called | 1806 // This can't use the LocalFrame::localFrameRoot, since it may be called |
| 1807 // when the WebLocalFrame exists but the core LocalFrame does not. | 1807 // when the WebLocalFrame exists but the core LocalFrame does not. |
| 1808 // TODO(alexmos, dcheng): Clean this up to only calculate this in one place. | 1808 // TODO(alexmos, dcheng): Clean this up to only calculate this in one place. |
| 1809 WebLocalFrameImpl* localRoot = this; | 1809 WebLocalFrameImpl* localRoot = this; |
| 1810 while (!localRoot->frameWidget()) | 1810 while (localRoot->parent() && localRoot->parent()->isWebLocalFrame()) |
| 1811 localRoot = toWebLocalFrameImpl(localRoot->parent()); | 1811 localRoot = toWebLocalFrameImpl(localRoot->parent()); |
| 1812 return localRoot; | 1812 return localRoot; |
| 1813 } | 1813 } |
| 1814 | 1814 |
| 1815 WebLocalFrame* WebLocalFrameImpl::traversePreviousLocal(bool wrap) const | 1815 WebLocalFrame* WebLocalFrameImpl::traversePreviousLocal(bool wrap) const |
| 1816 { | 1816 { |
| 1817 WebFrame* previousLocalFrame = this->traversePrevious(wrap); | 1817 WebFrame* previousLocalFrame = this->traversePrevious(wrap); |
| 1818 while (previousLocalFrame && !previousLocalFrame->isWebLocalFrame()) | 1818 while (previousLocalFrame && !previousLocalFrame->isWebLocalFrame()) |
| 1819 previousLocalFrame = previousLocalFrame->traversePrevious(wrap); | 1819 previousLocalFrame = previousLocalFrame->traversePrevious(wrap); |
| 1820 return previousLocalFrame ? previousLocalFrame->toWebLocalFrame() : nullptr; | 1820 return previousLocalFrame ? previousLocalFrame->toWebLocalFrame() : nullptr; |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2156 { | 2156 { |
| 2157 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); | 2157 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); |
| 2158 } | 2158 } |
| 2159 | 2159 |
| 2160 void WebLocalFrameImpl::clearActiveFindMatch() | 2160 void WebLocalFrameImpl::clearActiveFindMatch() |
| 2161 { | 2161 { |
| 2162 ensureTextFinder().clearActiveFindMatch(); | 2162 ensureTextFinder().clearActiveFindMatch(); |
| 2163 } | 2163 } |
| 2164 | 2164 |
| 2165 } // namespace blink | 2165 } // namespace blink |
| OLD | NEW |