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 1519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1530 { | 1530 { |
1531 Platform::current()->incrementStatsCounter(webFrameActiveCount); | 1531 Platform::current()->incrementStatsCounter(webFrameActiveCount); |
1532 frameCount++; | 1532 frameCount++; |
1533 } | 1533 } |
1534 | 1534 |
1535 WebLocalFrameImpl::~WebLocalFrameImpl() | 1535 WebLocalFrameImpl::~WebLocalFrameImpl() |
1536 { | 1536 { |
1537 Platform::current()->decrementStatsCounter(webFrameActiveCount); | 1537 Platform::current()->decrementStatsCounter(webFrameActiveCount); |
1538 frameCount--; | 1538 frameCount--; |
1539 | 1539 |
1540 #if !ENABLE(OILPAN) | |
1540 cancelPendingScopingEffort(); | 1541 cancelPendingScopingEffort(); |
haraken
2014/10/24 01:18:21
Just to confirm: It is ok not to call cancelPendin
sof
2014/10/24 05:32:00
Correct - the TextFinder is owned&controlled by We
| |
1542 #endif | |
1541 } | 1543 } |
1542 | 1544 |
1543 #if ENABLE(OILPAN) | 1545 #if ENABLE(OILPAN) |
1544 void WebLocalFrameImpl::trace(Visitor* visitor) | 1546 void WebLocalFrameImpl::trace(Visitor* visitor) |
1545 { | 1547 { |
1546 visitor->trace(m_frame); | 1548 visitor->trace(m_frame); |
1549 visitor->trace(m_textFinder); | |
1547 visitor->trace(m_printContext); | 1550 visitor->trace(m_printContext); |
1548 visitor->trace(m_geolocationClientProxy); | 1551 visitor->trace(m_geolocationClientProxy); |
1549 visitor->registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>(this); | 1552 visitor->registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>(this); |
1550 WebFrame::traceFrames(visitor, this); | 1553 WebFrame::traceFrames(visitor, this); |
1551 } | 1554 } |
1552 #endif | 1555 #endif |
1553 | 1556 |
1554 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) | 1557 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) |
1555 { | 1558 { |
1556 m_frame = frame; | 1559 m_frame = frame; |
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1945 | 1948 |
1946 void WebLocalFrameImpl::invalidateAll() const | 1949 void WebLocalFrameImpl::invalidateAll() const |
1947 { | 1950 { |
1948 ASSERT(frame() && frame()->view()); | 1951 ASSERT(frame() && frame()->view()); |
1949 FrameView* view = frame()->view(); | 1952 FrameView* view = frame()->view(); |
1950 view->invalidateRect(view->frameRect()); | 1953 view->invalidateRect(view->frameRect()); |
1951 invalidateScrollbar(); | 1954 invalidateScrollbar(); |
1952 } | 1955 } |
1953 | 1956 |
1954 } // namespace blink | 1957 } // namespace blink |
OLD | NEW |