Changeset 96566 in webkit

Timestamp:

Oct 3, 2011 7:26:10 PM (13 years ago)

Author:

Darin Adler

Message:

Change cursor to hand over missing plug-in message
​https://bugs.webkit.org/show_bug.cgi?id=69312

Reviewed by Sam Weinig.

No tests because we currently don't have any test machinery for cursors.

• page/EventHandler.cpp:

(WebCore::OptionalCursor::OptionalCursor): Added. Construct an object
to represent either a cursor, or no cursor change.
(WebCore::OptionalCursor::isCursorChange): Added.
(WebCore::OptionalCursor::cursor): Added.
(WebCore::EventHandler::selectCursor): Changed return type to OptionalCursor,
moved some special cases from handleMouseMoveEvent in here. Moved the logic
for plug-ins and framesets into the specific renderer classes for those.
Added a call to the new getCursor virtual function.
(WebCore::EventHandler::handleMouseMoveEvent): Changed cursor setting code to
just be a call to selectCursor and then setCursor. Plug-in-specific code is now
in RenderWidget.

• page/EventHandler.h: Changed return type of selectCursor.

• page/MouseEventWithHitTestResults.cpp: Made some functions be inline.
• page/MouseEventWithHitTestResults.h:

(WebCore::MouseEventWithHitTestResults::localPoint): Made this inline.
(WebCore::MouseEventWithHitTestResults::scrollbar): Made this inline.
Yes, this has nothing to do with the rest of the patch, but it's good.

• rendering/RenderEmbeddedObject.cpp:

(WebCore::RenderEmbeddedObject::getReplacementTextGeometry): Made const.
(WebCore::RenderEmbeddedObject::isInMissingPluginIndicator): Made const.
Overloaded so it can be called with a point rather than an event.
(WebCore::shouldMissingPluginMessageBeButton): Added. Helps streamline
the logic below.
(WebCore::RenderEmbeddedObject::handleMissingPluginIndicatorEvent):
Changed to use shouldMissingPluginMessageBeButton.
(WebCore::RenderEmbeddedObject::getCursor): Added. Sets the cursor to
a hand when over the missing plug-in message.

• rendering/RenderEmbeddedObject.h: Added getCursor override. Also updated

for other changes above.

• rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::getCursor): Added. Contains the logic that used
to be hardcoded in EventHandler::selectCursor about cursors when over
resizable frame borders.

• rendering/RenderFrameSet.h: Added getCursor.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::getCursor): Added. Returns SetCursorBasedOnStyle.

• rendering/RenderObject.h: Added getCursor.

• rendering/RenderWidget.cpp:

(WebCore::RenderWidget::getCursor): Added. Contains the logic that used
to be hardcoded in EventHandler::handleMouseMoveEvent to prevent setting
the cursor when the pointer is over a plug-in. This new code is much better,
because it only kicks in when there is actually a plug-in present. The old
was based on the HTML tag!

