| Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| index d41aef293f0b95ce9767c1ba7c63729d3dc381f2..54eec3443ec2603214acf5e686fbfc31389d8973 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| @@ -33,6 +33,7 @@
|
| #include "core/frame/RemoteFrame.h"
|
| #include "core/frame/Settings.h"
|
| #include "core/html/HTMLCanvasElement.h"
|
| +#include "core/html/HTMLFrameletElement.h"
|
| #include "core/html/HTMLIFrameElement.h"
|
| #include "core/html/HTMLMediaElement.h"
|
| #include "core/html/HTMLVideoElement.h"
|
| @@ -533,6 +534,9 @@ bool CompositedLayerMapping::updateGraphicsLayerConfiguration()
|
|
|
| if (WebLayer* layer = platformLayerForPlugin(layoutObject)) {
|
| m_graphicsLayer->setContentsToPlatformLayer(layer);
|
| + } else if (layoutObject->isLayoutFramelet()) {
|
| + HTMLFrameletElement* framelet = (HTMLFrameletElement*)layoutObject->node();
|
| + m_graphicsLayer->setContentsToPlatformLayer(framelet->webLayer());
|
| } else if (layoutObject->node() && layoutObject->node()->isFrameOwnerElement() && toHTMLFrameOwnerElement(layoutObject->node())->contentFrame()) {
|
| Frame* frame = toHTMLFrameOwnerElement(layoutObject->node())->contentFrame();
|
| if (frame->isRemoteFrame()) {
|
|
|