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

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, 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 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 { 568 {
569 // The URL to the icon may be in the header. As such, only 569 // The URL to the icon may be in the header. As such, only
570 // ask the loader for the icon if it's finished loading. 570 // ask the loader for the icon if it's finished loading.
571 if (frame()->document()->loadEventFinished()) 571 if (frame()->document()->loadEventFinished())
572 return frame()->document()->iconURLs(iconTypesMask); 572 return frame()->document()->iconURLs(iconTypesMask);
573 return WebVector<WebIconURL>(); 573 return WebVector<WebIconURL>();
574 } 574 }
575 575
576 void WebLocalFrameImpl::setRemoteWebLayer(WebLayer* webLayer) 576 void WebLocalFrameImpl::setRemoteWebLayer(WebLayer* webLayer)
577 { 577 {
578 if (!frame()) 578 ASSERT_NOT_REACHED();
579 return;
580
581 frame()->setRemotePlatformLayer(webLayer);
582 } 579 }
583 580
584 void WebLocalFrameImpl::setPermissionClient(WebPermissionClient* permissionClien t) 581 void WebLocalFrameImpl::setPermissionClient(WebPermissionClient* permissionClien t)
585 { 582 {
586 m_permissionClient = permissionClient; 583 m_permissionClient = permissionClient;
587 } 584 }
588 585
589 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerRepositor yClient* client) 586 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerRepositor yClient* client)
590 { 587 {
591 m_sharedWorkerRepositoryClient = SharedWorkerRepositoryClientImpl::create(cl ient); 588 m_sharedWorkerRepositoryClient = SharedWorkerRepositoryClientImpl::create(cl ient);
(...skipping 1418 matching lines...) Expand 10 before | Expand all | Expand 10 after
2010 { 2007 {
2011 m_frameWidget = frameWidget; 2008 m_frameWidget = frameWidget;
2012 } 2009 }
2013 2010
2014 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const 2011 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const
2015 { 2012 {
2016 return m_frameWidget; 2013 return m_frameWidget;
2017 } 2014 }
2018 2015
2019 } // namespace blink 2016 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698