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

Side by Side Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 1391073002: [Oilpan] Fix wrong usage off heap collections in WebDevToolsAgentImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make alias to simplify 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
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameWidgetImpl.h ('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) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 { 76 {
77 // Pass the WebFrameWidgetImpl's self-reference to the caller. 77 // Pass the WebFrameWidgetImpl's self-reference to the caller.
78 #if ENABLE(OILPAN) 78 #if ENABLE(OILPAN)
79 return new WebFrameWidgetImpl(client, localRoot); // SelfKeepAlive is set in constructor. 79 return new WebFrameWidgetImpl(client, localRoot); // SelfKeepAlive is set in constructor.
80 #else 80 #else
81 return adoptRef(new WebFrameWidgetImpl(client, localRoot)).leakRef(); 81 return adoptRef(new WebFrameWidgetImpl(client, localRoot)).leakRef();
82 #endif 82 #endif
83 } 83 }
84 84
85 // static 85 // static
86 HashSet<WebFrameWidgetImpl*>& WebFrameWidgetImpl::allInstances() 86 WebFrameWidgetsSet& WebFrameWidgetImpl::allInstances()
87 { 87 {
88 DEFINE_STATIC_LOCAL(HashSet<WebFrameWidgetImpl*>, allInstances, ()); 88 DEFINE_STATIC_LOCAL(WebFrameWidgetsSet, allInstances, ());
89 return allInstances; 89 return allInstances;
90 } 90 }
91 91
92 WebFrameWidgetImpl::WebFrameWidgetImpl(WebWidgetClient* client, WebLocalFrame* l ocalRoot) 92 WebFrameWidgetImpl::WebFrameWidgetImpl(WebWidgetClient* client, WebLocalFrame* l ocalRoot)
93 : m_client(client) 93 : m_client(client)
94 , m_localRoot(toWebLocalFrameImpl(localRoot)) 94 , m_localRoot(toWebLocalFrameImpl(localRoot))
95 , m_layerTreeView(nullptr) 95 , m_layerTreeView(nullptr)
96 , m_rootLayer(nullptr) 96 , m_rootLayer(nullptr)
97 , m_rootGraphicsLayer(nullptr) 97 , m_rootGraphicsLayer(nullptr)
98 , m_isAcceleratedCompositingActive(false) 98 , m_isAcceleratedCompositingActive(false)
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 1083
1084 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p osInRootFrame) 1084 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p osInRootFrame)
1085 { 1085 {
1086 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo tFrame)); 1086 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo tFrame));
1087 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); 1087 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active);
1088 result.setToShadowHostIfInUserAgentShadowRoot(); 1088 result.setToShadowHostIfInUserAgentShadowRoot();
1089 return result; 1089 return result;
1090 } 1090 }
1091 1091
1092 } // namespace blink 1092 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameWidgetImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698