• rendering/RenderWidget.h: Added getCursor.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (4 diffs)
• page/EventHandler.h (modified) (3 diffs)
• page/MouseEventWithHitTestResults.cpp (modified) (1 diff)
• page/MouseEventWithHitTestResults.h (modified) (1 diff)
• rendering/RenderEmbeddedObject.cpp (modified) (5 diffs)
• rendering/RenderEmbeddedObject.h (modified) (2 diffs)
• rendering/RenderFrameSet.cpp (modified) (2 diffs)
• rendering/RenderFrameSet.h (modified) (2 diffs)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (3 diffs)
• rendering/RenderWidget.cpp (modified) (1 diff)
• rendering/RenderWidget.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-03  Darin Adler  <darin@apple.com>
+
+        Change cursor to hand over missing plug-in message
+        https://bugs.webkit.org/show_bug.cgi?id=69312
+
+        Reviewed by Sam Weinig.
+
+        No tests because we currently don't have any test machinery for cursors.
+
+        * page/EventHandler.cpp:
+        (WebCore::OptionalCursor::OptionalCursor): Added. Construct an object
+        to represent either a cursor, or no cursor change.
+        (WebCore::OptionalCursor::isCursorChange): Added.
+        (WebCore::OptionalCursor::cursor): Added.
+        (WebCore::EventHandler::selectCursor): Changed return type to OptionalCursor,
+        moved some special cases from handleMouseMoveEvent in here. Moved the logic
+        for plug-ins and framesets into the specific renderer classes for those.
+        Added a call to the new getCursor virtual function.
+        (WebCore::EventHandler::handleMouseMoveEvent): Changed cursor setting code to
+        just be a call to selectCursor and then setCursor. Plug-in-specific code is now
+        in RenderWidget.
+
+        * page/EventHandler.h: Changed return type of selectCursor.
+
+        * page/MouseEventWithHitTestResults.cpp: Made some functions be inline.
+        * page/MouseEventWithHitTestResults.h:
+        (WebCore::MouseEventWithHitTestResults::localPoint): Made this inline.
+        (WebCore::MouseEventWithHitTestResults::scrollbar): Made this inline.
+        Yes, this has nothing to do with the rest of the patch, but it's good.
+
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::getReplacementTextGeometry): Made const.
+        (WebCore::RenderEmbeddedObject::isInMissingPluginIndicator): Made const.
+        Overloaded so it can be called with a point rather than an event.
+        (WebCore::shouldMissingPluginMessageBeButton): Added. Helps streamline
+        the logic below.
+        (WebCore::RenderEmbeddedObject::handleMissingPluginIndicatorEvent):
+        Changed to use shouldMissingPluginMessageBeButton.
+        (WebCore::RenderEmbeddedObject::getCursor): Added. Sets the cursor to
+        a hand when over the missing plug-in message.
+        * rendering/RenderEmbeddedObject.h: Added getCursor override. Also updated
+        for other changes above.
+
+        * rendering/RenderFrameSet.cpp:
+        (WebCore::RenderFrameSet::getCursor): Added. Contains the logic that used
+        to be hardcoded in EventHandler::selectCursor about cursors when over
+        resizable frame borders.
+        * rendering/RenderFrameSet.h: Added getCursor.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::getCursor): Added. Returns SetCursorBasedOnStyle.
+        * rendering/RenderObject.h: Added getCursor.
+
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::getCursor): Added. Contains the logic that used
+        to be hardcoded in EventHandler::handleMouseMoveEvent to prevent setting
+        the cursor when the pointer is over a plug-in. This new code is much better,
+        because it only kicks in when there is actually a plug-in present. The old
+        was based on the HTML tag!
+        * rendering/RenderWidget.h: Added getCursor.
+
 2011-10-03  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -128 +128 @@
 const double fakeMouseMoveInterval = 0.1;
 
+enum NoCursorChangeType { NoCursorChange };
+
+class OptionalCursor {
+public:
+    OptionalCursor(NoCursorChangeType) : m_isCursorChange(false) { }
+    OptionalCursor(const Cursor& cursor) : m_isCursorChange(true), m_cursor(cursor) { }
+
+    bool isCursorChange() const { return m_isCursorChange; }
+    const Cursor& cursor() const { return m_cursor; }
+
+private:
+    bool m_isCursorChange;
+    Cursor m_cursor;
+};
+
 static inline bool scrollNode(float delta, WheelEvent::Granularity granularity, ScrollDirection positiveDirection, ScrollDirection negativeDirection, Node* node, Node** stopNode)
 {
@@ -1151 +1166 @@
 }
 
