[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dbates at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 6a8263eb862e80eac1993bef9c917a38af4824cc
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 11 06:09:57 2010 +0000

    2010-01-10  Daniel Bates  <dbates at webkit.org>
    
            Unreviewed, fix typo.
    
            Fixed typo in test LayoutTests/fast/events/frame-programmatic-focus.html.
            The word "frame" should be "iframe" in the string "<input> in frame blurred"
            based on the context of the test. In particular, the line "<input> in iframe focused"
            and the use of an iframe in the test.
    
            * fast/events/frame-programmatic-focus-expected.txt:
            * fast/events/frame-programmatic-focus.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53065 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5f3578c..781b687 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
 2010-01-10  Daniel Bates  <dbates at webkit.org>
 
+        Unreviewed, fix typo.
+        
+        Fixed typo in test LayoutTests/fast/events/frame-programmatic-focus.html.
+        The word "frame" should be "iframe" in the string "<input> in frame blurred"
+        based on the context of the test. In particular, the line "<input> in iframe focused"
+        and the use of an iframe in the test.
+
+        * fast/events/frame-programmatic-focus-expected.txt: 
+        * fast/events/frame-programmatic-focus.html:
+
+2010-01-10  Daniel Bates  <dbates at webkit.org>
+
         Rubber-stamped by Eric Seidel.
 
         Adding XSSAuditor test http/tests/security/xssAuditor/malformed-HTML.html
diff --git a/LayoutTests/fast/events/frame-programmatic-focus-expected.txt b/LayoutTests/fast/events/frame-programmatic-focus-expected.txt
index 26bf1f1..ad58cb2 100644
--- a/LayoutTests/fast/events/frame-programmatic-focus-expected.txt
+++ b/LayoutTests/fast/events/frame-programmatic-focus-expected.txt
@@ -6,7 +6,7 @@ This page tests that frames receive focus events when one of their child element
 main frame blurred
 iframe focused
 <input> in iframe focused
-<input> in frame blurred
+<input> in iframe blurred
 iframe blurred
 main frame focused
 <input> focused
diff --git a/LayoutTests/fast/events/frame-programmatic-focus.html b/LayoutTests/fast/events/frame-programmatic-focus.html
index becbc8a..aae2966 100644
--- a/LayoutTests/fast/events/frame-programmatic-focus.html
+++ b/LayoutTests/fast/events/frame-programmatic-focus.html
@@ -23,7 +23,7 @@
 
             var inputInIframe = w.document.getElementsByTagName('input')[0];
             inputInIframe.onfocus = function() { log('<input> in iframe focused'); }
-            inputInIframe.onblur = function() { log ('<input> in frame blurred'); }
+            inputInIframe.onblur = function() { log ('<input> in iframe blurred'); }
 
             input.focus();
             inputInIframe.focus();

-- 
WebKit Debian packaging