Title: [148487] trunk/Source/WebCore
- Revision
- 148487
- Author
- d...@apple.com
- Date
- 2013-04-15 19:52:00 -0700 (Mon, 15 Apr 2013)
Log Message
Rename restartedPlugin to isRestartedPlugin. This was
review feedback from r148038 that I thought I fixed
everywhere but failed.
https://bugs.webkit.org/show_bug.cgi?id=114233
* html/HTMLPlugInElement.h:
(WebCore::HTMLPlugInElement::isRestartedPlugin): Prefix with "is".
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement):
(WebCore::HTMLPlugInImageElement::setDisplayState):
(WebCore::HTMLPlugInImageElement::removeSnapshotTimerFired):
* html/HTMLPlugInImageElement.h:
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::paintContents):
* rendering/RenderLayerBacking.cpp:
(WebCore::isRestartedPlugin):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (148486 => 148487)
--- trunk/Source/WebCore/ChangeLog 2013-04-16 02:15:00 UTC (rev 148486)
+++ trunk/Source/WebCore/ChangeLog 2013-04-16 02:52:00 UTC (rev 148487)
@@ -1,3 +1,22 @@
+2013-04-15 Dean Jackson <d...@apple.com>
+
+ Rename restartedPlugin to isRestartedPlugin. This was
+ review feedback from r148038 that I thought I fixed
+ everywhere but failed.
+ https://bugs.webkit.org/show_bug.cgi?id=114233
+
+ * html/HTMLPlugInElement.h:
+ (WebCore::HTMLPlugInElement::isRestartedPlugin): Prefix with "is".
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement):
+ (WebCore::HTMLPlugInImageElement::setDisplayState):
+ (WebCore::HTMLPlugInImageElement::removeSnapshotTimerFired):
+ * html/HTMLPlugInImageElement.h:
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::paintContents):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::isRestartedPlugin):
+
2013-04-15 Maciej Stachowiak <m...@apple.com>
Remove V8 attribtues from IDLAttributes.txt
Modified: trunk/Source/WebCore/html/HTMLPlugInElement.h (148486 => 148487)
--- trunk/Source/WebCore/html/HTMLPlugInElement.h 2013-04-16 02:15:00 UTC (rev 148486)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.h 2013-04-16 02:52:00 UTC (rev 148487)
@@ -59,7 +59,7 @@
virtual void setDisplayState(DisplayState state) { m_displayState = state; }
virtual void updateSnapshot(PassRefPtr<Image>) { }
virtual void dispatchPendingMouseClick() { }
- virtual bool restartedPlugin() const { return false; }
+ virtual bool isRestartedPlugin() const { return false; }
#if ENABLE(NETSCAPE_PLUGIN_API)
NPObject* getNPObject();
Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (148486 => 148487)
--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-04-16 02:15:00 UTC (rev 148486)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-04-16 02:52:00 UTC (rev 148487)
@@ -81,7 +81,7 @@
, m_swapRendererTimer(this, &HTMLPlugInImageElement::swapRendererTimerFired)
, m_removeSnapshotTimer(this, &HTMLPlugInImageElement::removeSnapshotTimerFired)
, m_createdDuringUserGesture(ScriptController::processingUserGesture())
- , m_restartedPlugin(false)
+ , m_isRestartedPlugin(false)
, m_needsCheckForSizeChange(false)
, m_snapshotDecision(SnapshotNotYetDecided)
{
@@ -98,7 +98,7 @@
{
#if PLATFORM(MAC)
if (state == RestartingWithPendingMouseClick || state == Restarting) {
- m_restartedPlugin = true;
+ m_isRestartedPlugin = true;
m_snapshotDecision = NeverSnapshot;
if (displayState() == DisplayingSnapshot)
m_removeSnapshotTimer.startOneShot(removeSnapshotTimerDelay);
@@ -426,7 +426,7 @@
void HTMLPlugInImageElement::removeSnapshotTimerFired(Timer<HTMLPlugInImageElement>*)
{
m_snapshotImage = nullptr;
- m_restartedPlugin = false;
+ m_isRestartedPlugin = false;
if (renderer())
renderer()->repaint();
}
Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.h (148486 => 148487)
--- trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2013-04-16 02:15:00 UTC (rev 148486)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2013-04-16 02:52:00 UTC (rev 148487)
@@ -122,7 +122,7 @@
virtual PassRefPtr<RenderStyle> customStyleForRenderer() OVERRIDE;
void restartSnapshottedPlugIn();
- virtual bool restartedPlugin() const OVERRIDE { return m_restartedPlugin; }
+ virtual bool isRestartedPlugin() const OVERRIDE { return m_isRestartedPlugin; }
private:
virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
@@ -158,7 +158,7 @@
RefPtr<Element> m_shadowContainer;
RefPtr<Element> m_snapshotLabel;
bool m_createdDuringUserGesture;
- bool m_restartedPlugin;
+ bool m_isRestartedPlugin;
bool m_needsCheckForSizeChange;
IntSize m_sizeWhenSnapshotted;
SnapshotDecision m_snapshotDecision;
Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (148486 => 148487)
--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2013-04-16 02:15:00 UTC (rev 148486)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2013-04-16 02:52:00 UTC (rev 148487)
@@ -180,7 +180,7 @@
if (plugInElement->displayState() > HTMLPlugInElement::DisplayingSnapshot) {
RenderPart::paintContents(paintInfo, paintOffset);
- if (!plugInElement->restartedPlugin())
+ if (!plugInElement->isRestartedPlugin())
return;
}
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (148486 => 148487)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-04-16 02:15:00 UTC (rev 148486)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-04-16 02:52:00 UTC (rev 148487)
@@ -1537,7 +1537,7 @@
if (!element || !element->isPluginElement())
return false;
- return toHTMLPlugInElement(element)->restartedPlugin();
+ return toHTMLPlugInElement(element)->isRestartedPlugin();
}
static bool isCompositedPlugin(RenderObject* renderer)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
