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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 1382593004: Allow out-of-process iframes to update the mouse cursor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Improved feng shui Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 2940 matching lines...) Expand 10 before | Expand all | Expand 10 after
2951 if (frame().document()) 2951 if (frame().document())
2952 return frame().document()->existingAXObjectCache(); 2952 return frame().document()->existingAXObjectCache();
2953 return nullptr; 2953 return nullptr;
2954 } 2954 }
2955 2955
2956 void FrameView::setCursor(const Cursor& cursor) 2956 void FrameView::setCursor(const Cursor& cursor)
2957 { 2957 {
2958 Page* page = frame().page(); 2958 Page* page = frame().page();
2959 if (!page || !page->settings().deviceSupportsMouse()) 2959 if (!page || !page->settings().deviceSupportsMouse())
2960 return; 2960 return;
2961 page->chromeClient().setCursor(cursor); 2961 page->chromeClient().setCursor(cursor, m_frame->localFrameRoot());
2962 } 2962 }
2963 2963
2964 void FrameView::frameRectsChanged() 2964 void FrameView::frameRectsChanged()
2965 { 2965 {
2966 TRACE_EVENT0("blink", "FrameView::frameRectsChanged"); 2966 TRACE_EVENT0("blink", "FrameView::frameRectsChanged");
2967 if (layoutSizeFixedToFrameSize()) 2967 if (layoutSizeFixedToFrameSize())
2968 setLayoutSizeInternal(frameRect().size()); 2968 setLayoutSizeInternal(frameRect().size());
2969 2969
2970 for (const auto& child : m_children) 2970 for (const auto& child : m_children)
2971 child->frameRectsChanged(); 2971 child->frameRectsChanged();
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
3944 3944
3945 if (!graphicsLayer) 3945 if (!graphicsLayer)
3946 return; 3946 return;
3947 3947
3948 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); 3948 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);
3949 3949
3950 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 3950 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
3951 } 3951 }
3952 3952
3953 } // namespace blink 3953 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698