| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 testTextInputType(WebTextInputTypeNumber, "input_field_number.html"); | 354 testTextInputType(WebTextInputTypeNumber, "input_field_number.html"); |
| 355 testTextInputType(WebTextInputTypeTelephone, "input_field_tel.html"); | 355 testTextInputType(WebTextInputTypeTelephone, "input_field_tel.html"); |
| 356 testTextInputType(WebTextInputTypeURL, "input_field_url.html"); | 356 testTextInputType(WebTextInputTypeURL, "input_field_url.html"); |
| 357 testTextInputType(WebTextInputTypeDate, "input_field_date.html"); | 357 testTextInputType(WebTextInputTypeDate, "input_field_date.html"); |
| 358 #if ENABLE(INPUT_TYPE_DATETIME_INCOMPLETE) | 358 #if ENABLE(INPUT_TYPE_DATETIME_INCOMPLETE) |
| 359 testTextInputType(WebTextInputTypeDateTime, "input_field_datetime.html"); | 359 testTextInputType(WebTextInputTypeDateTime, "input_field_datetime.html"); |
| 360 #endif | 360 #endif |
| 361 testTextInputType(WebTextInputTypeDateTimeLocal, "input_field_datetimelocal.
html"); | 361 testTextInputType(WebTextInputTypeDateTimeLocal, "input_field_datetimelocal.
html"); |
| 362 testTextInputType(WebTextInputTypeMonth, "input_field_month.html"); | 362 testTextInputType(WebTextInputTypeMonth, "input_field_month.html"); |
| 363 testTextInputType(WebTextInputTypeTime, "input_field_time.html"); | 363 testTextInputType(WebTextInputTypeTime, "input_field_time.html"); |
| 364 #if ENABLE(INPUT_TYPE_WEEK) | |
| 365 testTextInputType(WebTextInputTypeWeek, "input_field_week.html"); | 364 testTextInputType(WebTextInputTypeWeek, "input_field_week.html"); |
| 366 #endif | |
| 367 | 365 |
| 368 } | 366 } |
| 369 | 367 |
| 370 TEST_F(WebViewTest, SetEditableSelectionOffsetsAndTextInputInfo) | 368 TEST_F(WebViewTest, SetEditableSelectionOffsetsAndTextInputInfo) |
| 371 { | 369 { |
| 372 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c
_str()), WebString::fromUTF8("input_field_populated.html")); | 370 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c
_str()), WebString::fromUTF8("input_field_populated.html")); |
| 373 WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "input
_field_populated.html"); | 371 WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "input
_field_populated.html"); |
| 374 webView->setInitialFocus(false); | 372 webView->setInitialFocus(false); |
| 375 webView->setEditableSelectionOffsets(5, 13); | 373 webView->setEditableSelectionOffsets(5, 13); |
| 376 WebFrameImpl* frame = static_cast<WebFrameImpl*>(webView->mainFrame()); | 374 WebFrameImpl* frame = static_cast<WebFrameImpl*>(webView->mainFrame()); |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 804 client.clearChangeCounts(); | 802 client.clearChangeCounts(); |
| 805 webView->confirmComposition(); | 803 webView->confirmComposition(); |
| 806 EXPECT_EQ(0, client.textChangesWhileIgnored()); | 804 EXPECT_EQ(0, client.textChangesWhileIgnored()); |
| 807 EXPECT_EQ(1, client.textChangesWhileNotIgnored()); | 805 EXPECT_EQ(1, client.textChangesWhileNotIgnored()); |
| 808 | 806 |
| 809 webView->setAutofillClient(0); | 807 webView->setAutofillClient(0); |
| 810 webView->close(); | 808 webView->close(); |
| 811 } | 809 } |
| 812 | 810 |
| 813 } | 811 } |
| OLD | NEW |