Title: [124538] trunk/Source/WebCore
Revision
124538
Author
[email protected]
Date
2012-08-02 17:23:14 -0700 (Thu, 02 Aug 2012)

Log Message

SVG text selection doesn't work with hyperlinked text
https://bugs.webkit.org/show_bug.cgi?id=29166

Reviewed by Eric Seidel.

Cleanup SVGAElement. There is no need to test for middle mouse button here, this
is handled elsewhere, so remove isMiddleMouseButtonEvent. Similarly handleLinkClick
is not used anymore by HTMLAnchorElement, remove it. Finally, _self indeed is not needed.

No new tests, since no change in behaviour.

* WebCore.order:
* html/HTMLAnchorElement.cpp:
* html/HTMLAnchorElement.h:
(WebCore):
* svg/SVGAElement.cpp:
(WebCore::SVGAElement::defaultEventHandler):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (124537 => 124538)


--- trunk/Source/WebCore/ChangeLog	2012-08-03 00:16:33 UTC (rev 124537)
+++ trunk/Source/WebCore/ChangeLog	2012-08-03 00:23:14 UTC (rev 124538)
@@ -1,3 +1,23 @@
+2012-08-02  Rob Buis  <[email protected]>
+
+        SVG text selection doesn't work with hyperlinked text
+        https://bugs.webkit.org/show_bug.cgi?id=29166
+
+        Reviewed by Eric Seidel.
+
+        Cleanup SVGAElement. There is no need to test for middle mouse button here, this
+        is handled elsewhere, so remove isMiddleMouseButtonEvent. Similarly handleLinkClick
+        is not used anymore by HTMLAnchorElement, remove it. Finally, _self indeed is not needed.
+
+        No new tests, since no change in behaviour.
+
+        * WebCore.order:
+        * html/HTMLAnchorElement.cpp:
+        * html/HTMLAnchorElement.h:
+        (WebCore):
+        * svg/SVGAElement.cpp:
+        (WebCore::SVGAElement::defaultEventHandler):
+
 2012-08-02  Kwang Yul Seo  <[email protected]>
 
         Move causesFosterParenting() to HTMLStackItem

Modified: trunk/Source/WebCore/WebCore.order (124537 => 124538)


--- trunk/Source/WebCore/WebCore.order	2012-08-03 00:16:33 UTC (rev 124537)
+++ trunk/Source/WebCore/WebCore.order	2012-08-03 00:23:14 UTC (rev 124538)
@@ -16890,7 +16890,6 @@
 __ZN7WebCore11RenderBlock20childBecameNonInlineEPNS_12RenderObjectE
 __ZN3WTF9HashTableIPN7WebCore14ScrollableAreaES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E16lookupForWritingERKS3_
 __ZN3WTF9HashTableIPN7WebCore14ScrollableAreaES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E4findIS3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEENS_17HashTableIteratorIS3_S3_S5_S7_S9_S9_EERKT_
-__ZN7WebCore15handleLinkClickEPNS_5EventEPNS_8DocumentERKN3WTF6StringES7_b
 __ZN7WebCore11FrameLoader11urlSelectedERKNS_4KURLERKN3WTF6StringENS4_10PassRefPtrINS_5EventEEEbbNS_14ReferrerPolicyE
 __ZN7WebCore11FrameLoader47callContinueFragmentScrollAfterNavigationPolicyEPvRKNS_15ResourceRequestEN3WTF10PassRefPtrINS_9FormStateEEEb
 __ZN7WebCore11FrameLoader18loadInSameDocumentERKNS_4KURLEPNS_21SerializedScriptValueEb
@@ -30182,7 +30181,6 @@
 __ZN7WebCore11isLinkClickEPNS_5EventE
 __ZNK7WebCore11SVGAElement5titleEv
 __ZNK7WebCore11SVGAElement16isMouseFocusableEv
-__ZN7WebCore24isMiddleMouseButtonEventEPNS_5EventE
 __ZNK7WebCore11SVGAElement6targetEv
 __ZN7WebCore17JSSVGImageElement3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE
 __ZN3JSC9lookupPutIN7WebCore17JSSVGImageElementEEEbPNS_9ExecStateERKNS_10IdentifierENS_7JSValueEPKNS_9HashTableEPT_

Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (124537 => 124538)


--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp	2012-08-03 00:16:33 UTC (rev 124537)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp	2012-08-03 00:23:14 UTC (rev 124538)
@@ -569,26 +569,11 @@
     return event->type() == eventNames().keydownEvent && event->isKeyboardEvent() && static_cast<KeyboardEvent*>(event)->keyIdentifier() == "Enter";
 }
 
-bool isMiddleMouseButtonEvent(Event* event)
-{
-    return event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == MiddleButton;
-}
-
 bool isLinkClick(Event* event)
 {
     return event->type() == eventNames().clickEvent && (!event->isMouseEvent() || static_cast<MouseEvent*>(event)->button() != RightButton);
 }
 
-void handleLinkClick(Event* event, Document* document, const String& url, const String& target, bool hideReferrer)
-{
-    event->setDefaultHandled();
-
-    Frame* frame = document->frame();
-    if (!frame)
-        return;
-    frame->loader()->urlSelected(document->completeURL(url), target, event, false, false, hideReferrer ? NeverSendReferrer : MaybeSendReferrer);
-}
-
 bool HTMLAnchorElement::willRespondToMouseClickEvents()
 {
     return isLink() || HTMLElement::willRespondToMouseClickEvents();

Modified: trunk/Source/WebCore/html/HTMLAnchorElement.h (124537 => 124538)


--- trunk/Source/WebCore/html/HTMLAnchorElement.h	2012-08-03 00:16:33 UTC (rev 124537)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.h	2012-08-03 00:23:14 UTC (rev 124538)
@@ -157,9 +157,7 @@
 // Functions shared with the other anchor elements (i.e., SVG).
 
 bool isEnterKeyKeydownEvent(Event*);
-bool isMiddleMouseButtonEvent(Event*);
 bool isLinkClick(Event*);
-void handleLinkClick(Event*, Document*, const String& url, const String& target, bool hideReferrer = false);
 
 } // namespace WebCore
 

Modified: trunk/Source/WebCore/svg/SVGAElement.cpp (124537 => 124538)


--- trunk/Source/WebCore/svg/SVGAElement.cpp	2012-08-03 00:16:33 UTC (rev 124537)
+++ trunk/Source/WebCore/svg/SVGAElement.cpp	2012-08-03 00:23:14 UTC (rev 124538)
@@ -175,19 +175,15 @@
                     return;
             }
 
-            // FIXME: Why does the SVG anchor element have this special logic
-            // for middle click that the HTML anchor element does not have?
-            // Making a middle click open a link in a new window or tab is
-            // properly handled at the client level, not inside WebKit; this
-            // code should be deleted.
-            String target = isMiddleMouseButtonEvent(event) ? "_blank" : this->target();
+            String target = this->target();
+            if (target.isEmpty() && fastGetAttribute(XLinkNames::showAttr) == "new")
+                target = "_blank";
+            event->setDefaultHandled();
 
-            // FIXME: It's not clear why setting target to "_self" is ever
-            // helpful.
-            if (target.isEmpty())
-                target = (fastGetAttribute(XLinkNames::showAttr) == "new") ? "_blank" : "_self";
-
-            handleLinkClick(event, document(), url, target);
+            Frame* frame = document()->frame();
+            if (!frame)
+                return;
+            frame->loader()->urlSelected(document()->completeURL(url), target, event, false, false, MaybeSendReferrer);
             return;
         }
     }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to