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 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 return; | 558 return; |
559 | 559 |
560 if (frame()->remotePlatformLayer()) | 560 if (frame()->remotePlatformLayer()) |
561 GraphicsLayer::unregisterContentsLayer(frame()->remotePlatformLayer()); | 561 GraphicsLayer::unregisterContentsLayer(frame()->remotePlatformLayer()); |
562 if (webLayer) | 562 if (webLayer) |
563 GraphicsLayer::registerContentsLayer(webLayer); | 563 GraphicsLayer::registerContentsLayer(webLayer); |
564 frame()->setRemotePlatformLayer(webLayer); | 564 frame()->setRemotePlatformLayer(webLayer); |
565 // FIXME: This should be moved to WebRemoteFrame. | 565 // FIXME: This should be moved to WebRemoteFrame. |
566 ASSERT(frame()->deprecatedLocalOwner()); | 566 ASSERT(frame()->deprecatedLocalOwner()); |
567 frame()->deprecatedLocalOwner()->setNeedsCompositingUpdate(); | 567 frame()->deprecatedLocalOwner()->setNeedsCompositingUpdate(); |
568 frame()->ownerRenderer()->layer()->updateSelfPaintingLayer(); | 568 if (RenderPart* renderer = frame()->ownerRenderer()) |
| 569 renderer->layer()->updateSelfPaintingLayer(); |
569 } | 570 } |
570 | 571 |
571 void WebLocalFrameImpl::setPermissionClient(WebPermissionClient* permissionClien
t) | 572 void WebLocalFrameImpl::setPermissionClient(WebPermissionClient* permissionClien
t) |
572 { | 573 { |
573 m_permissionClient = permissionClient; | 574 m_permissionClient = permissionClient; |
574 } | 575 } |
575 | 576 |
576 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerRepositor
yClient* client) | 577 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerRepositor
yClient* client) |
577 { | 578 { |
578 m_sharedWorkerRepositoryClient = SharedWorkerRepositoryClientImpl::create(cl
ient); | 579 m_sharedWorkerRepositoryClient = SharedWorkerRepositoryClientImpl::create(cl
ient); |
(...skipping 1370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1949 { | 1950 { |
1950 RefPtr<LocalFrame> frame = LocalFrame::create(&m_frameLoaderClientImpl, host
, owner); | 1951 RefPtr<LocalFrame> frame = LocalFrame::create(&m_frameLoaderClientImpl, host
, owner); |
1951 setWebCoreFrame(frame); | 1952 setWebCoreFrame(frame); |
1952 frame->tree().setName(name, fallbackName); | 1953 frame->tree().setName(name, fallbackName); |
1953 // May dispatch JS events; frame may be detached after this. | 1954 // May dispatch JS events; frame may be detached after this. |
1954 frame->init(); | 1955 frame->init(); |
1955 return frame; | 1956 return frame; |
1956 } | 1957 } |
1957 | 1958 |
1958 } // namespace blink | 1959 } // namespace blink |
OLD | NEW |