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

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: nits addressed 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 2932 matching lines...) Expand 10 before | Expand all | Expand 10 after
2943 if (frame().document()) 2943 if (frame().document())
2944 return frame().document()->existingAXObjectCache(); 2944 return frame().document()->existingAXObjectCache();
2945 return nullptr; 2945 return nullptr;
2946 } 2946 }
2947 2947
2948 void FrameView::setCursor(const Cursor& cursor) 2948 void FrameView::setCursor(const Cursor& cursor)
2949 { 2949 {
2950 Page* page = frame().page(); 2950 Page* page = frame().page();
2951 if (!page || !page->settings().deviceSupportsMouse()) 2951 if (!page || !page->settings().deviceSupportsMouse())
2952 return; 2952 return;
2953 page->chromeClient().setCursor(cursor); 2953 page->chromeClient().setCursor(cursor, m_frame->localFrameRoot());
2954 } 2954 }
2955 2955
2956 void FrameView::frameRectsChanged() 2956 void FrameView::frameRectsChanged()
2957 { 2957 {
2958 TRACE_EVENT0("blink", "FrameView::frameRectsChanged"); 2958 TRACE_EVENT0("blink", "FrameView::frameRectsChanged");
2959 if (layoutSizeFixedToFrameSize()) 2959 if (layoutSizeFixedToFrameSize())
2960 setLayoutSizeInternal(frameRect().size()); 2960 setLayoutSizeInternal(frameRect().size());
2961 2961
2962 for (const auto& child : m_children) 2962 for (const auto& child : m_children)
2963 child->frameRectsChanged(); 2963 child->frameRectsChanged();
(...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after
3931 3931
3932 if (!graphicsLayer) 3932 if (!graphicsLayer)
3933 return; 3933 return;
3934 3934
3935 PaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentLayoutObjec t(), paintInvalidationContainer, viewRect); 3935 PaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentLayoutObjec t(), paintInvalidationContainer, viewRect);
3936 3936
3937 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 3937 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
3938 } 3938 }
3939 3939
3940 } // namespace blink 3940 } // namespace blink
OLDNEW
« no previous file with comments | « content/browser/site_per_process_browsertest.cc ('k') | third_party/WebKit/Source/core/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698