Changeset 164457 in webkit for trunk/Source/WebCore/rendering/RenderMedia.cpp

Timestamp:

Feb 20, 2014, 4:39:35 PM (12 years ago)

Author:

[email protected]

Message:

Add very basic image control rendering
​https://bugs.webkit.org/show_bug.cgi?id=129080

Reviewed by Tim Horton.

Source/WebCore:

Test: fast/images/image-controls-basic.html

This patch is groundwork that adds a very basic image control that can render on top of images.

• dom/Node.h:

(WebCore::Node:: isImageControlsRootElement): Returns false, unless you are an ImageControls object.

• html/HTMLAttributeNames.in:

Teach HTMLImageElement how to understand an experimental attribute to install controls,
how to actually build the DOM to attach to the shadow root, how to tear that DOM down,
and how to make sure that Renderers are created for that DOM:

• html/HTMLImageElement.cpp:

(WebCore::HTMLImageElement::HTMLImageElement):
(WebCore::HTMLImageElement::parseAttribute):
(WebCore::HTMLImageElement::didAttachRenderers):
(WebCore::HTMLImageElement::updateImageControls):
(WebCore::HTMLImageElement::createImageControls):
(WebCore::HTMLImageElement::destroyImageControls):
(WebCore::HTMLImageElement::hasImageControls):
(WebCore::HTMLImageElement::childShouldCreateRenderer):

• html/HTMLImageElement.h:

(WebCore::HTMLImageElement::hasShadowControls): For RenderImage to query when it is constructed.

Add a generic, platform independent ImageControls root element that does nothing:

• html/shadow/ImageControlsRootElement.cpp: Added.

(WebCore::ImageControlsRootElement::maybeCreate):
(WebCore::ImageControlsRootElement::ImageControlsRootElement):
(WebCore::ImageControlsRootElement::~ImageControlsRootElement):

• html/shadow/ImageControlsRootElement.h: Added.

Add a Mac-specific ImageControls root element that renders a 20x20 red box (for now):

• html/shadow/mac/ImageControlsRootElementMac.cpp: Added.

(WebCore::ImageControlsRootElementMac::ImageControlsRootElementMac):
(WebCore::ImageControlsRootElementMac::~ImageControlsRootElementMac):
(WebCore::ImageControlsRootElement::maybeCreate):
(WebCore::ImageControlsRootElementMac::maybeCreate):

• html/shadow/mac/ImageControlsRootElementMac.h: Added.

Since much of the RenderMedia::layout() method is now required for RenderImage as well,
move the logic to RenderImage. The extra work is controlled by a bool flag that will always
be set for RenderMedias but will only be set for certain RenderImages:

• rendering/RenderImage.cpp:

(WebCore::RenderImage::RenderImage):
(WebCore::RenderImage::canHaveChildren):
(WebCore::RenderImage::layout):
(WebCore::RenderImage::layoutShadowControls):

• rendering/RenderImage.h:

(WebCore::RenderImage::setHasShadowControls):
(WebCore::RenderImage::shadowControlsNeedCustomLayoutMetrics):

• rendering/RenderMedia.cpp:

(WebCore::RenderMedia::RenderMedia):

• rendering/RenderMedia.h:

(WebCore::RenderMedia::shadowControlsNeedCustomLayoutMetrics):

• WebCore.xcodeproj/project.pbxproj:

Source/WebKit/mac:

Expose the imageControlsEnabled setting to WebKit1 so DRT can use it.

• WebView/WebPreferenceKeysPrivate.h:
• WebView/WebPreferences.mm:

(+[WebPreferences initialize]):
(-[WebPreferences imageControlsEnabled]):
(-[WebPreferences setImageControlsEnabled:]):

• WebView/WebPreferencesPrivate.h:

• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Source/WebKit2:

• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): Expose the

imageControlsEnabled setting to WKTR.

LayoutTests:

• fast/images/image-controls-basic.html: Added.
• platform/mac/fast/images/image-controls-basic-expected.txt: Added.

File:

• trunk/Source/WebCore/rendering/RenderMedia.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderMedia.cpp

@@ -38 +38 @@
     : RenderImage(element, std::move(style))
 {
+    setHasShadowControls(true);
 }
 
@@ -44 +45 @@
 {
     setIntrinsicSize(intrinsicSize);
+    setHasShadowControls(true);
 }
 
 RenderMedia::~RenderMedia()
 {
-}
-
-void RenderMedia::layout()
-{
-    StackStats::LayoutCheckPoint layoutCheckPoint;
-    LayoutSize oldSize = contentBoxRect().size();
-
-    RenderImage::layout();
-
-    RenderBox* controlsRenderer = toRenderBox(firstChild());
-    if (!controlsRenderer)
-        return;
-
-    bool controlsNeedLayout = controlsRenderer->needsLayout();
-    // If the region chain has changed we also need to relayout the controls to update the region box info.
-    // FIXME: We can do better once we compute region box info for RenderReplaced, not only for RenderBlock.
-    const RenderFlowThread* flowThread = flowThreadContainingBlock();
-    if (flowThread && !controlsNeedLayout) {
-        if (flowThread->pageLogicalSizeChanged())
-            controlsNeedLayout = true;
-    }
-
-    LayoutSize newSize = contentBoxRect().size();
-    if (newSize == oldSize && !controlsNeedLayout)
-        return;
-
-    // When calling layout() on a child node, a parent must either push a LayoutStateMaintainter, or 
-    // instantiate LayoutStateDisabler. Since using a LayoutStateMaintainer is slightly more efficient,
-    // and this method will be called many times per second during playback, use a LayoutStateMaintainer:
-    LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
-
-    controlsRenderer->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(paddingLeft(), paddingTop()));
-    controlsRenderer->style().setHeight(Length(newSize.height(), Fixed));
-    controlsRenderer->style().setWidth(Length(newSize.width(), Fixed));
-    controlsRenderer->setNeedsLayout(MarkOnlyThis);
-    controlsRenderer->layout();
-    clearChildNeedsLayout();
-
-    statePusher.pop();
 }