-Cursor EventHandler::selectCursor(const MouseEventWithHitTestResults& event, Scrollbar* scrollbar)
-{
+OptionalCursor EventHandler::selectCursor(const MouseEventWithHitTestResults& event, Scrollbar* scrollbar)
+{
+    if (m_resizeLayer && m_resizeLayer->inResizeMode())
+        return NoCursorChange;
+
+    Page* page = m_frame->page();
+    if (!page)
+        return NoCursorChange;
+    if (page->mainFrame()->eventHandler()->m_panScrollInProgress)
+        return NoCursorChange;
+
     Node* node = targetNode(event);
     RenderObject* renderer = node ? node->renderer() : 0;
     RenderStyle* style = renderer ? renderer->style() : 0;
-
     bool horizontalText = !style || style->isHorizontalWritingMode();
     const Cursor& iBeam = horizontalText ? iBeamCursor() : verticalTextCursor();
@@ -1165 +1188 @@
         return iBeam;
 
-    if (renderer && renderer->isFrameSet()) {
-        RenderFrameSet* frameSetRenderer = toRenderFrameSet(renderer);
-        if (frameSetRenderer->canResizeRow(event.localPoint()))
-            return rowResizeCursor();
-        if (frameSetRenderer->canResizeColumn(event.localPoint()))
-            return columnResizeCursor();
+    if (renderer) {
+        Cursor overrideCursor;
+        switch (renderer->getCursor(event.localPoint(), overrideCursor)) {
+        case SetCursorBasedOnStyle:
+            break;
+        case SetCursor:
+            return overrideCursor;
+        case DoNotSetCursor:
+            return NoCursorChange;
+        }
     }
 
@@ -1630 +1657 @@
         if (scrollbar && !m_mousePressed)
             scrollbar->mouseMoved(mouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
-        if (Page* page = m_frame->page()) {
-            if ((!m_resizeLayer || !m_resizeLayer->inResizeMode()) && !page->mainFrame()->eventHandler()->m_panScrollInProgress) {
-                // Plugins set cursor on their own. The only case WebKit intervenes is resetting cursor to arrow on mouse enter,
-                // in case the particular plugin doesn't manipulate cursor at all. Thus,  even a CSS cursor set on body has no
-                // effect on plugins (which matches Firefox).
-                bool overPluginElement = false;
-                if (targetNode(mev) && targetNode(mev)->isHTMLElement()) {
-                    HTMLElement* el = toHTMLElement(targetNode(mev));
-                    overPluginElement = el->hasTagName(appletTag) || el->hasTagName(objectTag) || el->hasTagName(embedTag);
-                }
-                if (!overPluginElement) {
-                    if (FrameView* view = m_frame->view())
-                        view->setCursor(selectCursor(mev, scrollbar));
-                }
-            }
+        if (FrameView* view = m_frame->view()) {
+            OptionalCursor optionalCursor = selectCursor(mev, scrollbar);
+            if (optionalCursor.isCursorChange())
+                view->setCursor(optionalCursor.cursor());
         }
     }

trunk/Source/WebCore/page/EventHandler.h

@@ -51 +51 @@
 
 class Clipboard;
-class Cursor;
 class Event;
 class EventTarget;
@@ -63 +62 @@
 class MouseEventWithHitTestResults;
 class Node;
+class OptionalCursor;
 class PlatformKeyboardEvent;
 class PlatformTouchEvent;
@@ -239 +239 @@
     bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&);
 
-    Cursor selectCursor(const MouseEventWithHitTestResults&, Scrollbar*);
+    OptionalCursor selectCursor(const MouseEventWithHitTestResults&, Scrollbar*);
 #if ENABLE(PAN_SCROLLING)
     void updatePanScrollState();

trunk/Source/WebCore/page/MouseEventWithHitTestResults.cpp

@@ -34 +34 @@
 }
 
-const LayoutPoint MouseEventWithHitTestResults::localPoint() const
-{
-    return m_hitTestResult.localPoint();
-}
-
-Scrollbar* MouseEventWithHitTestResults::scrollbar() const
-{
-    return m_hitTestResult.scrollbar();
-}
-
 bool MouseEventWithHitTestResults::isOverLink() const
 {

trunk/Source/WebCore/page/MouseEventWithHitTestResults.h

@@ -35 +35 @@
     const PlatformMouseEvent& event() const { return m_event; }
     const HitTestResult& hitTestResult() const { return m_hitTestResult; }
-    const LayoutPoint localPoint() const;
-    Scrollbar* scrollbar() const;
+    LayoutPoint localPoint() const { return m_hitTestResult.localPoint(); }
+    Scrollbar* scrollbar() const { return m_hitTestResult.scrollbar(); }
     bool isOverLink() const;
     bool isOverWidget() const { return m_hitTestResult.isOverWidget(); }

trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

@@ -27 +27 @@
 #include "Chrome.h"
 #include "ChromeClient.h"
+#include "Cursor.h"
 #include "CSSValueKeywords.h"
 #include "Font.h"
@@ -181 +182 @@
 }
 
-bool RenderEmbeddedObject::getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, Path& path, FloatRect& replacementTextRect, Font& font, TextRun& run, float& textWidth)
+bool RenderEmbeddedObject::getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, Path& path, FloatRect& replacementTextRect, Font& font, TextRun& run, float& textWidth) const
 {
     contentRect = contentBoxRect();
@@ -250 +251 @@
 }
  
-bool RenderEmbeddedObject::isInMissingPluginIndicator(MouseEvent* event)
+bool RenderEmbeddedObject::isInMissingPluginIndicator(const LayoutPoint& point) const
 {
     FloatRect contentRect;
@@ -258 +259 @@
     TextRun run("");
     float textWidth;
-    if (!getReplacementTextGeometry(IntPoint(), contentRect, path, replacementTextRect, font, run, textWidth))
-        return false;
-    
-    return path.contains(absoluteToLocal(event->absoluteLocation(), false, true));
+    return getReplacementTextGeometry(IntPoint(), contentRect, path, replacementTextRect, font, run, textWidth)
+        && path.contains(point);
+}
+
+bool RenderEmbeddedObject::isInMissingPluginIndicator(MouseEvent* event) const
+{
+    return isInMissingPluginIndicator(roundedLayoutPoint(absoluteToLocal(event->absoluteLocation(), false, true)));
+}
+
+static bool shouldMissingPluginMessageBeButton(Document* document)
+{
+    Page* page = document->page();
+    return page && page->chrome()->client()->shouldMissingPluginMessageBeButton();
 }
 
 void RenderEmbeddedObject::handleMissingPluginIndicatorEvent(Event* event)
 {
-    if (Page* page = document()->page()) {
-        if (!page->chrome()->client()->shouldMissingPluginMessageBeButton())
-            return;
-    }
+    if (!shouldMissingPluginMessageBeButton(document()))
+        return;
     
     if (!event->isMouseEvent())
@@ -308 +316 @@
 }
 
