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

gyuyoung.kim at samsung.com gyuyoung.kim at samsung.com
Wed Dec 22 15:40:32 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8ba151349929e553fbef5b3b452767ef25e045e4
Author: gyuyoung.kim at samsung.com <gyuyoung.kim at samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 05:59:45 2010 +0000

    2010-11-09  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Eric Seidel.
    
            [WML] Fix build breaks when WML is enabled.
            https://bugs.webkit.org/show_bug.cgi?id=49168
    
            The backForward() of Page class returns BackForwarddController class type.
            So, WML classes need to include the BackForwardController.h file. And, select()
            of RenderTextControl.h was removed. Thus, the select() should be replaced by
            setSelectionRange().
    
            * wml/WMLDoElement.cpp: Includes BackForwardController.h.
            * wml/WMLDocument.cpp: ditto.
            * wml/WMLInputElement.cpp:
            (WebCore::WMLInputElement::select): Replaced by setSelectionRange().
            * wml/WMLPageState.cpp: Includes BackForwardController.h.
            * wml/WMLPrevElement.cpp: ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71721 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 37ab972..cb5e285 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-09  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Eric Seidel.
+
+        [WML] Fix build breaks when WML is enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=49168
+
+        The backForward() of Page class returns BackForwarddController class type. 
+        So, WML classes need to include the BackForwardController.h file. And, select() 
+        of RenderTextControl.h was removed. Thus, the select() should be replaced by 
+        setSelectionRange().
+
+        * wml/WMLDoElement.cpp: Includes BackForwardController.h.
+        * wml/WMLDocument.cpp: ditto.
+        * wml/WMLInputElement.cpp: 
+        (WebCore::WMLInputElement::select): Replaced by setSelectionRange().
+        * wml/WMLPageState.cpp: Includes BackForwardController.h.
+        * wml/WMLPrevElement.cpp: ditto.
+
 2010-11-09  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/wml/WMLDoElement.cpp b/WebCore/wml/WMLDoElement.cpp
index 899bee1..a8d4880 100644
--- a/WebCore/wml/WMLDoElement.cpp
+++ b/WebCore/wml/WMLDoElement.cpp
@@ -24,6 +24,7 @@
 #include "WMLDoElement.h"
 
 #include "Attribute.h"
+#include "BackForwardController.h"
 #include "Event.h"
 #include "EventNames.h"
 #include "HTMLNames.h"
diff --git a/WebCore/wml/WMLDocument.cpp b/WebCore/wml/WMLDocument.cpp
index 440f8ee..9b29899 100644
--- a/WebCore/wml/WMLDocument.cpp
+++ b/WebCore/wml/WMLDocument.cpp
@@ -23,6 +23,7 @@
 #if ENABLE(WML)
 #include "WMLDocument.h"
 
+#include "BackForwardController.h"
 #include "BackForwardList.h"
 #include "Frame.h"
 #include "Page.h"
diff --git a/WebCore/wml/WMLInputElement.cpp b/WebCore/wml/WMLInputElement.cpp
index 2165bd4..2d7310a 100644
--- a/WebCore/wml/WMLInputElement.cpp
+++ b/WebCore/wml/WMLInputElement.cpp
@@ -191,7 +191,7 @@ void WMLInputElement::restoreFormControlState(const String& state)
 void WMLInputElement::select()
 {
     if (RenderTextControl* r = toRenderTextControl(renderer()))
-        r->select();
+        setSelectionRange(this, 0, r->text().length());
 }
 
 void WMLInputElement::accessKeyAction(bool)
diff --git a/WebCore/wml/WMLPageState.cpp b/WebCore/wml/WMLPageState.cpp
index 5779e0e..a3c6243 100644
--- a/WebCore/wml/WMLPageState.cpp
+++ b/WebCore/wml/WMLPageState.cpp
@@ -24,6 +24,7 @@
 #if ENABLE(WML)
 #include "WMLPageState.h"
 
+#include "BackForwardController.h"
 #include "BackForwardList.h"
 #include "Document.h"
 #include "Frame.h"
diff --git a/WebCore/wml/WMLPrevElement.cpp b/WebCore/wml/WMLPrevElement.cpp
index fccdc0b..c07f019 100644
--- a/WebCore/wml/WMLPrevElement.cpp
+++ b/WebCore/wml/WMLPrevElement.cpp
@@ -23,6 +23,7 @@
 #if ENABLE(WML)
 #include "WMLPrevElement.h"
 
+#include "BackForwardController.h"
 #include "Page.h"
 #include "WMLCardElement.h"
 #include "WMLDocument.h"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list