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

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

Issue 2706963004: Clear opener when frame is detached. (Closed)
Patch Set: addressing comments Created 3 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 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 bool WebLocalFrameImpl::isWebRemoteFrame() const { 525 bool WebLocalFrameImpl::isWebRemoteFrame() const {
526 return false; 526 return false;
527 } 527 }
528 528
529 WebRemoteFrame* WebLocalFrameImpl::toWebRemoteFrame() { 529 WebRemoteFrame* WebLocalFrameImpl::toWebRemoteFrame() {
530 NOTREACHED(); 530 NOTREACHED();
531 return 0; 531 return 0;
532 } 532 }
533 533
534 void WebLocalFrameImpl::close() { 534 void WebLocalFrameImpl::close() {
535 WebLocalFrame::close();
536
535 m_client = nullptr; 537 m_client = nullptr;
536 538
537 if (m_devToolsAgent) 539 if (m_devToolsAgent)
538 m_devToolsAgent.clear(); 540 m_devToolsAgent.clear();
539 541
540 m_selfKeepAlive.clear(); 542 m_selfKeepAlive.clear();
541 } 543 }
542 544
543 WebString WebLocalFrameImpl::uniqueName() const { 545 WebString WebLocalFrameImpl::uniqueName() const {
544 return frame()->tree().uniqueName(); 546 return frame()->tree().uniqueName();
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
1554 frameCount--; 1556 frameCount--;
1555 } 1557 }
1556 1558
1557 DEFINE_TRACE(WebLocalFrameImpl) { 1559 DEFINE_TRACE(WebLocalFrameImpl) {
1558 visitor->trace(m_frameLoaderClientImpl); 1560 visitor->trace(m_frameLoaderClientImpl);
1559 visitor->trace(m_frame); 1561 visitor->trace(m_frame);
1560 visitor->trace(m_devToolsAgent); 1562 visitor->trace(m_devToolsAgent);
1561 visitor->trace(m_textFinder); 1563 visitor->trace(m_textFinder);
1562 visitor->trace(m_printContext); 1564 visitor->trace(m_printContext);
1563 visitor->trace(m_contextMenuNode); 1565 visitor->trace(m_contextMenuNode);
1564 visitor->template registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>(
1565 this);
1566 WebFrame::traceFrames(visitor, this); 1566 WebFrame::traceFrames(visitor, this);
1567 WebFrameImplBase::trace(visitor); 1567 WebFrameImplBase::trace(visitor);
1568 } 1568 }
1569 1569
1570 void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame) { 1570 void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame) {
1571 m_frame = frame; 1571 m_frame = frame;
1572 } 1572 }
1573 1573
1574 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, 1574 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host,
1575 FrameOwner* owner, 1575 FrameOwner* owner,
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
2439 createMarkup(startPosition, endPosition, AnnotateForInterchange, 2439 createMarkup(startPosition, endPosition, AnnotateForInterchange,
2440 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2440 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2441 } else { 2441 } else {
2442 clipHtml = 2442 clipHtml =
2443 createMarkup(endPosition, startPosition, AnnotateForInterchange, 2443 createMarkup(endPosition, startPosition, AnnotateForInterchange,
2444 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2444 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2445 } 2445 }
2446 } 2446 }
2447 2447
2448 } // namespace blink 2448 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrame.cpp ('k') | third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698