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

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

Issue 842033003: Cleanup RemotePlatformLayer when disconnecting RemoteFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/core/rendering/RenderPart.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 { 569 {
570 // The URL to the icon may be in the header. As such, only 570 // The URL to the icon may be in the header. As such, only
571 // ask the loader for the icon if it's finished loading. 571 // ask the loader for the icon if it's finished loading.
572 if (frame()->document()->loadEventFinished()) 572 if (frame()->document()->loadEventFinished())
573 return frame()->document()->iconURLs(iconTypesMask); 573 return frame()->document()->iconURLs(iconTypesMask);
574 return WebVector<WebIconURL>(); 574 return WebVector<WebIconURL>();
575 } 575 }
576 576
577 void WebLocalFrameImpl::setRemoteWebLayer(WebLayer* webLayer) 577 void WebLocalFrameImpl::setRemoteWebLayer(WebLayer* webLayer)
578 { 578 {
579 if (!frame()) 579 ASSERT_NOT_REACHED();
580 return;
581
582 frame()->setRemotePlatformLayer(webLayer);
583 } 580 }
584 581
585 void WebLocalFrameImpl::setPermissionClient(WebPermissionClient* permissionClien t) 582 void WebLocalFrameImpl::setPermissionClient(WebPermissionClient* permissionClien t)
586 { 583 {
587 m_permissionClient = permissionClient; 584 m_permissionClient = permissionClient;
588 } 585 }
589 586
590 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerRepositor yClient* client) 587 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerRepositor yClient* client)
591 { 588 {
592 m_sharedWorkerRepositoryClient = SharedWorkerRepositoryClientImpl::create(cl ient); 589 m_sharedWorkerRepositoryClient = SharedWorkerRepositoryClientImpl::create(cl ient);
(...skipping 1408 matching lines...) Expand 10 before | Expand all | Expand 10 after
2001 { 1998 {
2002 m_frameWidget = frameWidget; 1999 m_frameWidget = frameWidget;
2003 } 2000 }
2004 2001
2005 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const 2002 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const
2006 { 2003 {
2007 return m_frameWidget; 2004 return m_frameWidget;
2008 } 2005 }
2009 2006
2010 } // namespace blink 2007 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderPart.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698