-}
+CursorDirective RenderEmbeddedObject::getCursor(const LayoutPoint& point, Cursor& cursor) const
+{
+    if (m_showsMissingPluginIndicator && shouldMissingPluginMessageBeButton(document()) && isInMissingPluginIndicator(point)) {
+        cursor = handCursor();
+        return SetCursor;
+    }
+    return RenderPart::getCursor(point, cursor);
+}
+
+}

trunk/Source/WebCore/rendering/RenderEmbeddedObject.h

@@ -59 +59 @@
     virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
     virtual void paint(PaintInfo&, const LayoutPoint&);
+    virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const;
 
 #if USE(ACCELERATED_COMPOSITING)
@@ -68 +69 @@
     
     void setMissingPluginIndicatorIsPressed(bool);
-    bool isInMissingPluginIndicator(MouseEvent*);
-    bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth);
+    bool isInMissingPluginIndicator(MouseEvent*) const;
+    bool isInMissingPluginIndicator(const LayoutPoint&) const;
+    bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth) const;
 
     String m_replacementText;

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -25 +25 @@
 #include "RenderFrameSet.h"
 
+#include "Cursor.h"
 #include "Document.h"
 #include "EventHandler.h"
@@ -800 +801 @@
 }
 
+CursorDirective RenderFrameSet::getCursor(const LayoutPoint& point, Cursor& cursor) const
+{
+    if (canResizeRow(point)) {
+        cursor = rowResizeCursor();
+        return SetCursor;
+    }
+    if (canResizeColumn(point)) {
+        cursor = columnResizeCursor();
+        return SetCursor;
+    }
+    return RenderBox::getCursor(point, cursor);
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderFrameSet.h

@@ -69 +69 @@
     bool isResizingColumn() const;
 
-    bool canResizeRow(const IntPoint&) const;
-    bool canResizeColumn(const IntPoint&) const;
+    bool canResizeRow(const LayoutPoint&) const;
+    bool canResizeColumn(const LayoutPoint&) const;
 
     void notifyFrameEdgeInfoChanged();
@@ -100 +100 @@
     virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
+    virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const;
 
     inline HTMLFrameSetElement* frameSet() const;

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -2691 +2691 @@
 }
 
+CursorDirective RenderObject::getCursor(const LayoutPoint&, Cursor&) const
+{
+    return SetCursorBasedOnStyle;
+}
+
 #if ENABLE(SVG)
+
 RenderSVGResourceContainer* RenderObject::toRenderSVGResourceContainer()
 {

trunk/Source/WebCore/rendering/RenderObject.h

@@ -47 +47 @@
 class AffineTransform;
 class AnimationController;
+class Cursor;
 class HitTestResult;
 class InlineBox;
@@ -66 +67 @@
 
 struct PaintInfo;
+
+enum CursorDirective {
+    SetCursorBasedOnStyle,
+    SetCursor,
+    DoNotSetCursor
+};
 
 enum HitTestFilter {
@@ -659 +666 @@
     virtual RenderStyle* outlineStyleForRepaint() const { return style(); }
     
-    void getTextDecorationColors(int decorations, Color& underline, Color& overline,
-                                 Color& linethrough, bool quirksMode = false);
+    virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const;
+
+    void getTextDecorationColors(int decorations, Color& underline, Color& overline, Color& linethrough, bool quirksMode = false);
 
     // Return the RenderBox in the container chain which is responsible for painting this object, or 0

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -386 +386 @@
 }
 
+CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor) const
+{
+    if (widget() && widget()->isPluginViewBase()) {
+        // A plug-in is responsible for setting the cursor when the pointer is over it.
+        return DoNotSetCursor;
+    }
+    return RenderReplaced::getCursor(point, cursor);
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderWidget.h

@@ -60 +60 @@
     virtual void layout();
     virtual void paint(PaintInfo&, const LayoutPoint&);
+    virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const;
 
 private: