<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209688] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209688">209688</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-12-11 16:56:25 -0800 (Sun, 11 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make some refinements to HTMLPlugInImageElement
https://bugs.webkit.org/show_bug.cgi?id=165742
Reviewed by Sam Weinig.
* html/HTMLPlugInImageElement.cpp: Removed many unneeded includes.
(WebCore::titleText): Use HashMap::ensure, correct argument types.
(WebCore::subtitleText): Ditto.
(WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement): Moved
initialization of most scalars to the class definition.
(WebCore::HTMLPlugInImageElement::isImageType): Use auto.
(WebCore::HTMLPlugInImageElement::wouldLoadAsPlugIn): Removed
unneeded local variable and if statement.
(WebCore::HTMLPlugInImageElement::willDetachRenderers): Use auto.
(WebCore::HTMLPlugInImageElement::updateSnapshot): Do not call
renderer twice unnecessarily.
(WebCore::plugInImageElementIsolatedWorld): Use auto.
(WebCore::HTMLPlugInImageElement::didAddUserAgentShadowRoot): Use auto.
(WebCore::HTMLPlugInImageElement::partOfSnapshotOverlay): Use auto.
(WebCore::HTMLPlugInImageElement::restartSimilarPlugIns): Got rid of
unnecessary typedef.
(WebCore::HTMLPlugInImageElement::userDidClickSnapshot): Take a
reference rather than PassRefPtr.
(WebCore::documentHadRecentUserGesture): Removed unneeded if.
(WebCore::HTMLPlugInImageElement::checkSizeChangeForSnapshotting): Use auto.
(WebCore::isSmallerThanTinySizingThreshold): Use auto.
(WebCore::HTMLPlugInImageElement::isTopLevelFullPagePlugin): Use auto.
(WebCore::HTMLPlugInImageElement::checkSnapshotStatus): Use auto.
(WebCore::HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn): Got rid
of unnecessary local variable. Use auto.
(WebCore::HTMLPlugInImageElement::requestObject): Got rid of unnecessary
local variable.
* html/HTMLPlugInImageElement.h: Updated for the above. Removed incorrect
use of const. Initialized all scalars. Made function private and final.
* rendering/RenderSnapshottedPlugIn.cpp:
(WebCore::RenderSnapshottedPlugIn::handleEvent): Pass reference instead
of pointer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementh">trunk/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp">trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209687 => 209688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-11 23:40:15 UTC (rev 209687)
+++ trunk/Source/WebCore/ChangeLog 2016-12-12 00:56:25 UTC (rev 209688)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2016-12-11 Darin Adler <darin@apple.com>
+
+ Make some refinements to HTMLPlugInImageElement
+ https://bugs.webkit.org/show_bug.cgi?id=165742
+
+ Reviewed by Sam Weinig.
+
+ * html/HTMLPlugInImageElement.cpp: Removed many unneeded includes.
+ (WebCore::titleText): Use HashMap::ensure, correct argument types.
+ (WebCore::subtitleText): Ditto.
+ (WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement): Moved
+ initialization of most scalars to the class definition.
+ (WebCore::HTMLPlugInImageElement::isImageType): Use auto.
+ (WebCore::HTMLPlugInImageElement::wouldLoadAsPlugIn): Removed
+ unneeded local variable and if statement.
+ (WebCore::HTMLPlugInImageElement::willDetachRenderers): Use auto.
+ (WebCore::HTMLPlugInImageElement::updateSnapshot): Do not call
+ renderer twice unnecessarily.
+ (WebCore::plugInImageElementIsolatedWorld): Use auto.
+ (WebCore::HTMLPlugInImageElement::didAddUserAgentShadowRoot): Use auto.
+ (WebCore::HTMLPlugInImageElement::partOfSnapshotOverlay): Use auto.
+ (WebCore::HTMLPlugInImageElement::restartSimilarPlugIns): Got rid of
+ unnecessary typedef.
+ (WebCore::HTMLPlugInImageElement::userDidClickSnapshot): Take a
+ reference rather than PassRefPtr.
+ (WebCore::documentHadRecentUserGesture): Removed unneeded if.
+ (WebCore::HTMLPlugInImageElement::checkSizeChangeForSnapshotting): Use auto.
+ (WebCore::isSmallerThanTinySizingThreshold): Use auto.
+ (WebCore::HTMLPlugInImageElement::isTopLevelFullPagePlugin): Use auto.
+ (WebCore::HTMLPlugInImageElement::checkSnapshotStatus): Use auto.
+ (WebCore::HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn): Got rid
+ of unnecessary local variable. Use auto.
+ (WebCore::HTMLPlugInImageElement::requestObject): Got rid of unnecessary
+ local variable.
+ * html/HTMLPlugInImageElement.h: Updated for the above. Removed incorrect
+ use of const. Initialized all scalars. Made function private and final.
+
+ * rendering/RenderSnapshottedPlugIn.cpp:
+ (WebCore::RenderSnapshottedPlugIn::handleEvent): Pass reference instead
+ of pointer.
+
</ins><span class="cx"> 2016-12-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Cleanup some InspectorInstrumentation network loading notifications
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (209687 => 209688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-12-11 23:40:15 UTC (rev 209687)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-12-12 00:56:25 UTC (rev 209688)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2011, 2012, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -25,25 +25,17 @@
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "CommonVM.h"
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><del>-#include "Event.h"
-#include "EventHandler.h"
</del><span class="cx"> #include "EventNames.h"
</span><del>-#include "Frame.h"
-#include "FrameLoader.h"
</del><span class="cx"> #include "FrameLoaderClient.h"
</span><del>-#include "FrameView.h"
</del><span class="cx"> #include "HTMLImageLoader.h"
</span><del>-#include "JSDocumentFragment.h"
</del><ins>+#include "JSShadowRoot.h"
</ins><span class="cx"> #include "LocalizedStrings.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "MouseEvent.h"
</span><del>-#include "NodeList.h"
-#include "NodeRenderStyle.h"
</del><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PlugInClient.h"
</span><span class="cx"> #include "PluginViewBase.h"
</span><del>-#include "RenderEmbeddedObject.h"
</del><span class="cx"> #include "RenderImage.h"
</span><span class="cx"> #include "RenderSnapshottedPlugIn.h"
</span><span class="cx"> #include "RenderTreeUpdater.h"
</span><span class="lines">@@ -52,22 +44,12 @@
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><del>-#include "StyleResolver.h"
</del><span class="cx"> #include "StyleTreeResolver.h"
</span><span class="cx"> #include "SubframeLoader.h"
</span><span class="cx"> #include "TypedElementDescendantIterator.h"
</span><del>-#include <JavaScriptCore/APICast.h>
-#include <JavaScriptCore/JSBase.h>
-#include <wtf/HashMap.h>
-#include <wtf/text/StringHash.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-using namespace HTMLNames;
-
-typedef Vector<Ref<HTMLPlugInImageElement>> HTMLPlugInImageElementList;
-typedef HashMap<String, String> MimeTypeToLocalizedStringMap;
-
</del><span class="cx"> static const int sizingTinyDimensionThreshold = 40;
</span><span class="cx"> static const float sizingFullPageAreaRatioThreshold = 0.96;
</span><span class="cx"> static const float autostartSoonAfterUserGestureThreshold = 5.0;
</span><span class="lines">@@ -79,51 +61,38 @@
</span><span class="cx"> static const auto removeSnapshotTimerDelay = std::chrono::milliseconds { 1500 };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static const String titleText(Page* page, String mimeType)
</del><ins>+static const String titleText(Page& page, const String& mimeType)
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<MimeTypeToLocalizedStringMap> mimeTypeToLabelTitleMap;
- String titleText = mimeTypeToLabelTitleMap.get().get(mimeType);
- if (!titleText.isEmpty())
- return titleText;
-
- titleText = page->chrome().client().plugInStartLabelTitle(mimeType);
- if (titleText.isEmpty())
- titleText = snapshottedPlugInLabelTitle();
- mimeTypeToLabelTitleMap.get().set(mimeType, titleText);
- return titleText;
</del><ins>+ // FIXME: It's not consistent to get a string from the page's chrome client, but then cache it globally.
+ // If it's global, it should come from elsewhere. If it's per-page then it should be cached per page.
+ static NeverDestroyed<HashMap<String, String>> mimeTypeToLabelTitleMap;
+ return mimeTypeToLabelTitleMap.get().ensure(mimeType, [&] {
+ auto title = page.chrome().client().plugInStartLabelTitle(mimeType);
+ if (!title.isEmpty())
+ return title;
+ return snapshottedPlugInLabelTitle();
+ }).iterator->value;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-static const String subtitleText(Page* page, String mimeType)
</del><ins>+static const String subtitleText(Page& page, const String& mimeType)
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<MimeTypeToLocalizedStringMap> mimeTypeToLabelSubtitleMap;
- String subtitleText = mimeTypeToLabelSubtitleMap.get().get(mimeType);
- if (!subtitleText.isEmpty())
- return subtitleText;
-
- subtitleText = page->chrome().client().plugInStartLabelSubtitle(mimeType);
- if (subtitleText.isEmpty())
- subtitleText = snapshottedPlugInLabelSubtitle();
- mimeTypeToLabelSubtitleMap.get().set(mimeType, subtitleText);
- return subtitleText;
</del><ins>+ // FIXME: It's not consistent to get a string from the page's chrome client, but then cache it globally.
+ // If it's global, it should come from elsewhere. If it's per-page then it should be cached per page.
+ static NeverDestroyed<HashMap<String, String>> mimeTypeToLabelSubtitleMap;
+ return mimeTypeToLabelSubtitleMap.get().ensure(mimeType, [&] {
+ auto subtitle = page.chrome().client().plugInStartLabelSubtitle(mimeType);
+ if (!subtitle.isEmpty())
+ return subtitle;
+ return snapshottedPlugInLabelSubtitle();
+ }).iterator->value;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> HTMLPlugInImageElement::HTMLPlugInImageElement(const QualifiedName& tagName, Document& document, bool createdByParser)
</span><span class="cx"> : HTMLPlugInElement(tagName, document)
</span><del>- // m_needsWidgetUpdate(!createdByParser) allows HTMLObjectElement to delay
- // widget updates until after all children are parsed. For HTMLEmbedElement
- // this delay is unnecessary, but it is simpler to make both classes share
- // the same codepath in this class.
- , m_needsWidgetUpdate(!createdByParser)
- , m_needsDocumentActivationCallbacks(false)
</del><ins>+ , m_needsWidgetUpdate(!createdByParser) // Set true in finishParsingChildren.
</ins><span class="cx"> , m_simulatedMouseClickTimer(*this, &HTMLPlugInImageElement::simulatedMouseClickTimerFired, simulatedMouseClickTimerDelay)
</span><span class="cx"> , m_removeSnapshotTimer(*this, &HTMLPlugInImageElement::removeSnapshotTimerFired)
</span><span class="cx"> , m_createdDuringUserGesture(ScriptController::processingUserGesture())
</span><del>- , m_isRestartedPlugin(false)
- , m_needsCheckForSizeChange(false)
- , m_plugInWasCreated(false)
- , m_deferredPromotionToPrimaryPlugIn(false)
- , m_snapshotDecision(SnapshotNotYetDecided)
- , m_plugInDimensionsSpecified(false)
</del><span class="cx"> {
</span><span class="cx"> setHasCustomStyleResolveCallbacks();
</span><span class="cx"> }
</span><span class="lines">@@ -151,8 +120,7 @@
</span><span class="cx">
</span><span class="cx"> RenderEmbeddedObject* HTMLPlugInImageElement::renderEmbeddedObject() const
</span><span class="cx"> {
</span><del>- // HTMLObjectElement and HTMLEmbedElement may return arbitrary renderers
- // when using fallback content.
</del><ins>+ // HTMLObjectElement and HTMLEmbedElement may return arbitrary renderers when using fallback content.
</ins><span class="cx"> return is<RenderEmbeddedObject>(renderer()) ? downcast<RenderEmbeddedObject>(renderer()) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -161,24 +129,18 @@
</span><span class="cx"> if (m_serviceType.isEmpty() && protocolIs(m_url, "data"))
</span><span class="cx"> m_serviceType = mimeTypeFromDataURL(m_url);
</span><span class="cx">
</span><del>- if (Frame* frame = document().frame()) {
- URL completedURL = document().completeURL(m_url);
- return frame->loader().client().objectContentType(completedURL, m_serviceType) == ObjectContentType::Image;
- }
</del><ins>+ if (auto* frame = document().frame())
+ return frame->loader().client().objectContentType(document().completeURL(m_url), m_serviceType) == ObjectContentType::Image;
</ins><span class="cx">
</span><span class="cx"> return Image::supportsType(m_serviceType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// We don't use m_url, as it may not be the final URL that the object loads,
-// depending on <param> values.
</del><ins>+// We don't use m_url, as it may not be the final URL that the object loads, depending on <param> values.
</ins><span class="cx"> bool HTMLPlugInImageElement::allowedToLoadFrameURL(const String& url)
</span><span class="cx"> {
</span><span class="cx"> URL completeURL = document().completeURL(url);
</span><del>-
- if (contentFrame() && protocolIsJavaScript(completeURL)
- && !document().securityOrigin()->canAccess(contentDocument()->securityOrigin()))
</del><ins>+ if (contentFrame() && protocolIsJavaScript(completeURL) && !document().securityOrigin()->canAccess(contentDocument()->securityOrigin()))
</ins><span class="cx"> return false;
</span><del>-
</del><span class="cx"> return document().frame()->isURLAllowed(completeURL);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -190,11 +152,7 @@
</span><span class="cx"> URL completedURL;
</span><span class="cx"> if (!url.isEmpty())
</span><span class="cx"> completedURL = document().completeURL(url);
</span><del>-
- FrameLoader& frameLoader = document().frame()->loader();
- if (frameLoader.client().objectContentType(completedURL, serviceType) == ObjectContentType::PlugIn)
- return true;
- return false;
</del><ins>+ return document().frame()->loader().client().objectContentType(completedURL, serviceType) == ObjectContentType::PlugIn;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> HTMLPlugInImageElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition& insertionPosition)
</span><span class="lines">@@ -204,7 +162,7 @@
</span><span class="cx"> if (displayState() >= PreparingPluginReplacement)
</span><span class="cx"> return HTMLPlugInElement::createElementRenderer(WTFMove(style), insertionPosition);
</span><span class="cx">
</span><del>- // Once a PlugIn Element creates its renderer, it needs to be told when the Document goes
</del><ins>+ // Once a plug-in element creates its renderer, it needs to be told when the document goes
</ins><span class="cx"> // inactive or reactivates so it can clear the renderer before going into the page cache.
</span><span class="cx"> if (!m_needsDocumentActivationCallbacks) {
</span><span class="cx"> m_needsDocumentActivationCallbacks = true;
</span><span class="lines">@@ -217,9 +175,6 @@
</span><span class="cx"> return WTFMove(renderSnapshottedPlugIn);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Fallback content breaks the DOM->Renderer class relationship of this
- // class and all superclasses because createObject won't necessarily
- // return a RenderEmbeddedObject or RenderWidget.
</del><span class="cx"> if (useFallbackContent())
</span><span class="cx"> return RenderElement::createFor(*this, WTFMove(style));
</span><span class="cx">
</span><span class="lines">@@ -278,7 +233,7 @@
</span><span class="cx"> setNeedsWidgetUpdate(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Widget* widget = pluginWidget(PluginLoadingPolicy::DoNotLoad);
</del><ins>+ auto* widget = pluginWidget(PluginLoadingPolicy::DoNotLoad);
</ins><span class="cx"> if (is<PluginViewBase>(widget))
</span><span class="cx"> downcast<PluginViewBase>(*widget).willDetatchRenderer();
</span><span class="cx">
</span><span class="lines">@@ -304,6 +259,8 @@
</span><span class="cx"> if (useFallbackContent())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // HTMLObjectElement needs to delay widget updates until after all children are parsed,
+ // For HTMLEmbedElement this delay is unnecessary, but there is no harm in doing the same.
</ins><span class="cx"> setNeedsWidgetUpdate(true);
</span><span class="cx"> if (inDocument())
</span><span class="cx"> invalidateStyleForSubtree();
</span><span class="lines">@@ -351,22 +308,22 @@
</span><span class="cx">
</span><span class="cx"> m_snapshotImage = image;
</span><span class="cx">
</span><del>- if (!renderer())
</del><ins>+ auto* renderer = this->renderer();
+ if (!renderer)
</ins><span class="cx"> return;
</span><del>- auto& renderer = *this->renderer();
</del><span class="cx">
</span><del>- if (is<RenderSnapshottedPlugIn>(renderer)) {
- downcast<RenderSnapshottedPlugIn>(renderer).updateSnapshot(image);
</del><ins>+ if (is<RenderSnapshottedPlugIn>(*renderer)) {
+ downcast<RenderSnapshottedPlugIn>(*renderer).updateSnapshot(image);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (is<RenderEmbeddedObject>(renderer))
- renderer.repaint();
</del><ins>+ if (is<RenderEmbeddedObject>(*renderer))
+ renderer->repaint();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static DOMWrapperWorld& plugInImageElementIsolatedWorld()
</span><span class="cx"> {
</span><del>- static DOMWrapperWorld& isolatedWorld = DOMWrapperWorld::create(commonVM()).leakRef();
</del><ins>+ static auto& isolatedWorld = DOMWrapperWorld::create(commonVM()).leakRef();
</ins><span class="cx"> return isolatedWorld;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -376,7 +333,7 @@
</span><span class="cx"> if (displayState() >= PreparingPluginReplacement)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Page* page = document().page();
</del><ins>+ auto* page = document().page();
</ins><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -387,21 +344,21 @@
</span><span class="cx">
</span><span class="cx"> String mimeType = loadedMimeType();
</span><span class="cx">
</span><del>- DOMWrapperWorld& isolatedWorld = plugInImageElementIsolatedWorld();
</del><ins>+ auto& isolatedWorld = plugInImageElementIsolatedWorld();
</ins><span class="cx"> document().ensurePlugInsInjectedScript(isolatedWorld);
</span><span class="cx">
</span><del>- ScriptController& scriptController = document().frame()->script();
- JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(isolatedWorld));
</del><ins>+ auto& scriptController = document().frame()->script();
+ auto& globalObject = *JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(isolatedWorld));
</ins><span class="cx">
</span><del>- JSC::VM& vm = globalObject->vm();
</del><ins>+ auto& vm = globalObject.vm();
</ins><span class="cx"> JSC::JSLockHolder lock(vm);
</span><span class="cx"> auto scope = DECLARE_CATCH_SCOPE(vm);
</span><del>- JSC::ExecState* exec = globalObject->globalExec();
</del><ins>+ auto& state = *globalObject.globalExec();
</ins><span class="cx">
</span><span class="cx"> JSC::MarkedArgumentBuffer argList;
</span><del>- argList.append(toJS(exec, globalObject, root));
- argList.append(jsString(exec, titleText(page, mimeType)));
- argList.append(jsString(exec, subtitleText(page, mimeType)));
</del><ins>+ argList.append(toJS(&state, &globalObject, root));
+ argList.append(jsString(&state, titleText(*page, mimeType)));
+ argList.append(jsString(&state, subtitleText(*page, mimeType)));
</ins><span class="cx">
</span><span class="cx"> // This parameter determines whether or not the snapshot overlay should always be visible over the plugin snapshot.
</span><span class="cx"> // If no snapshot was found then we want the overlay to be visible.
</span><span class="lines">@@ -408,7 +365,7 @@
</span><span class="cx"> argList.append(JSC::jsBoolean(!m_snapshotImage));
</span><span class="cx">
</span><span class="cx"> // It is expected the JS file provides a createOverlay(shadowRoot, title, subtitle) function.
</span><del>- JSC::JSObject* overlay = globalObject->get(exec, JSC::Identifier::fromString(exec, "createOverlay")).toObject(exec);
</del><ins>+ auto* overlay = globalObject.get(&state, JSC::Identifier::fromString(&state, "createOverlay")).toObject(&state);
</ins><span class="cx"> if (!overlay) {
</span><span class="cx"> ASSERT(scope.exception());
</span><span class="cx"> scope.clearException();
</span><span class="lines">@@ -415,11 +372,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> JSC::CallData callData;
</span><del>- JSC::CallType callType = overlay->methodTable()->getCallData(overlay, callData);
</del><ins>+ auto callType = overlay->methodTable()->getCallData(overlay, callData);
</ins><span class="cx"> if (callType == JSC::CallType::None)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- JSC::call(exec, overlay, callType, callData, globalObject, argList);
</del><ins>+ call(&state, overlay, callType, callData, &globalObject, argList);
</ins><span class="cx"> scope.clearException();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -426,7 +383,7 @@
</span><span class="cx"> bool HTMLPlugInImageElement::partOfSnapshotOverlay(const Node* node) const
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<AtomicString> selector(".snapshot-overlay", AtomicString::ConstructFromLiteral);
</span><del>- ShadowRoot* shadow = userAgentShadowRoot();
</del><ins>+ auto* shadow = userAgentShadowRoot();
</ins><span class="cx"> if (!shadow)
</span><span class="cx"> return false;
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -454,7 +411,7 @@
</span><span class="cx">
</span><span class="cx"> String plugInOrigin = m_loadedUrl.host();
</span><span class="cx"> String mimeType = loadedMimeType();
</span><del>- HTMLPlugInImageElementList similarPlugins;
</del><ins>+ Vector<Ref<HTMLPlugInImageElement>> similarPlugins;
</ins><span class="cx">
</span><span class="cx"> if (!document().page())
</span><span class="cx"> return;
</span><span class="lines">@@ -481,10 +438,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPlugInImageElement::userDidClickSnapshot(PassRefPtr<MouseEvent> event, bool forwardEvent)
</del><ins>+void HTMLPlugInImageElement::userDidClickSnapshot(MouseEvent& event, bool forwardEvent)
</ins><span class="cx"> {
</span><span class="cx"> if (forwardEvent)
</span><del>- m_pendingClickEventFromSnapshot = event;
</del><ins>+ m_pendingClickEventFromSnapshot = &event;
</ins><span class="cx">
</span><span class="cx"> String plugInOrigin = m_loadedUrl.host();
</span><span class="cx"> if (document().page() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(document().page()->mainFrame().document()->baseURL().protocol().toStringWithoutCopying()) && document().page()->settings().autostartOriginPlugInSnapshottingEnabled())
</span><span class="lines">@@ -543,14 +500,10 @@
</span><span class="cx"> static bool documentHadRecentUserGesture(Document& document)
</span><span class="cx"> {
</span><span class="cx"> double lastKnownUserGestureTimestamp = document.lastHandledUserGestureTimestamp();
</span><del>-
</del><span class="cx"> if (document.frame() != &document.page()->mainFrame() && document.page()->mainFrame().document())
</span><span class="cx"> lastKnownUserGestureTimestamp = std::max(lastKnownUserGestureTimestamp, document.page()->mainFrame().document()->lastHandledUserGestureTimestamp());
</span><span class="cx">
</span><del>- if (monotonicallyIncreasingTime() - lastKnownUserGestureTimestamp < autostartSoonAfterUserGestureThreshold)
- return true;
-
- return false;
</del><ins>+ return monotonicallyIncreasingTime() - lastKnownUserGestureTimestamp < autostartSoonAfterUserGestureThreshold;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::checkSizeChangeForSnapshotting()
</span><span class="lines">@@ -559,7 +512,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_needsCheckForSizeChange = false;
</span><del>- LayoutRect contentBoxRect = downcast<RenderBox>(*renderer()).contentBoxRect();
</del><ins>+
+ auto contentBoxRect = downcast<RenderBox>(*renderer()).contentBoxRect();
</ins><span class="cx"> int contentWidth = contentBoxRect.width();
</span><span class="cx"> int contentHeight = contentBoxRect.height();
</span><span class="cx">
</span><span class="lines">@@ -569,7 +523,7 @@
</span><span class="cx"> LOG(Plugins, "%p Plug-in originally avoided snapshotting because it was sized %dx%d. Now it is %dx%d. Tell it to snapshot.\n", this, m_sizeWhenSnapshotted.width(), m_sizeWhenSnapshotted.height(), contentWidth, contentHeight);
</span><span class="cx"> setDisplayState(WaitingForSnapshot);
</span><span class="cx"> m_snapshotDecision = Snapshotted;
</span><del>- Widget* widget = pluginWidget();
</del><ins>+ auto* widget = pluginWidget();
</ins><span class="cx"> if (is<PluginViewBase>(widget))
</span><span class="cx"> downcast<PluginViewBase>(*widget).beginSnapshottingRunningPlugin();
</span><span class="cx"> }
</span><span class="lines">@@ -581,24 +535,25 @@
</span><span class="cx">
</span><span class="cx"> static inline bool isSmallerThanTinySizingThreshold(const RenderEmbeddedObject& renderer)
</span><span class="cx"> {
</span><del>- LayoutRect contentRect = renderer.contentBoxRect();
</del><ins>+ auto contentRect = renderer.contentBoxRect();
</ins><span class="cx"> return contentRect.width() <= sizingTinyDimensionThreshold || contentRect.height() <= sizingTinyDimensionThreshold;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLPlugInImageElement::isTopLevelFullPagePlugin(const RenderEmbeddedObject& renderer) const
</span><span class="cx"> {
</span><del>- Frame& frame = *document().frame();
</del><ins>+ ASSERT(document().frame());
+ auto& frame = *document().frame();
</ins><span class="cx"> if (!frame.isMainFrame())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> auto& style = renderer.style();
</span><del>- IntSize visibleSize = frame.view()->visibleSize();
- LayoutRect contentRect = renderer.contentBoxRect();
</del><ins>+ auto visibleSize = frame.view()->visibleSize();
+ auto contentRect = renderer.contentBoxRect();
</ins><span class="cx"> float contentWidth = contentRect.width();
</span><span class="cx"> float contentHeight = contentRect.height();
</span><span class="cx"> return is100Percent(style.width()) && is100Percent(style.height()) && contentWidth * contentHeight > visibleSize.area().unsafeGet() * sizingFullPageAreaRatioThreshold;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void HTMLPlugInImageElement::checkSnapshotStatus()
</span><span class="cx"> {
</span><span class="cx"> if (!is<RenderSnapshottedPlugIn>(*renderer())) {
</span><span class="lines">@@ -609,7 +564,7 @@
</span><span class="cx">
</span><span class="cx"> // If width and height styles were previously not set and we've snapshotted the plugin we may need to restart the plugin so that its state can be updated appropriately.
</span><span class="cx"> if (!document().page()->settings().snapshotAllPlugIns() && displayState() <= DisplayingSnapshot && !m_plugInDimensionsSpecified) {
</span><del>- RenderSnapshottedPlugIn& renderer = downcast<RenderSnapshottedPlugIn>(*this->renderer());
</del><ins>+ auto& renderer = downcast<RenderSnapshottedPlugIn>(*this->renderer());
</ins><span class="cx"> if (!renderer.style().logicalWidth().isSpecified() && !renderer.style().logicalHeight().isSpecified())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -713,7 +668,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto& renderer = downcast<RenderEmbeddedObject>(*this->renderer());
</span><del>- LayoutRect contentRect = renderer.contentBoxRect();
</del><ins>+ auto contentRect = renderer.contentBoxRect();
</ins><span class="cx"> int contentWidth = contentRect.width();
</span><span class="cx"> int contentHeight = contentRect.height();
</span><span class="cx">
</span><span class="lines">@@ -764,15 +719,12 @@
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::defaultEventHandler(Event& event)
</span><span class="cx"> {
</span><del>- RenderElement* r = renderer();
- if (r && r->isEmbeddedObject()) {
- if (displayState() == WaitingForSnapshot && is<MouseEvent>(event) && event.type() == eventNames().clickEvent) {
- MouseEvent& mouseEvent = downcast<MouseEvent>(event);
- if (mouseEvent.button() == LeftButton) {
- userDidClickSnapshot(&mouseEvent, true);
- mouseEvent.setDefaultHandled();
- return;
- }
</del><ins>+ if (is<RenderEmbeddedObject>(renderer()) && displayState() == WaitingForSnapshot && is<MouseEvent>(event) && event.type() == eventNames().clickEvent) {
+ auto& mouseEvent = downcast<MouseEvent>(event);
+ if (mouseEvent.button() == LeftButton) {
+ userDidClickSnapshot(mouseEvent, true);
+ mouseEvent.setDefaultHandled();
+ return;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> HTMLPlugInElement::defaultEventHandler(event);
</span><span class="lines">@@ -803,6 +755,8 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLPlugInImageElement::requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span><span class="cx"> {
</span><ins>+ ASSERT(document().frame());
+
</ins><span class="cx"> if (url.isEmpty() && mimeType.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -814,8 +768,7 @@
</span><span class="cx"> if (HTMLPlugInElement::requestObject(url, mimeType, paramNames, paramValues))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- SubframeLoader& loader = document().frame()->loader().subframeLoader();
- return loader.requestObject(*this, url, getNameAttribute(), mimeType, paramNames, paramValues);
</del><ins>+ return document().frame()->loader().subframeLoader().requestObject(*this, url, getNameAttribute(), mimeType, paramNames, paramValues);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.h (209687 => 209688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2016-12-11 23:40:15 UTC (rev 209687)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2016-12-12 00:56:25 UTC (rev 209688)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009, 2011, 2012, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -25,19 +25,12 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class HTMLImageLoader;
</span><del>-class FrameLoader;
-class Image;
</del><span class="cx"> class MouseEvent;
</span><del>-class RenderStyle;
-class Widget;
</del><span class="cx">
</span><del>-enum class CreatePlugins {
- No,
- Yes,
-};
</del><ins>+enum class CreatePlugins { No, Yes };
</ins><span class="cx">
</span><span class="cx"> // Base class for HTMLAppletElement, HTMLEmbedElement, and HTMLObjectElement.
</span><del>-// FIXME: Should HTMLAppletElement inherit from HTMLPlugInElement directly instead?
</del><ins>+// FIXME: Perhaps HTMLAppletElement should inherit from HTMLPlugInElement directly instead.
</ins><span class="cx"> class HTMLPlugInImageElement : public HTMLPlugInElement {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~HTMLPlugInImageElement();
</span><span class="lines">@@ -44,8 +37,6 @@
</span><span class="cx">
</span><span class="cx"> RenderEmbeddedObject* renderEmbeddedObject() const;
</span><span class="cx">
</span><del>- void setDisplayState(DisplayState) override;
-
</del><span class="cx"> virtual void updateWidget(CreatePlugins) = 0;
</span><span class="cx">
</span><span class="cx"> const String& serviceType() const { return m_serviceType; }
</span><span class="lines">@@ -52,7 +43,7 @@
</span><span class="cx"> const String& url() const { return m_url; }
</span><span class="cx"> const URL& loadedUrl() const { return m_loadedUrl; }
</span><span class="cx">
</span><del>- const String loadedMimeType() const
</del><ins>+ String loadedMimeType() const
</ins><span class="cx"> {
</span><span class="cx"> String mimeType = serviceType();
</span><span class="cx"> if (mimeType.isEmpty())
</span><span class="lines">@@ -64,7 +55,7 @@
</span><span class="cx"> bool needsWidgetUpdate() const { return m_needsWidgetUpdate; }
</span><span class="cx"> void setNeedsWidgetUpdate(bool needsWidgetUpdate) { m_needsWidgetUpdate = needsWidgetUpdate; }
</span><span class="cx">
</span><del>- void userDidClickSnapshot(PassRefPtr<MouseEvent>, bool forwardEvent);
</del><ins>+ void userDidClickSnapshot(MouseEvent&, bool forwardEvent);
</ins><span class="cx"> void checkSnapshotStatus();
</span><span class="cx"> Image* snapshotImage() const { return m_snapshotImage.get(); }
</span><span class="cx"> WEBCORE_EXPORT void restartSnapshottedPlugIn();
</span><span class="lines">@@ -138,21 +129,23 @@
</span><span class="cx"> void removeSnapshotTimerFired();
</span><span class="cx"> bool isTopLevelFullPagePlugin(const RenderEmbeddedObject&) const;
</span><span class="cx">
</span><ins>+ void setDisplayState(DisplayState) final;
+
</ins><span class="cx"> URL m_loadedUrl;
</span><del>- bool m_needsWidgetUpdate;
- bool m_needsDocumentActivationCallbacks;
</del><ins>+ bool m_needsWidgetUpdate { false };
+ bool m_needsDocumentActivationCallbacks { false };
</ins><span class="cx"> RefPtr<MouseEvent> m_pendingClickEventFromSnapshot;
</span><span class="cx"> DeferrableOneShotTimer m_simulatedMouseClickTimer;
</span><span class="cx"> Timer m_removeSnapshotTimer;
</span><span class="cx"> RefPtr<Image> m_snapshotImage;
</span><del>- bool m_createdDuringUserGesture;
- bool m_isRestartedPlugin;
- bool m_needsCheckForSizeChange;
- bool m_plugInWasCreated;
- bool m_deferredPromotionToPrimaryPlugIn;
</del><ins>+ bool m_createdDuringUserGesture { false };
+ bool m_isRestartedPlugin { false };
+ bool m_needsCheckForSizeChange { false };
+ bool m_plugInWasCreated { false };
+ bool m_deferredPromotionToPrimaryPlugIn { false };
</ins><span class="cx"> IntSize m_sizeWhenSnapshotted;
</span><del>- SnapshotDecision m_snapshotDecision;
- bool m_plugInDimensionsSpecified;
</del><ins>+ SnapshotDecision m_snapshotDecision { SnapshotNotYetDecided };
+ bool m_plugInDimensionsSpecified { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp (209687 => 209688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2016-12-11 23:40:15 UTC (rev 209687)
+++ trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2016-12-12 00:56:25 UTC (rev 209688)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> if (mouseEvent.type() == eventNames().clickEvent || (m_isPotentialMouseActivation && mouseEvent.type() == eventNames().mouseupEvent)) {
</span><span class="cx"> m_isPotentialMouseActivation = false;
</span><span class="cx"> bool clickWasOnOverlay = plugInImageElement().partOfSnapshotOverlay(mouseEvent.target()->toNode());
</span><del>- plugInImageElement().userDidClickSnapshot(&mouseEvent, !clickWasOnOverlay);
</del><ins>+ plugInImageElement().userDidClickSnapshot(mouseEvent, !clickWasOnOverlay);
</ins><span class="cx"> mouseEvent.setDefaultHandled();
</span><span class="cx"> } else if (mouseEvent.type() == eventNames().mousedownEvent) {
</span><span class="cx"> m_isPotentialMouseActivation = true;
</span></span></pre>
</div>
</div>
</body>
</html>