Chromium Code Reviews| 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 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 549 return; | 549 return; |
| 550 | 550 |
| 551 if (frame()->remotePlatformLayer()) | 551 if (frame()->remotePlatformLayer()) |
| 552 GraphicsLayer::unregisterContentsLayer(frame()->remotePlatformLayer()); | 552 GraphicsLayer::unregisterContentsLayer(frame()->remotePlatformLayer()); |
| 553 if (webLayer) | 553 if (webLayer) |
| 554 GraphicsLayer::registerContentsLayer(webLayer); | 554 GraphicsLayer::registerContentsLayer(webLayer); |
| 555 frame()->setRemotePlatformLayer(webLayer); | 555 frame()->setRemotePlatformLayer(webLayer); |
| 556 // FIXME: This should be moved to WebRemoteFrame. | 556 // FIXME: This should be moved to WebRemoteFrame. |
| 557 ASSERT(frame()->deprecatedLocalOwner()); | 557 ASSERT(frame()->deprecatedLocalOwner()); |
| 558 frame()->deprecatedLocalOwner()->setNeedsCompositingUpdate(); | 558 frame()->deprecatedLocalOwner()->setNeedsCompositingUpdate(); |
| 559 if (frame()->ownerRenderer()->layer()) | |
| 560 frame()->ownerRenderer()->layer()->updateSelfPaintingLayer(); | |
|
esprehn
2014/06/13 19:06:50
frames will always have layers, you don't need to
| |
| 559 } | 561 } |
| 560 | 562 |
| 561 void WebLocalFrameImpl::setPermissionClient(WebPermissionClient* permissionClien t) | 563 void WebLocalFrameImpl::setPermissionClient(WebPermissionClient* permissionClien t) |
| 562 { | 564 { |
| 563 m_permissionClient = permissionClient; | 565 m_permissionClient = permissionClient; |
| 564 } | 566 } |
| 565 | 567 |
| 566 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerRepositor yClient* client) | 568 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(WebSharedWorkerRepositor yClient* client) |
| 567 { | 569 { |
| 568 m_sharedWorkerRepositoryClient = SharedWorkerRepositoryClientImpl::create(cl ient); | 570 m_sharedWorkerRepositoryClient = SharedWorkerRepositoryClientImpl::create(cl ient); |
| (...skipping 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1946 | 1948 |
| 1947 void WebLocalFrameImpl::invalidateAll() const | 1949 void WebLocalFrameImpl::invalidateAll() const |
| 1948 { | 1950 { |
| 1949 ASSERT(frame() && frame()->view()); | 1951 ASSERT(frame() && frame()->view()); |
| 1950 FrameView* view = frame()->view(); | 1952 FrameView* view = frame()->view(); |
| 1951 view->invalidateRect(view->frameRect()); | 1953 view->invalidateRect(view->frameRect()); |
| 1952 invalidateScrollbar(); | 1954 invalidateScrollbar(); |
| 1953 } | 1955 } |
| 1954 | 1956 |
| 1955 } // namespace blink | 1957 } // namespace blink |
| OLD | NEW |