[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 13:22:51 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 10a9a7506828f3cb452520f200a13521881bb260
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 17:21:54 2010 +0000

    2010-09-13  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Darin Adler.
    
            [WML] Fix build breaks when WML is enabled
            https://bugs.webkit.org/show_bug.cgi?id=45628
    
            There are build breaks by Bug 22382 when WML is enabled. The handleLinkClick() has an event parameter.
            So, we need to set an event when wml invoke the handleLinkClick(). And, doTextFieldCommandFromEvent()
            was moved to editor. So, we need to mofidy the invocation in WMLInputElement.cpp
    
            * wml/WMLAElement.cpp:
            (WebCore::WMLAElement::defaultEventHandler):
            * wml/WMLInputElement.cpp:
            (WebCore::WMLInputElement::defaultEventHandler):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67395 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dd0f6f7..4d3334f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-13  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Darin Adler.
+
+        [WML] Fix build breaks when WML is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=45628
+
+        There are build breaks by Bug 22382 when WML is enabled. The handleLinkClick() has an event parameter.
+        So, we need to set an event when wml invoke the handleLinkClick(). And, doTextFieldCommandFromEvent()
+        was moved to editor. So, we need to mofidy the invocation in WMLInputElement.cpp 
+
+        * wml/WMLAElement.cpp:
+        (WebCore::WMLAElement::defaultEventHandler):
+        * wml/WMLInputElement.cpp:
+        (WebCore::WMLInputElement::defaultEventHandler):
+
 2010-09-13  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/wml/WMLAElement.cpp b/WebCore/wml/WMLAElement.cpp
index 8a4dc09..c60db5e 100644
--- a/WebCore/wml/WMLAElement.cpp
+++ b/WebCore/wml/WMLAElement.cpp
@@ -128,7 +128,7 @@ void WMLAElement::defaultEventHandler(Event* event)
         }
 
         if (isLinkClick(event)) {
-            handleLinkClick(document(), deprecatedParseURL(getAttribute(HTMLNames::hrefAttr)), target(), event);
+            handleLinkClick(event, document(), deprecatedParseURL(getAttribute(HTMLNames::hrefAttr)), target(), event);
             return;
         }
     }
diff --git a/WebCore/wml/WMLInputElement.cpp b/WebCore/wml/WMLInputElement.cpp
index 639658f..2165bd4 100644
--- a/WebCore/wml/WMLInputElement.cpp
+++ b/WebCore/wml/WMLInputElement.cpp
@@ -274,7 +274,7 @@ void WMLInputElement::defaultEventHandler(Event* evt)
     }
 
     if (evt->type() == eventNames().keydownEvent && evt->isKeyboardEvent() && focused() && document()->frame()
-        && document()->frame()->doTextFieldCommandFromEvent(this, static_cast<KeyboardEvent*>(evt))) {
+        && document()->frame()->editor()->doTextFieldCommandFromEvent(this, static_cast<KeyboardEvent*>(evt))) {
         evt->setDefaultHandled();
         return;
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list