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

Side by Side Diff: third_party/WebKit/Source/core/testing/Internals.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5: rebase-and-stuff Created 4 years, 10 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 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 return false; 394 return false;
395 return document->fetcher()->isPreloaded(document->completeURL(url)); 395 return document->fetcher()->isPreloaded(document->completeURL(url));
396 } 396 }
397 397
398 bool Internals::isLoadingFromMemoryCache(const String& url) 398 bool Internals::isLoadingFromMemoryCache(const String& url)
399 { 399 {
400 if (!contextDocument()) 400 if (!contextDocument())
401 return false; 401 return false;
402 const String cacheIdentifier = contextDocument()->fetcher()->getCacheIdentif ier(); 402 const String cacheIdentifier = contextDocument()->fetcher()->getCacheIdentif ier();
403 Resource* resource = memoryCache()->resourceForURL(contextDocument()->comple teURL(url), cacheIdentifier); 403 Resource* resource = memoryCache()->resourceForURL(contextDocument()->comple teURL(url), cacheIdentifier);
404 return resource && resource->status() == Resource::Cached; 404 return resource && resource->getStatus() == Resource::Cached;
405 } 405 }
406 406
407 bool Internals::isSharingStyle(Element* element1, Element* element2) const 407 bool Internals::isSharingStyle(Element* element1, Element* element2) const
408 { 408 {
409 ASSERT(element1 && element2); 409 ASSERT(element1 && element2);
410 return element1->computedStyle() == element2->computedStyle(); 410 return element1->computedStyle() == element2->computedStyle();
411 } 411 }
412 412
413 bool Internals::isValidContentSelect(Element* insertionPoint, ExceptionState& ex ceptionState) 413 bool Internals::isValidContentSelect(Element* insertionPoint, ExceptionState& ex ceptionState)
414 { 414 {
(...skipping 2145 matching lines...) Expand 10 before | Expand all | Expand 10 after
2560 } 2560 }
2561 2561
2562 int Internals::getScrollAnimationState(Node* node) const 2562 int Internals::getScrollAnimationState(Node* node) const
2563 { 2563 {
2564 if (ScrollableArea* scrollableArea = scrollableAreaForNode(node)) 2564 if (ScrollableArea* scrollableArea = scrollableAreaForNode(node))
2565 return static_cast<int>(scrollableArea->scrollAnimator().m_runState); 2565 return static_cast<int>(scrollableArea->scrollAnimator().m_runState);
2566 return -1; 2566 return -1;
2567 } 2567 }
2568 2568
2569 } // namespace blink 2569 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698