third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp - Issue 1560553002: Framelet Prototype 2016

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 1560553002: Framelet Prototype 2016 Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased + Applied Brett's Windows + Fixed security issue Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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 7c798e24b2f8ed91695544f366d613df323f2ae2..8f53a6fcd60d9762822f7045e54f3969dd172deb 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()) {

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutPart.cpp ('k') | third_party/WebKit/Source/core/loader/EmptyClients.h » ('j') | no next file with comments »