OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 BLINK_FROM_HERE, WTF::bind(&runServeAsyncRequestsTask, | 140 BLINK_FROM_HERE, WTF::bind(&runServeAsyncRequestsTask, |
141 WTF::unretained(testClientForFrame(frame)))); | 141 WTF::unretained(testClientForFrame(frame)))); |
142 testing::enterRunLoop(); | 142 testing::enterRunLoop(); |
143 } | 143 } |
144 | 144 |
145 WebMouseEvent createMouseEvent(WebInputEvent::Type type, | 145 WebMouseEvent createMouseEvent(WebInputEvent::Type type, |
146 WebMouseEvent::Button button, | 146 WebMouseEvent::Button button, |
147 const IntPoint& point, | 147 const IntPoint& point, |
148 int modifiers) { | 148 int modifiers) { |
149 WebMouseEvent result(type, modifiers, WebInputEvent::TimeStampForTesting); | 149 WebMouseEvent result(type, modifiers, WebInputEvent::TimeStampForTesting); |
150 result.x = result.globalX = point.x(); | 150 result.setPositionInWidget(point.x(), point.y()); |
151 result.y = result.globalX = point.y(); | 151 result.setPositionInScreen(point.x(), point.y()); |
152 result.button = button; | 152 result.button = button; |
153 result.clickCount = 1; | 153 result.clickCount = 1; |
154 return result; | 154 return result; |
155 } | 155 } |
156 | 156 |
157 WebLocalFrameImpl* createLocalChild(WebRemoteFrame* parent, | 157 WebLocalFrameImpl* createLocalChild(WebRemoteFrame* parent, |
158 const WebString& name, | 158 const WebString& name, |
159 WebFrameClient* client, | 159 WebFrameClient* client, |
160 WebWidgetClient* widgetClient, | 160 WebWidgetClient* widgetClient, |
161 WebFrame* previousSibling, | 161 WebFrame* previousSibling, |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 m_testWebViewClient->scheduleAnimation(); | 350 m_testWebViewClient->scheduleAnimation(); |
351 } | 351 } |
352 | 352 |
353 void TestWebViewWidgetClient::didMeaningfulLayout( | 353 void TestWebViewWidgetClient::didMeaningfulLayout( |
354 WebMeaningfulLayout layoutType) { | 354 WebMeaningfulLayout layoutType) { |
355 m_testWebViewClient->didMeaningfulLayout(layoutType); | 355 m_testWebViewClient->didMeaningfulLayout(layoutType); |
356 } | 356 } |
357 | 357 |
358 } // namespace FrameTestHelpers | 358 } // namespace FrameTestHelpers |
359 } // namespace blink | 359 } // namespace blink |
OLD | NEW |