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 void WebFrameImpl::setRemoteWebLayer(WebLayer* webLayer) | 547 void WebFrameImpl::setRemoteWebLayer(WebLayer* webLayer) |
548 { | 548 { |
549 if (!frame()) | 549 if (!frame()) |
550 return; | 550 return; |
551 | 551 |
552 if (frame()->remotePlatformLayer()) | 552 if (frame()->remotePlatformLayer()) |
553 GraphicsLayer::unregisterContentsLayer(frame()->remotePlatformLayer()); | 553 GraphicsLayer::unregisterContentsLayer(frame()->remotePlatformLayer()); |
554 if (webLayer) | 554 if (webLayer) |
555 GraphicsLayer::registerContentsLayer(webLayer); | 555 GraphicsLayer::registerContentsLayer(webLayer); |
556 frame()->setRemotePlatformLayer(webLayer); | 556 frame()->setRemotePlatformLayer(webLayer); |
557 frame()->ownerElement()->setNeedsStyleRecalc(WebCore::SubtreeStyleChange, We
bCore::StyleChangeFromRenderer); | 557 frame()->ownerElement()->scheduleLayerUpdate(); |
558 } | 558 } |
559 | 559 |
560 void WebFrameImpl::setPermissionClient(WebPermissionClient* permissionClient) | 560 void WebFrameImpl::setPermissionClient(WebPermissionClient* permissionClient) |
561 { | 561 { |
562 m_permissionClient = permissionClient; | 562 m_permissionClient = permissionClient; |
563 } | 563 } |
564 | 564 |
565 void WebFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerRepositoryClie
nt* client) | 565 void WebFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerRepositoryClie
nt* client) |
566 { | 566 { |
567 m_sharedWorkerRepositoryClient = SharedWorkerRepositoryClientImpl::create(cl
ient); | 567 m_sharedWorkerRepositoryClient = SharedWorkerRepositoryClientImpl::create(cl
ient); |
(...skipping 1914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2482 | 2482 |
2483 // There is a possibility that the frame being detached was the only | 2483 // There is a possibility that the frame being detached was the only |
2484 // pending one. We need to make sure final replies can be sent. | 2484 // pending one. We need to make sure final replies can be sent. |
2485 flushCurrentScopingEffort(m_findRequestIdentifier); | 2485 flushCurrentScopingEffort(m_findRequestIdentifier); |
2486 | 2486 |
2487 cancelPendingScopingEffort(); | 2487 cancelPendingScopingEffort(); |
2488 } | 2488 } |
2489 } | 2489 } |
2490 | 2490 |
2491 } // namespace blink | 2491 } // namespace blink |
OLD | NEW |