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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 1560553002: Framelet Prototype 2016 Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased + Applied Brett's Windows + Fixed security issue Created 4 years, 11 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
OLDNEW
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 1812 matching lines...) Expand 10 before | Expand all | Expand 10 after
1823 webframeChild->frame()->loader().load(newRequest, loadType, childItem.get()) ; 1823 webframeChild->frame()->loader().load(newRequest, loadType, childItem.get()) ;
1824 1824
1825 // Note a synchronous navigation (about:blank) would have already processed 1825 // Note a synchronous navigation (about:blank) would have already processed
1826 // onload, so it is possible for the child frame to have already been 1826 // onload, so it is possible for the child frame to have already been
1827 // detached by script in the page. 1827 // detached by script in the page.
1828 if (!webframeChild->parent()) 1828 if (!webframeChild->parent())
1829 return nullptr; 1829 return nullptr;
1830 return webframeChild->frame(); 1830 return webframeChild->frame();
1831 } 1831 }
1832 1832
1833 WebFramelet* WebLocalFrameImpl::createFramelet(const WebURL& url)
1834 {
1835 return m_client->createFramelet(url);
1836 }
1837
1833 void WebLocalFrameImpl::didChangeContentsSize(const IntSize& size) 1838 void WebLocalFrameImpl::didChangeContentsSize(const IntSize& size)
1834 { 1839 {
1835 // This is only possible on the main frame. 1840 // This is only possible on the main frame.
1836 if (m_textFinder && m_textFinder->totalMatchCount() > 0) { 1841 if (m_textFinder && m_textFinder->totalMatchCount() > 0) {
1837 ASSERT(!parent()); 1842 ASSERT(!parent());
1838 m_textFinder->increaseMarkerVersion(); 1843 m_textFinder->increaseMarkerVersion();
1839 } 1844 }
1840 } 1845 }
1841 1846
1842 void WebLocalFrameImpl::createFrameView() 1847 void WebLocalFrameImpl::createFrameView()
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
2261 } 2266 }
2262 2267
2263 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const 2268 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
2264 { 2269 {
2265 if (!frame()) 2270 if (!frame())
2266 return WebSandboxFlags::None; 2271 return WebSandboxFlags::None;
2267 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2272 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2268 } 2273 }
2269 2274
2270 } // namespace blink 2275 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/Source/web/web.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698