Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(319)

Side by Side Diff: Tools/DumpRenderTree/chromium/TestShell.cpp

Issue 14975008: test-shell is outside of the screen when running layout tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@menupopup
Patch Set: Rebased a test that prints window.screenLeft and window.screenX Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 void TestShell::resizeWindowForTest(WebViewHost* window, const WebURL& url) 258 void TestShell::resizeWindowForTest(WebViewHost* window, const WebURL& url)
259 { 259 {
260 int width, height; 260 int width, height;
261 if (isSVGTestURL(url)) { 261 if (isSVGTestURL(url)) {
262 width = SVGTestWindowWidth; 262 width = SVGTestWindowWidth;
263 height = SVGTestWindowHeight; 263 height = SVGTestWindowHeight;
264 } else { 264 } else {
265 width = testWindowWidth; 265 width = testWindowWidth;
266 height = testWindowHeight; 266 height = testWindowHeight;
267 } 267 }
268 window->setWindowRect(WebRect(0, 0, width + virtualWindowBorder * 2, height + virtualWindowBorder * 2)); 268 window->setWindowRect(WebRect(WebViewHost::screenUnavailableBorder, WebViewH ost::screenUnavailableBorder, width + virtualWindowBorder * 2, height + virtualW indowBorder * 2));
269 } 269 }
270 270
271 void TestShell::resetTestController() 271 void TestShell::resetTestController()
272 { 272 {
273 resetWebSettings(*webView()); 273 resetWebSettings(*webView());
274 m_testInterfaces->resetAll(); 274 m_testInterfaces->resetAll();
275 m_devToolsTestInterfaces->resetAll(); 275 m_devToolsTestInterfaces->resetAll();
276 m_webViewHost->reset(); 276 m_webViewHost->reset();
277 m_drtDevToolsAgent->reset(); 277 m_drtDevToolsAgent->reset();
278 if (m_drtDevToolsClient) 278 if (m_drtDevToolsClient)
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 for (size_t index = 0; index < entryCount; ++index) { 554 for (size_t index = 0; index < entryCount; ++index) {
555 WebHistoryItem historyItem = navigationController.entryAtIndex(index)->c ontentState(); 555 WebHistoryItem historyItem = navigationController.entryAtIndex(index)->c ontentState();
556 if (historyItem.isNull()) { 556 if (historyItem.isNull()) {
557 historyItem.initialize(); 557 historyItem.initialize();
558 historyItem.setURLString(navigationController.entryAtIndex(index)->U RL().spec().utf16()); 558 historyItem.setURLString(navigationController.entryAtIndex(index)->U RL().spec().utf16());
559 } 559 }
560 result[index] = historyItem; 560 result[index] = historyItem;
561 } 561 }
562 history->swap(result); 562 history->swap(result);
563 } 563 }
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/security/cross-frame-access-put-expected.txt ('k') | Tools/DumpRenderTree/chromium/WebViewHost.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698