<!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>[183372] trunk/Source/WebKit2</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/183372">183372</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-26 16:41:21 -0700 (Sun, 26 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove PluginView::renderer().
https://bugs.webkit.org/show_bug.cgi?id=144216
Patch by Sungmann Cho <sungmann.cho@navercorp.com> on 2015-04-26
Reviewed by Darin Adler.
Nobody should have to know about the plug-in view's renderer except the plug-in view itself.
No new tests, no behavior change.
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::convertFromScrollbarToContainingView):
(WebKit::PDFPlugin::convertFromContainingViewToScrollbar):
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::renderer): Deleted.
* WebProcess/Plugins/PluginView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183371 => 183372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-26 22:54:21 UTC (rev 183371)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-26 23:41:21 UTC (rev 183372)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-04-26 Sungmann Cho <sungmann.cho@navercorp.com>
+
+ Remove PluginView::renderer().
+ https://bugs.webkit.org/show_bug.cgi?id=144216
+
+ Reviewed by Darin Adler.
+
+ Nobody should have to know about the plug-in view's renderer except the plug-in view itself.
+
+ No new tests, no behavior change.
+
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::convertFromScrollbarToContainingView):
+ (WebKit::PDFPlugin::convertFromContainingViewToScrollbar):
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::renderer): Deleted.
+ * WebProcess/Plugins/PluginView.h:
+
</ins><span class="cx"> 2015-04-26 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: richer text change notifications (142719)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (183371 => 183372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2015-04-26 22:54:21 UTC (rev 183371)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2015-04-26 23:41:21 UTC (rev 183372)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="cx"> #import <WebCore/HTMLElement.h>
</span><span class="cx"> #import <WebCore/HTMLFormElement.h>
</span><ins>+#import <WebCore/HTMLPlugInElement.h>
</ins><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/MouseEvent.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="lines">@@ -687,12 +688,12 @@
</span><span class="cx"> IntRect rect = scrollbarRect;
</span><span class="cx"> rect.move(scrollbar->location() - pluginView()->location());
</span><span class="cx">
</span><del>- return pluginView()->frame()->view()->convertFromRendererToContainingView(pluginView()->renderer(), rect);
</del><ins>+ return pluginView()->frame()->view()->convertFromRendererToContainingView(pluginView()->pluginElement()->renderer(), rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect PDFPlugin::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
</span><span class="cx"> {
</span><del>- IntRect rect = pluginView()->frame()->view()->convertFromContainingViewToRenderer(pluginView()->renderer(), parentRect);
</del><ins>+ IntRect rect = pluginView()->frame()->view()->convertFromContainingViewToRenderer(pluginView()->pluginElement()->renderer(), parentRect);
</ins><span class="cx"> rect.move(pluginView()->location() - scrollbar->location());
</span><span class="cx">
</span><span class="cx"> return rect;
</span><span class="lines">@@ -703,12 +704,12 @@
</span><span class="cx"> IntPoint point = scrollbarPoint;
</span><span class="cx"> point.move(scrollbar->location() - pluginView()->location());
</span><span class="cx">
</span><del>- return pluginView()->frame()->view()->convertFromRendererToContainingView(pluginView()->renderer(), point);
</del><ins>+ return pluginView()->frame()->view()->convertFromRendererToContainingView(pluginView()->pluginElement()->renderer(), point);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntPoint PDFPlugin::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
</span><span class="cx"> {
</span><del>- IntPoint point = pluginView()->frame()->view()->convertFromContainingViewToRenderer(pluginView()->renderer(), parentPoint);
</del><ins>+ IntPoint point = pluginView()->frame()->view()->convertFromContainingViewToRenderer(pluginView()->pluginElement()->renderer(), parentPoint);
</ins><span class="cx"> point.move(pluginView()->location() - scrollbar->location());
</span><span class="cx">
</span><span class="cx"> return point;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (183371 => 183372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-04-26 22:54:21 UTC (rev 183371)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-04-26 23:41:21 UTC (rev 183372)
</span><span class="lines">@@ -465,11 +465,6 @@
</span><span class="cx"> m_plugin->manualStreamDidFail(error.isCancellation());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderBoxModelObject* PluginView::renderer() const
-{
- return downcast<RenderBoxModelObject>(m_pluginElement->renderer());
-}
-
</del><span class="cx"> void PluginView::pageScaleFactorDidChange()
</span><span class="cx"> {
</span><span class="cx"> viewGeometryDidChange();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (183371 => 183372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2015-04-26 22:54:21 UTC (rev 183371)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2015-04-26 23:41:21 UTC (rev 183372)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> class HTMLPlugInElement;
</span><span class="cx"> class MachSendRight;
</span><span class="cx"> class MouseEvent;
</span><del>-class RenderBoxModelObject;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -95,9 +94,6 @@
</span><span class="cx"> const Plugin::Parameters& initialParameters() const { return m_parameters; }
</span><span class="cx"> Plugin* plugin() const { return m_plugin.get(); }
</span><span class="cx">
</span><del>- // FIXME: Remove this; nobody should have to know about the plug-in view's renderer except the plug-in view itself.
- WebCore::RenderBoxModelObject* renderer() const;
-
</del><span class="cx"> void setPageScaleFactor(double scaleFactor, WebCore::IntPoint origin);
</span><span class="cx"> double pageScaleFactor() const;
</span><span class="cx"> bool handlesPageScaleFactor() const;
</span></span></pre>
</div>
</div>
</body>
</html>