Title: [144301] trunk/Source/WebKit/chromium
- Revision
- 144301
- Author
- toyos...@chromium.org
- Date
- 2013-02-28 06:16:35 -0800 (Thu, 28 Feb 2013)
Log Message
Unreviewed, quick test breakage fix for android
https://bugs.webkit.org/show_bug.cgi?id=110740
Patch by Seigo Nonaka <n...@chromium.org> on 2013-02-27
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::textInputInfo): Reconstruct condition check order
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (144300 => 144301)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-02-28 13:57:42 UTC (rev 144300)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-02-28 14:16:35 UTC (rev 144301)
@@ -1,3 +1,13 @@
+2013-02-28 Takashi Toyoshima <toyos...@chromium.org>
+
+ Unreviewed, quick test breakage fix for android
+ https://bugs.webkit.org/show_bug.cgi?id=110740
+
+ Patch by Seigo Nonaka <n...@chromium.org> on 2013-02-27
+
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::textInputInfo): Reconstruct condition check order
+
2013-02-28 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed. Rolled Chromium DEPS to r184931. Requested by
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (144300 => 144301)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-02-28 13:57:42 UTC (rev 144300)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-02-28 14:16:35 UTC (rev 144301)
@@ -2282,6 +2282,14 @@
if (!focused)
return info;
+ FrameSelection* selection = focused->selection();
+ if (!selection)
+ return info;
+
+ Node* node = selection->selection().rootEditableElement();
+ if (!node)
+ return info;
+
info.type = textInputType();
if (info.type == WebTextInputTypeNone)
return info;
@@ -2290,14 +2298,6 @@
if (!editor || !editor->canEdit())
return info;
- FrameSelection* selection = focused->selection();
- if (!selection)
- return info;
-
- Node* node = selection->selection().rootEditableElement();
- if (!node)
- return info;
-
info.value = plainText(rangeOfContents(node).get());
if (info.value.isEmpty())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
