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

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

Issue 1121433003: Fix mouse cursor update timer to be page-global instead of per-frame (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: bokan cr feedback Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | no next file » | 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) 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 1901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1912 } 1912 }
1913 1913
1914 String Internals::getCurrentCursorInfo(Document* document, ExceptionState& excep tionState) 1914 String Internals::getCurrentCursorInfo(Document* document, ExceptionState& excep tionState)
1915 { 1915 {
1916 ASSERT(document); 1916 ASSERT(document);
1917 if (!document->frame()) { 1917 if (!document->frame()) {
1918 exceptionState.throwDOMException(InvalidAccessError, "The document provi ded is invalid."); 1918 exceptionState.throwDOMException(InvalidAccessError, "The document provi ded is invalid.");
1919 return String(); 1919 return String();
1920 } 1920 }
1921 1921
1922 Cursor cursor = document->frame()->eventHandler().currentMouseCursor(); 1922 Cursor cursor = frame()->page()->chrome().getLastSetCursorForTesting();
1923 1923
1924 StringBuilder result; 1924 StringBuilder result;
1925 result.appendLiteral("type="); 1925 result.appendLiteral("type=");
1926 result.append(cursorTypeToString(cursor.type())); 1926 result.append(cursorTypeToString(cursor.type()));
1927 result.appendLiteral(" hotSpot="); 1927 result.appendLiteral(" hotSpot=");
1928 result.appendNumber(cursor.hotSpot().x()); 1928 result.appendNumber(cursor.hotSpot().x());
1929 result.append(','); 1929 result.append(',');
1930 result.appendNumber(cursor.hotSpot().y()); 1930 result.appendNumber(cursor.hotSpot().y());
1931 if (cursor.image()) { 1931 if (cursor.image()) {
1932 IntSize size = cursor.image()->size(); 1932 IntSize size = cursor.image()->size();
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
2366 2366
2367 ClientRectList* Internals::focusRingRects(Element* element) 2367 ClientRectList* Internals::focusRingRects(Element* element)
2368 { 2368 {
2369 Vector<LayoutRect> rects; 2369 Vector<LayoutRect> rects;
2370 if (element && element->layoutObject()) 2370 if (element && element->layoutObject())
2371 element->layoutObject()->addFocusRingRects(rects, LayoutPoint()); 2371 element->layoutObject()->addFocusRingRects(rects, LayoutPoint());
2372 return ClientRectList::create(rects); 2372 return ClientRectList::create(rects);
2373 } 2373 }
2374 2374
2375 } // namespace blink 2375 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698