OLD | NEW |
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 Loading... |
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 Loading... |
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 |
OLD | NEW |