| 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 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 | 502 |
| 503 WebRemoteFrame* WebLocalFrameImpl::toWebRemoteFrame() | 503 WebRemoteFrame* WebLocalFrameImpl::toWebRemoteFrame() |
| 504 { | 504 { |
| 505 ASSERT_NOT_REACHED(); | 505 ASSERT_NOT_REACHED(); |
| 506 return 0; | 506 return 0; |
| 507 } | 507 } |
| 508 | 508 |
| 509 void WebLocalFrameImpl::close() | 509 void WebLocalFrameImpl::close() |
| 510 { | 510 { |
| 511 m_client = 0; | 511 m_client = 0; |
| 512 |
| 513 // FIXME: Oilpan: Signal to LocalFrame and its supplements that the frame is |
| 514 // being torn down so it can do prompt clean-up. For example, this will |
| 515 // clear the raw back pointer to m_geolocationClientProxy. Once |
| 516 // GeolocationClientProxy is on-heap it looks like we can completely remove |
| 517 // |willBeDestroyed| from supplements since tracing will ensure safety. |
| 518 if (m_frame) |
| 519 m_frame->willBeDestroyed(); |
| 520 |
| 512 deref(); // Balances ref() acquired in WebFrame::create | 521 deref(); // Balances ref() acquired in WebFrame::create |
| 513 } | 522 } |
| 514 | 523 |
| 515 WebString WebLocalFrameImpl::uniqueName() const | 524 WebString WebLocalFrameImpl::uniqueName() const |
| 516 { | 525 { |
| 517 return frame()->tree().uniqueName(); | 526 return frame()->tree().uniqueName(); |
| 518 } | 527 } |
| 519 | 528 |
| 520 WebString WebLocalFrameImpl::assignedName() const | 529 WebString WebLocalFrameImpl::assignedName() const |
| 521 { | 530 { |
| (...skipping 1424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1946 | 1955 |
| 1947 void WebLocalFrameImpl::invalidateAll() const | 1956 void WebLocalFrameImpl::invalidateAll() const |
| 1948 { | 1957 { |
| 1949 ASSERT(frame() && frame()->view()); | 1958 ASSERT(frame() && frame()->view()); |
| 1950 FrameView* view = frame()->view(); | 1959 FrameView* view = frame()->view(); |
| 1951 view->invalidateRect(view->frameRect()); | 1960 view->invalidateRect(view->frameRect()); |
| 1952 invalidateScrollbar(); | 1961 invalidateScrollbar(); |
| 1953 } | 1962 } |
| 1954 | 1963 |
| 1955 } // namespace blink | 1964 } // namespace blink |
| OLD | NEW |