Changeset 120428 in webkit

Timestamp:

Jun 15, 2012, 2:24:04 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] EFL's LayoutTestController does not support titleTextDirection
​https://bugs.webkit.org/show_bug.cgi?id=86475

Patch by Christophe Dumez <Christophe Dumez> on 2012-06-15
Reviewed by Hajime Morita.

Source/WebKit/efl:

Emit the "title,changed" signal even if the title direction has
changed but not its text.

• ewk/ewk_frame.cpp:

(ewk_frame_title_set):

Tools:

Add titleTextDirection getter and setter to LayoutTestController and
expose its value to JavaScript.
Update the titleTextDirection value from EFL's "title,changed"
callback in DumpRenderTree.

• DumpRenderTree/LayoutTestController.cpp:

(LayoutTestController::LayoutTestController):
(getTitleTextDirectionCallback):
(LayoutTestController::staticValues):

• DumpRenderTree/LayoutTestController.h:

(LayoutTestController::titleTextDirection):
(LayoutTestController::setTitleTextDirection):
(LayoutTestController):

• DumpRenderTree/efl/DumpRenderTreeChrome.cpp:

(DumpRenderTreeChrome::onFrameTitleChanged):

LayoutTests:

Unskip title-directionality tests now that EFL's LayoutTestController
supports titleTextDirection.

• platform/efl/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/ewk/ewk_frame.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/LayoutTestController.cpp (modified) (3 diffs)
• Tools/DumpRenderTree/LayoutTestController.h (modified) (2 diffs)
• Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-15  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] EFL's LayoutTestController does not support titleTextDirection
+        https://bugs.webkit.org/show_bug.cgi?id=86475
+
+        Reviewed by Hajime Morita.
+
+        Unskip title-directionality tests now that EFL's LayoutTestController
+        supports titleTextDirection.
+
+        * platform/efl/TestExpectations:
+
 2012-06-15  Emil A Eklund  <eae@chromium.org>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -463 +463 @@
 BUGWK84778 : ietestcenter/css3/multicolumn/column-width-negative-001.htm = IMAGE
 
-// Expose title direction in WebKit API
-BUGWK58845 : fast/dom/title-directionality.html = TEXT
-BUGWK58845 : fast/dom/title-directionality-removeChild.html = TEXT
-
 // Tests that sometimes fail on the bot (for GTK and Chromium ports as well)
 BUGWK77631 : fast/multicol/span/span-as-immediate-child-property-removal.html = TEXT PASS

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-06-15  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] EFL's LayoutTestController does not support titleTextDirection
+        https://bugs.webkit.org/show_bug.cgi?id=86475
+
+        Reviewed by Hajime Morita.
+
+        Emit the "title,changed" signal even if the title direction has
+        changed but not its text.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_title_set):
+
 2012-06-14  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

@@ -1617 +1617 @@
 void ewk_frame_title_set(Evas_Object* ewkFrame, const Ewk_Text_With_Direction* title)
 {
-    DBG("ewkFrame=%p, title=%s", ewkFrame, title->string ? title->string : "(null)");
+    DBG("ewkFrame=%p, title=%s, direction=%s", ewkFrame, title->string ? title->string : "(null)", title->direction == EWK_TEXT_DIRECTION_LEFT_TO_RIGHT ? "ltr" : "rtl");
     EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData);
-    if (!eina_stringshare_replace(&smartData->title.string, title->string))
+    if (!eina_stringshare_replace(&smartData->title.string, title->string) && (smartData->title.direction == title->direction))
         return;
     smartData->title.direction = title->direction;

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-15  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] EFL's LayoutTestController does not support titleTextDirection
+        https://bugs.webkit.org/show_bug.cgi?id=86475
+
+        Reviewed by Hajime Morita.
+
+        Add titleTextDirection getter and setter to LayoutTestController and
+        expose its value to JavaScript.
+        Update the titleTextDirection value from EFL's "title,changed"
+        callback in DumpRenderTree.
+
+        * DumpRenderTree/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController):
+        (getTitleTextDirectionCallback):
+        (LayoutTestController::staticValues):
+        * DumpRenderTree/LayoutTestController.h:
+        (LayoutTestController::titleTextDirection):
+        (LayoutTestController::setTitleTextDirection):
+        (LayoutTestController):
+        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+        (DumpRenderTreeChrome::onFrameTitleChanged):
+
 2012-06-15  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Tools/DumpRenderTree/LayoutTestController.cpp

@@ -97 +97 @@
     , m_testPathOrURL(testPathOrURL)
     , m_expectedPixelHash(expectedPixelHash)
+    , m_titleTextDirection("ltr")
 {
 }
@@ -2159 +2160 @@
 #endif
 
+static JSValueRef getTitleTextDirectionCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
+{
+    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+    JSRetainPtr<JSStringRef> titleDirection(Adopt, JSStringCreateWithUTF8CString(controller->titleTextDirection().c_str()));
+    return JSValueMakeString(context, titleDirection.get());
+}
+
 static bool setGlobalFlagCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
 {
@@ -2262 +2270 @@
         { "platformName", getPlatformNameCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
 #endif
+        { "titleTextDirection", getTitleTextDirectionCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { 0, 0, 0, 0 }
     };

trunk/Tools/DumpRenderTree/LayoutTestController.h

@@ -360 +360 @@
 
     void setTextDirection(JSStringRef);
+    const std::string& titleTextDirection() const { return m_titleTextDirection; }
+    void setTitleTextDirection(const std::string& direction) { m_titleTextDirection = direction; }
 
     // Custom full screen behavior.
@@ -424 +426 @@
     std::string m_testPathOrURL;
     std::string m_expectedPixelHash;    // empty string if no hash
+    std::string m_titleTextDirection;
 
     std::set<std::string> m_willSendRequestClearHeaders;

trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp

@@ -470 +470 @@
         printf("WebView updated the title for history URL \"%s\" to \"%s\".\n", ewk_frame_uri_get(frame)
                , (titleText && titleText->string) ? titleText->string : "");
+
+    gLayoutTestController->setTitleTextDirection(titleText->direction == EWK_TEXT_DIRECTION_LEFT_TO_RIGHT ? "ltr" : "rtl");
 }