| 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 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1518 } | 1518 } |
| 1519 | 1519 |
| 1520 WebLocalFrameImpl::~WebLocalFrameImpl() | 1520 WebLocalFrameImpl::~WebLocalFrameImpl() |
| 1521 { | 1521 { |
| 1522 Platform::current()->decrementStatsCounter(webFrameActiveCount); | 1522 Platform::current()->decrementStatsCounter(webFrameActiveCount); |
| 1523 frameCount--; | 1523 frameCount--; |
| 1524 | 1524 |
| 1525 cancelPendingScopingEffort(); | 1525 cancelPendingScopingEffort(); |
| 1526 } | 1526 } |
| 1527 | 1527 |
| 1528 #if ENABLE(OILPAN) |
| 1528 void WebLocalFrameImpl::trace(Visitor* visitor) | 1529 void WebLocalFrameImpl::trace(Visitor* visitor) |
| 1529 { | 1530 { |
| 1530 #if ENABLE(OILPAN) | |
| 1531 visitor->trace(m_frame); | 1531 visitor->trace(m_frame); |
| 1532 visitor->trace(m_printContext); | 1532 visitor->trace(m_printContext); |
| 1533 visitor->trace(m_geolocationClientProxy); | 1533 visitor->trace(m_geolocationClientProxy); |
| 1534 | 1534 visitor->registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>(this); |
| 1535 WebFrame::traceChildren(visitor, this); | 1535 WebFrame::traceFrames(visitor, this); |
| 1536 } |
| 1536 #endif | 1537 #endif |
| 1537 } | |
| 1538 | 1538 |
| 1539 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) | 1539 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) |
| 1540 { | 1540 { |
| 1541 m_frame = frame; | 1541 m_frame = frame; |
| 1542 | 1542 |
| 1543 // FIXME: we shouldn't add overhead to every frame by registering these obje
cts when they're not used. | 1543 // FIXME: we shouldn't add overhead to every frame by registering these obje
cts when they're not used. |
| 1544 if (m_frame) { | 1544 if (m_frame) { |
| 1545 OwnPtr<NotificationPresenterImpl> notificationPresenter = adoptPtr(new N
otificationPresenterImpl()); | 1545 OwnPtr<NotificationPresenterImpl> notificationPresenter = adoptPtr(new N
otificationPresenterImpl()); |
| 1546 if (m_client) | 1546 if (m_client) |
| 1547 notificationPresenter->initialize(m_client->notificationPresenter())
; | 1547 notificationPresenter->initialize(m_client->notificationPresenter())
; |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1916 | 1916 |
| 1917 void WebLocalFrameImpl::invalidateAll() const | 1917 void WebLocalFrameImpl::invalidateAll() const |
| 1918 { | 1918 { |
| 1919 ASSERT(frame() && frame()->view()); | 1919 ASSERT(frame() && frame()->view()); |
| 1920 FrameView* view = frame()->view(); | 1920 FrameView* view = frame()->view(); |
| 1921 view->invalidateRect(view->frameRect()); | 1921 view->invalidateRect(view->frameRect()); |
| 1922 invalidateScrollbar(); | 1922 invalidateScrollbar(); |
| 1923 } | 1923 } |
| 1924 | 1924 |
| 1925 } // namespace blink | 1925 } // namespace blink |
| OLD | NEW |