Unreviewed EFL gardening.

* platform/efl-wk2/plugins/npruntime/object-from-destroyed-plugin-expected.txt: Added.
* platform/efl-wk2/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt: Added.
* platform/efl/fast/forms/control-restrict-line-height-expected.png: Rebaseline after r155408.
* platform/efl/fast/forms/control-restrict-line-height-expected.txt: Rebaseline after r155408.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157616 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 98092c3..f8092fa 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2013-10-17  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        Unreviewed EFL gardening.
+
+        * platform/efl-wk2/plugins/npruntime/object-from-destroyed-plugin-expected.txt: Added.
+        * platform/efl-wk2/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt: Added.
+        * platform/efl/fast/forms/control-restrict-line-height-expected.png: Rebaseline after r155408.
+        * platform/efl/fast/forms/control-restrict-line-height-expected.txt: Rebaseline after r155408.
+
 2013-10-17  Alexandru Chiculita  <achicu@adobe.com>
 
         Web Inspector: [CSS Regions] Crash when highlighting a node of a flow with no regions

diff --git a/LayoutTests/platform/efl-wk2/plugins/npruntime/object-from-destroyed-plugin-expected.txt b/LayoutTests/platform/efl-wk2/plugins/npruntime/object-from-destroyed-plugin-expected.txt
new file mode 100644 (file)
index 0000000..32e28ad
--- /dev/null
+++ b/LayoutTests/platform/efl-wk2/plugins/npruntime/object-from-destroyed-plugin-expected.txt
@@ -0,0 +1,10 @@
+Test various operation on an NPObject whose plug-in has been destroyed
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testObject.gettingProperty threw exception ReferenceError: Trying to access object from destroyed plug-in..
+PASS testObject.settingProperty = 10 threw exception ReferenceError: Trying to access object from destroyed plug-in..
+PASS testObject() threw exception TypeError: NPObject is not a function (evaluating 'testObject()').
+PASS new testObject(); threw exception TypeError: NPObject is not a constructor (evaluating 'new testObject()').
+

diff --git a/LayoutTests/platform/efl-wk2/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt b/LayoutTests/platform/efl-wk2/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt
new file mode 100644 (file)
index 0000000..0bff884
--- /dev/null
+++ b/LayoutTests/platform/efl-wk2/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt
@@ -0,0 +1,10 @@
+Test various operation on an NPObject whose plug-in (that lives in a subframe) has been destroyed
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+ PASS testObject.gettingProperty threw exception ReferenceError: Trying to access object from destroyed plug-in..
+PASS testObject.settingProperty = 10 threw exception ReferenceError: Trying to access object from destroyed plug-in..
+PASS testObject() threw exception TypeError: NPObject is not a function (evaluating 'testObject()').
+PASS new testObject(); threw exception TypeError: NPObject is not a constructor (evaluating 'new testObject()').
+

diff --git a/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.png b/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.png
index e130d59..41ebcac 100644 (file)
Binary files a/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.png and b/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.png differ

diff --git a/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.txt b/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.txt
index e9968be..c79d0f0 100644 (file)
--- a/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.txt
@@ -13,20 +13,20 @@ layer at (0,0) size 800x600
       RenderText {#text} at (418,30) size 4x17
         text run at (418,30) width 4: " "
       RenderBR {BR} at (0,0) size 0x0
-      RenderButton {INPUT} at (2,62) size 392x48 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-        RenderBlock (anonymous) at (17,10) size 358x26
-          RenderText at (0,4) size 358x17
-            text run at (0,4) width 358: "This text should be centered vertically in the button"
-      RenderText {#text} at (396,76) size 4x17
-        text run at (396,76) width 4: " "
+      RenderButton {INPUT} at (2,62) size 392x40 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+        RenderBlock (anonymous) at (17,10) size 358x18
+          RenderText at (0,0) size 358x17
+            text run at (0,0) width 358: "This text should be centered vertically in the button"
+      RenderText {#text} at (396,72) size 4x17
+        text run at (396,72) width 4: " "
       RenderBR {BR} at (0,0) size 0x0
-      RenderTextControl {INPUT} at (2,114) size 208x36 [bgcolor=#FFFFFF]
-        RenderFlexibleBox {DIV} at (4,6) size 201x26
-          RenderBlock {DIV} at (0,13) size 0x0
-          RenderBlock {DIV} at (0,0) size 185x26
-          RenderBlock {DIV} at (185,5) size 16x16
+      RenderTextControl {INPUT} at (2,106) size 208x28 [bgcolor=#FFFFFF]
+        RenderFlexibleBox {DIV} at (4,6) size 201x18
+          RenderBlock {DIV} at (0,9) size 0x0
+          RenderBlock {DIV} at (0,0) size 185x18
+          RenderBlock {DIV} at (185,1) size 16x16
       RenderText {#text} at (0,0) size 0x0
-layer at (14,128) size 185x26 scrollWidth 359
-  RenderBlock {DIV} at (0,0) size 185x26
-    RenderText {#text} at (0,4) size 358x17
-      text run at (0,4) width 358: "This text should be centered vertically in the button"
+layer at (14,120) size 185x18 scrollWidth 359
+  RenderBlock {DIV} at (0,0) size 185x18
+    RenderText {#text} at (0,0) size 358x17
+      text run at (0,0) width 358: "This text should be centered vertically in the button"