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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 | 547 |
548 WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypesMask) const | 548 WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypesMask) const |
549 { | 549 { |
550 // The URL to the icon may be in the header. As such, only | 550 // The URL to the icon may be in the header. As such, only |
551 // ask the loader for the icon if it's finished loading. | 551 // ask the loader for the icon if it's finished loading. |
552 if (frame()->loader().state() == FrameStateComplete) | 552 if (frame()->loader().state() == FrameStateComplete) |
553 return frame()->document()->iconURLs(iconTypesMask); | 553 return frame()->document()->iconURLs(iconTypesMask); |
554 return WebVector<WebIconURL>(); | 554 return WebVector<WebIconURL>(); |
555 } | 555 } |
556 | 556 |
| 557 void WebFrameImpl::setIsRemote(bool isRemote) |
| 558 { |
| 559 m_isRemote = isRemote; |
| 560 if (isRemote) |
| 561 client()->initializeChildFrame(frame()->view()->frameRect(), frame()->vi
ew()->visibleContentScaleFactor()); |
| 562 } |
| 563 |
557 void WebFrameImpl::setRemoteWebLayer(WebLayer* webLayer) | 564 void WebFrameImpl::setRemoteWebLayer(WebLayer* webLayer) |
558 { | 565 { |
559 if (!frame()) | 566 if (!frame()) |
560 return; | 567 return; |
561 | 568 |
562 if (frame()->remotePlatformLayer()) | 569 if (frame()->remotePlatformLayer()) |
563 GraphicsLayer::unregisterContentsLayer(frame()->remotePlatformLayer()); | 570 GraphicsLayer::unregisterContentsLayer(frame()->remotePlatformLayer()); |
564 if (webLayer) | 571 if (webLayer) |
565 GraphicsLayer::registerContentsLayer(webLayer); | 572 GraphicsLayer::registerContentsLayer(webLayer); |
566 frame()->setRemotePlatformLayer(webLayer); | 573 frame()->setRemotePlatformLayer(webLayer); |
(...skipping 1922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2489 | 2496 |
2490 // 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 |
2491 // 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. |
2492 flushCurrentScopingEffort(m_findRequestIdentifier); | 2499 flushCurrentScopingEffort(m_findRequestIdentifier); |
2493 | 2500 |
2494 cancelPendingScopingEffort(); | 2501 cancelPendingScopingEffort(); |
2495 } | 2502 } |
2496 } | 2503 } |
2497 | 2504 |
2498 } // namespace blink | 2505 } // namespace blink |
OLD | NEW |