| OLD | NEW | 
|---|
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "base/string_util.h" | 5 #include "base/string_util.h" | 
| 6 #include "base/string16.h" | 6 #include "base/string16.h" | 
| 7 #include "chrome/test/base/render_view_test.h" | 7 #include "chrome/test/base/render_view_test.h" | 
| 8 #include "content/common/native_web_keyboard_event.h" | 8 #include "content/common/native_web_keyboard_event.h" | 
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" | 
| 10 | 10 | 
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 73     onkeydown='return OnKeyEvent(event);'> | 73     onkeydown='return OnKeyEvent(event);'> | 
| 74   <div id='keydown' contenteditable='true'> </div> | 74   <div id='keydown' contenteditable='true'> </div> | 
| 75   <div id='scroll' contenteditable='true'> </div> | 75   <div id='scroll' contenteditable='true'> </div> | 
| 76   <p>p1 | 76   <p>p1 | 
| 77   <p>p2 | 77   <p>p2 | 
| 78   </body> | 78   </body> | 
| 79   </html> | 79   </html> | 
| 80   ); | 80   ); | 
| 81   #undef HTML | 81   #undef HTML | 
| 82 | 82 | 
|  | 83   WebPreferences prefs; | 
|  | 84   prefs.enable_scroll_animator = false; | 
|  | 85   view_->OnUpdateWebPreferences(prefs); | 
|  | 86 | 
| 83   const int kMaxOutputCharacters = 1024; | 87   const int kMaxOutputCharacters = 1024; | 
| 84   string16 output; | 88   string16 output; | 
| 85   char htmlBuffer[2048]; | 89   char htmlBuffer[2048]; | 
| 86 | 90 | 
| 87   NSEvent* arrowDownKeyDown = CmdDeadKeyEvent(NSKeyDown, kVK_DownArrow); | 91   NSEvent* arrowDownKeyDown = CmdDeadKeyEvent(NSKeyDown, kVK_DownArrow); | 
| 88   NSEvent* arrowUpKeyDown = CmdDeadKeyEvent(NSKeyDown, kVK_UpArrow); | 92   NSEvent* arrowUpKeyDown = CmdDeadKeyEvent(NSKeyDown, kVK_UpArrow); | 
| 89 | 93 | 
| 90   // First test when javascript does not eat keypresses -- should scroll. | 94   // First test when javascript does not eat keypresses -- should scroll. | 
| 91   sprintf(htmlBuffer, kRawHtml, "true"); | 95   sprintf(htmlBuffer, kRawHtml, "true"); | 
| 92   view_->set_send_content_state_immediately(true); | 96   view_->set_send_content_state_immediately(true); | 
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 130   const char* kArrowUpNoScroll = | 134   const char* kArrowUpNoScroll = | 
| 131       "38,false,false,true,false\np1\n\np2"; | 135       "38,false,false,true,false\np1\n\np2"; | 
| 132   view_->OnSetEditCommandsForNextKeyEvent( | 136   view_->OnSetEditCommandsForNextKeyEvent( | 
| 133       EditCommands(1, EditCommand("moveToBeginningOfDocument", ""))); | 137       EditCommands(1, EditCommand("moveToBeginningOfDocument", ""))); | 
| 134   SendNativeKeyEvent(NativeWebKeyboardEvent(arrowUpKeyDown)); | 138   SendNativeKeyEvent(NativeWebKeyboardEvent(arrowUpKeyDown)); | 
| 135   ProcessPendingMessages(); | 139   ProcessPendingMessages(); | 
| 136   output = GetMainFrame()->contentAsText(kMaxOutputCharacters); | 140   output = GetMainFrame()->contentAsText(kMaxOutputCharacters); | 
| 137   EXPECT_EQ(kArrowUpNoScroll, UTF16ToASCII(output)); | 141   EXPECT_EQ(kArrowUpNoScroll, UTF16ToASCII(output)); | 
| 138 } | 142 } | 
| 139 | 143 | 
| OLD | NEW | 
|---|