Changeset 52903 in webkit

Timestamp:

Jan 6, 2010 11:07:54 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-06 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Return an invalid Qt::ImMicroFocus if queried while the view needs to layout.

​https://bugs.webkit.org/show_bug.cgi?id=33204

• Api/qwebpage.cpp: (QWebPage::inputMethodQuery):

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1394 +1394 @@
     switch (property) {
         case Qt::ImMicroFocus: {
+            WebCore::FrameView* view = frame->view();
+            if (view && view->needsLayout()) {
+                // We can't access absoluteCaretBounds() while the view needs to layout.
+                return QVariant();
+            }
             return QVariant(frame->selection()->absoluteCaretBounds());
         }

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-01-06  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Return an invalid Qt::ImMicroFocus if queried while the view needs to layout.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33204
+
+        * Api/qwebpage.cpp:
+        (QWebPage::inputMethodQuery):
+
 2010-01-05  Yael Aharon  <yael.aharon@nokia.com>