Ticket #3835: 3835.patch

_source/plugins/wysiwygarea/plugin.js

@@ -189 +189 @@
                 // Inserting the padding-br before body if it's preceded by an
                 // unexitable block.
                 var lastNode = body.getLast( true );
-                if ( lastNode.getName && ( lastNode.getName() in nonExitableElementNames ) )
+                if ( lastNode && lastNode.getName && ( lastNode.getName() in nonExitableElementNames ) )
                 {
                         var paddingBlock = editor.document.createElement(
                                         ( CKEDITOR.env.ie && enterMode != CKEDITOR.ENTER_BR ) ?

_source/core/dom/window.js

@@ -1 @@
-?/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -35 +35 @@
                  */
                 focus : function()
                 {
+                        // Webkit is sometimes failed to focus iframe, blur it first(#3835).
+                        if( CKEDITOR.env.webkit && this.$.parent )
+                                this.$.parent.focus();
                         this.$.focus();
                 },