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 1557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1568 } | 1568 } |
1569 | 1569 |
1570 WebLocalFrameImpl::~WebLocalFrameImpl() | 1570 WebLocalFrameImpl::~WebLocalFrameImpl() |
1571 { | 1571 { |
1572 Platform::current()->decrementStatsCounter(webFrameActiveCount); | 1572 Platform::current()->decrementStatsCounter(webFrameActiveCount); |
1573 frameCount--; | 1573 frameCount--; |
1574 | 1574 |
1575 cancelPendingScopingEffort(); | 1575 cancelPendingScopingEffort(); |
1576 } | 1576 } |
1577 | 1577 |
| 1578 #if ENABLE(OILPAN) |
1578 void WebLocalFrameImpl::trace(Visitor* visitor) | 1579 void WebLocalFrameImpl::trace(Visitor* visitor) |
1579 { | 1580 { |
1580 #if ENABLE(OILPAN) | |
1581 visitor->trace(m_frame); | 1581 visitor->trace(m_frame); |
1582 visitor->trace(m_printContext); | 1582 visitor->trace(m_printContext); |
1583 visitor->trace(m_geolocationClientProxy); | 1583 visitor->trace(m_geolocationClientProxy); |
| 1584 visitor->registerWeakMembers<WebLocalFrameImpl, &WebLocalFrameImpl::clearWea
kMembers>(this); |
| 1585 WebFrame::traceFrames(visitor, this); |
| 1586 } |
1584 | 1587 |
1585 WebFrame::traceChildren(visitor, this); | 1588 void WebLocalFrameImpl::clearWeakMembers(Visitor* visitor) |
| 1589 { |
| 1590 WebFrame::clearWeakFrames(visitor, this); |
| 1591 } |
1586 #endif | 1592 #endif |
1587 } | |
1588 | 1593 |
1589 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) | 1594 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) |
1590 { | 1595 { |
1591 m_frame = frame; | 1596 m_frame = frame; |
1592 | 1597 |
1593 // FIXME: we shouldn't add overhead to every frame by registering these obje
cts when they're not used. | 1598 // FIXME: we shouldn't add overhead to every frame by registering these obje
cts when they're not used. |
1594 if (m_frame) { | 1599 if (m_frame) { |
1595 OwnPtr<NotificationPresenterImpl> notificationPresenter = adoptPtr(new N
otificationPresenterImpl()); | 1600 OwnPtr<NotificationPresenterImpl> notificationPresenter = adoptPtr(new N
otificationPresenterImpl()); |
1596 if (m_client) | 1601 if (m_client) |
1597 notificationPresenter->initialize(m_client->notificationPresenter())
; | 1602 notificationPresenter->initialize(m_client->notificationPresenter())
; |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1913 | 1918 |
1914 void WebLocalFrameImpl::invalidateAll() const | 1919 void WebLocalFrameImpl::invalidateAll() const |
1915 { | 1920 { |
1916 ASSERT(frame() && frame()->view()); | 1921 ASSERT(frame() && frame()->view()); |
1917 FrameView* view = frame()->view(); | 1922 FrameView* view = frame()->view(); |
1918 view->invalidateRect(view->frameRect()); | 1923 view->invalidateRect(view->frameRect()); |
1919 invalidateScrollbar(); | 1924 invalidateScrollbar(); |
1920 } | 1925 } |
1921 | 1926 |
1922 } // namespace blink | 1927 } // namespace blink |
OLD | NEW |