| 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 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 bool m_reset; | 482 bool m_reset; |
| 483 }; | 483 }; |
| 484 | 484 |
| 485 // WebFrame ------------------------------------------------------------------- | 485 // WebFrame ------------------------------------------------------------------- |
| 486 | 486 |
| 487 int WebFrame::instanceCount() | 487 int WebFrame::instanceCount() |
| 488 { | 488 { |
| 489 return frameCount; | 489 return frameCount; |
| 490 } | 490 } |
| 491 | 491 |
| 492 WebLocalFrame* WebFrame::frameForCurrentContext() | 492 WebFrame* WebFrame::frameForCurrentContext() |
| 493 { | 493 { |
| 494 v8::Handle<v8::Context> context = v8::Isolate::GetCurrent()->GetCurrentConte
xt(); | 494 v8::Handle<v8::Context> context = v8::Isolate::GetCurrent()->GetCurrentConte
xt(); |
| 495 if (context.IsEmpty()) | 495 if (context.IsEmpty()) |
| 496 return 0; | 496 return 0; |
| 497 return frameForContext(context); | 497 return frameForContext(context); |
| 498 } | 498 } |
| 499 | 499 |
| 500 WebLocalFrame* WebFrame::frameForContext(v8::Handle<v8::Context> context) | 500 WebFrame* WebFrame::frameForContext(v8::Handle<v8::Context> context) |
| 501 { | 501 { |
| 502 return WebFrameImpl::fromFrame(toFrameIfNotDetached(context)); | 502 return WebFrameImpl::fromFrame(toFrameIfNotDetached(context)); |
| 503 } | 503 } |
| 504 | 504 |
| 505 WebLocalFrame* WebFrame::fromFrameOwnerElement(const WebElement& element) | 505 WebFrame* WebFrame::fromFrameOwnerElement(const WebElement& element) |
| 506 { | 506 { |
| 507 return WebFrameImpl::fromFrameOwnerElement(PassRefPtr<Element>(element).get(
)); | 507 return WebFrameImpl::fromFrameOwnerElement(PassRefPtr<Element>(element).get(
)); |
| 508 } | 508 } |
| 509 | 509 |
| 510 void WebFrameImpl::close() | 510 void WebFrameImpl::close() |
| 511 { | 511 { |
| 512 m_client = 0; | 512 m_client = 0; |
| 513 deref(); // Balances ref() acquired in WebFrame::create | 513 deref(); // Balances ref() acquired in WebFrame::create |
| 514 } | 514 } |
| 515 | 515 |
| (...skipping 1980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2496 | 2496 |
| 2497 // There is a possibility that the frame being detached was the only | 2497 // There is a possibility that the frame being detached was the only |
| 2498 // pending one. We need to make sure final replies can be sent. | 2498 // pending one. We need to make sure final replies can be sent. |
| 2499 flushCurrentScopingEffort(m_findRequestIdentifier); | 2499 flushCurrentScopingEffort(m_findRequestIdentifier); |
| 2500 | 2500 |
| 2501 cancelPendingScopingEffort(); | 2501 cancelPendingScopingEffort(); |
| 2502 } | 2502 } |
| 2503 } | 2503 } |
| 2504 | 2504 |
| 2505 } // namespace blink | 2505 } // namespace blink |
| OLD | NEW |