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

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

Issue 1602663003: Framelet Prototype 2016 using Mojo IPC Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Disabled oilpan Created 4 years, 10 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 1801 matching lines...) Expand 10 before | Expand all | Expand 10 after
1812 webframeChild->frame()->loader().load(newRequest, loadType, childItem.get()) ; 1812 webframeChild->frame()->loader().load(newRequest, loadType, childItem.get()) ;
1813 1813
1814 // Note a synchronous navigation (about:blank) would have already processed 1814 // Note a synchronous navigation (about:blank) would have already processed
1815 // onload, so it is possible for the child frame to have already been 1815 // onload, so it is possible for the child frame to have already been
1816 // detached by script in the page. 1816 // detached by script in the page.
1817 if (!webframeChild->parent()) 1817 if (!webframeChild->parent())
1818 return nullptr; 1818 return nullptr;
1819 return webframeChild->frame(); 1819 return webframeChild->frame();
1820 } 1820 }
1821 1821
1822 WebFramelet* WebLocalFrameImpl::createFramelet(const WebURL& url)
1823 {
1824 return m_client->createFramelet(url);
1825 }
1826
1822 void WebLocalFrameImpl::didChangeContentsSize(const IntSize& size) 1827 void WebLocalFrameImpl::didChangeContentsSize(const IntSize& size)
1823 { 1828 {
1824 // This is only possible on the main frame. 1829 // This is only possible on the main frame.
1825 if (m_textFinder && m_textFinder->totalMatchCount() > 0) { 1830 if (m_textFinder && m_textFinder->totalMatchCount() > 0) {
1826 ASSERT(!parent()); 1831 ASSERT(!parent());
1827 m_textFinder->increaseMarkerVersion(); 1832 m_textFinder->increaseMarkerVersion();
1828 } 1833 }
1829 } 1834 }
1830 1835
1831 void WebLocalFrameImpl::createFrameView() 1836 void WebLocalFrameImpl::createFrameView()
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
2255 return WebSandboxFlags::None; 2260 return WebSandboxFlags::None;
2256 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2261 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2257 } 2262 }
2258 2263
2259 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2264 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2260 { 2265 {
2261 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2266 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2262 } 2267 }
2263 2268
2264 } // namespace blink 2269 } // 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