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

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

Issue 538323003: Have window.closed return true when frame is closed. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Un-inline and improve formatting of Frame::setHasBeenClosed() Created 6 years, 3 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/frame/LocalDOMWindow.cpp ('k') | Source/web/WebRemoteFrameImpl.cpp » ('j') | 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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 WebRemoteFrame* WebLocalFrameImpl::toWebRemoteFrame() 491 WebRemoteFrame* WebLocalFrameImpl::toWebRemoteFrame()
492 { 492 {
493 ASSERT_NOT_REACHED(); 493 ASSERT_NOT_REACHED();
494 return 0; 494 return 0;
495 } 495 }
496 496
497 void WebLocalFrameImpl::close() 497 void WebLocalFrameImpl::close()
498 { 498 {
499 m_client = 0; 499 m_client = 0;
500 500
501 if (m_frame)
502 m_frame->setHasBeenClosed();
503
501 deref(); // Balances ref() acquired in WebFrame::create 504 deref(); // Balances ref() acquired in WebFrame::create
502 } 505 }
503 506
504 WebString WebLocalFrameImpl::uniqueName() const 507 WebString WebLocalFrameImpl::uniqueName() const
505 { 508 {
506 return frame()->tree().uniqueName(); 509 return frame()->tree().uniqueName();
507 } 510 }
508 511
509 WebString WebLocalFrameImpl::assignedName() const 512 WebString WebLocalFrameImpl::assignedName() const
510 { 513 {
(...skipping 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after
1870 1873
1871 void WebLocalFrameImpl::invalidateAll() const 1874 void WebLocalFrameImpl::invalidateAll() const
1872 { 1875 {
1873 ASSERT(frame() && frame()->view()); 1876 ASSERT(frame() && frame()->view());
1874 FrameView* view = frame()->view(); 1877 FrameView* view = frame()->view();
1875 view->invalidateRect(view->frameRect()); 1878 view->invalidateRect(view->frameRect());
1876 invalidateScrollbar(); 1879 invalidateScrollbar();
1877 } 1880 }
1878 1881
1879 } // namespace blink 1882 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalDOMWindow.cpp ('k') | Source/web/WebRemoteFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698