| 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 1693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1704 frame()->view()->setDisplayMode(webView->displayMode()); | 1704 frame()->view()->setDisplayMode(webView->displayMode()); |
| 1705 } | 1705 } |
| 1706 | 1706 |
| 1707 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame* frame) { | 1707 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame* frame) { |
| 1708 if (!frame) | 1708 if (!frame) |
| 1709 return nullptr; | 1709 return nullptr; |
| 1710 return fromFrame(*frame); | 1710 return fromFrame(*frame); |
| 1711 } | 1711 } |
| 1712 | 1712 |
| 1713 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame& frame) { | 1713 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame& frame) { |
| 1714 FrameLoaderClient* client = frame.loader().client(); | 1714 LocalFrameClient* client = frame.loader().client(); |
| 1715 if (!client || !client->isFrameLoaderClientImpl()) | 1715 if (!client || !client->isLocalFrameClientImpl()) |
| 1716 return nullptr; | 1716 return nullptr; |
| 1717 return toFrameLoaderClientImpl(client)->webFrame(); | 1717 return toLocalFrameClientImpl(client)->webFrame(); |
| 1718 } | 1718 } |
| 1719 | 1719 |
| 1720 WebLocalFrameImpl* WebLocalFrameImpl::fromFrameOwnerElement(Element* element) { | 1720 WebLocalFrameImpl* WebLocalFrameImpl::fromFrameOwnerElement(Element* element) { |
| 1721 if (!element->isFrameOwnerElement()) | 1721 if (!element->isFrameOwnerElement()) |
| 1722 return nullptr; | 1722 return nullptr; |
| 1723 return fromFrame( | 1723 return fromFrame( |
| 1724 toLocalFrame(toHTMLFrameOwnerElement(element)->contentFrame())); | 1724 toLocalFrame(toHTMLFrameOwnerElement(element)->contentFrame())); |
| 1725 } | 1725 } |
| 1726 | 1726 |
| 1727 WebViewImpl* WebLocalFrameImpl::viewImpl() const { | 1727 WebViewImpl* WebLocalFrameImpl::viewImpl() const { |
| (...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2440 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2440 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
| 2441 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2441 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2442 } else { | 2442 } else { |
| 2443 clipHtml = | 2443 clipHtml = |
| 2444 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2444 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
| 2445 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2445 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2446 } | 2446 } |
| 2447 } | 2447 } |
| 2448 | 2448 |
| 2449 } // namespace blink | 2449 } // namespace blink |
| OLD | NEW |