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

Side by Side Diff: Source/testing/runner/TestRunner.cpp

Issue 25505007: Remove bogus use of the term "user style" in Blink and Blink API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/platform/blink_platform.gypi ('k') | Source/web/AssertMatchingEnums.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Pawel Hajdan (phajdan.jr@chromium.org) 3 * Copyright (C) 2010 Pawel Hajdan (phajdan.jr@chromium.org)
4 * Copyright (C) 2012 Apple Inc. All Rights Reserved. 4 * Copyright (C) 2012 Apple Inc. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are 7 * modification, are permitted provided that the following conditions are
8 * met: 8 * met:
9 * 9 *
10 * * Redistributions of source code must retain the above copyright 10 * * Redistributions of source code must retain the above copyright
(...skipping 1271 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 { 1282 {
1283 result->setNull(); 1283 result->setNull();
1284 m_webView->setSelectionColors(0xffee0000, 0xff00ee00, 0xff000000, 0xffc0c0c0 ); 1284 m_webView->setSelectionColors(0xffee0000, 0xff00ee00, 0xff000000, 0xffc0c0c0 );
1285 } 1285 }
1286 1286
1287 void TestRunner::addUserStyleSheet(const CppArgumentList& arguments, CppVariant* result) 1287 void TestRunner::addUserStyleSheet(const CppArgumentList& arguments, CppVariant* result)
1288 { 1288 {
1289 result->setNull(); 1289 result->setNull();
1290 if (arguments.size() < 2 || !arguments[0].isString() || !arguments[1].isBool ()) 1290 if (arguments.size() < 2 || !arguments[0].isString() || !arguments[1].isBool ())
1291 return; 1291 return;
1292 WebView::addUserStyleSheet( 1292 WebView::injectStyleSheet(
1293 cppVariantToWebString(arguments[0]), WebVector<WebString>(), 1293 cppVariantToWebString(arguments[0]), WebVector<WebString>(),
1294 arguments[1].toBoolean() ? WebView::UserContentInjectInAllFrames : WebVi ew::UserContentInjectInTopFrameOnly, 1294 arguments[1].toBoolean() ? WebView::InjectStyleInAllFrames : WebView::In jectStyleInTopFrameOnly);
1295 // Chromium defaults to InjectInSubsequentDocuments, but for compatibili ty
1296 // with the other ports' DRTs, we use UserStyleInjectInExistingDocuments .
1297 WebView::UserStyleInjectInExistingDocuments);
1298 } 1295 }
1299 1296
1300 void TestRunner::startSpeechInput(const CppArgumentList& arguments, CppVariant* result) 1297 void TestRunner::startSpeechInput(const CppArgumentList& arguments, CppVariant* result)
1301 { 1298 {
1302 result->setNull(); 1299 result->setNull();
1303 if (arguments.size() != 1) 1300 if (arguments.size() != 1)
1304 return; 1301 return;
1305 1302
1306 WebElement element; 1303 WebElement element;
1307 if (!WebBindings::getElement(arguments[0].value.objectValue, &element)) 1304 if (!WebBindings::getElement(arguments[0].value.objectValue, &element))
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after
2149 result->setNull(); 2146 result->setNull();
2150 } 2147 }
2151 2148
2152 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, Cpp Variant* result) 2149 void TestRunner::setPointerLockWillFailSynchronously(const CppArgumentList&, Cpp Variant* result)
2153 { 2150 {
2154 m_pointerLockPlannedResult = PointerLockWillFailSync; 2151 m_pointerLockPlannedResult = PointerLockWillFailSync;
2155 result->setNull(); 2152 result->setNull();
2156 } 2153 }
2157 2154
2158 } 2155 }
OLDNEW
« no previous file with comments | « Source/platform/blink_platform.gypi ('k') | Source/web/AssertMatchingEnums.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698