Title: [183372] trunk/Source/WebKit2
- Revision
- 183372
- Author
- [email protected]
- Date
- 2015-04-26 16:41:21 -0700 (Sun, 26 Apr 2015)
Log Message
Remove PluginView::renderer().
https://bugs.webkit.org/show_bug.cgi?id=144216
Patch by Sungmann Cho <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (183371 => 183372)
--- 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)
@@ -1,3 +1,21 @@
+2015-04-26 Sungmann Cho <[email protected]>
+
+ 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:
+
2015-04-26 Doug Russell <[email protected]>
AX: richer text change notifications (142719)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (183371 => 183372)
--- 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)
@@ -66,6 +66,7 @@
#import <WebCore/GraphicsContext.h>
#import <WebCore/HTMLElement.h>
#import <WebCore/HTMLFormElement.h>
+#import <WebCore/HTMLPlugInElement.h>
#import <WebCore/LocalizedStrings.h>
#import <WebCore/MouseEvent.h>
#import <WebCore/Page.h>
@@ -687,12 +688,12 @@
IntRect rect = scrollbarRect;
rect.move(scrollbar->location() - pluginView()->location());
- return pluginView()->frame()->view()->convertFromRendererToContainingView(pluginView()->renderer(), rect);
+ return pluginView()->frame()->view()->convertFromRendererToContainingView(pluginView()->pluginElement()->renderer(), rect);
}
IntRect PDFPlugin::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
{
- IntRect rect = pluginView()->frame()->view()->convertFromContainingViewToRenderer(pluginView()->renderer(), parentRect);
+ IntRect rect = pluginView()->frame()->view()->convertFromContainingViewToRenderer(pluginView()->pluginElement()->renderer(), parentRect);
rect.move(pluginView()->location() - scrollbar->location());
return rect;
@@ -703,12 +704,12 @@
IntPoint point = scrollbarPoint;
point.move(scrollbar->location() - pluginView()->location());
- return pluginView()->frame()->view()->convertFromRendererToContainingView(pluginView()->renderer(), point);
+ return pluginView()->frame()->view()->convertFromRendererToContainingView(pluginView()->pluginElement()->renderer(), point);
}
IntPoint PDFPlugin::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
{
- IntPoint point = pluginView()->frame()->view()->convertFromContainingViewToRenderer(pluginView()->renderer(), parentPoint);
+ IntPoint point = pluginView()->frame()->view()->convertFromContainingViewToRenderer(pluginView()->pluginElement()->renderer(), parentPoint);
point.move(pluginView()->location() - scrollbar->location());
return point;
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (183371 => 183372)
--- 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)
@@ -465,11 +465,6 @@
m_plugin->manualStreamDidFail(error.isCancellation());
}
-RenderBoxModelObject* PluginView::renderer() const
-{
- return downcast<RenderBoxModelObject>(m_pluginElement->renderer());
-}
-
void PluginView::pageScaleFactorDidChange()
{
viewGeometryDidChange();
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (183371 => 183372)
--- 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)
@@ -58,7 +58,6 @@
class HTMLPlugInElement;
class MachSendRight;
class MouseEvent;
-class RenderBoxModelObject;
}
namespace WebKit {
@@ -95,9 +94,6 @@
const Plugin::Parameters& initialParameters() const { return m_parameters; }
Plugin* plugin() const { return m_plugin.get(); }
- // 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;
-
void setPageScaleFactor(double scaleFactor, WebCore::IntPoint origin);
double pageScaleFactor() const;
bool handlesPageScaleFactor() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
