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

Side by Side Diff: third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp

Issue 1521583002: Oilpan: fix build after r364654. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no need for GarbageCollectedFinalized<> for SlotAssignment Created 5 years 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 * 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 * * Neither the name of Google Inc. nor the names of its 10 * * Neither the name of Google Inc. nor the names of its
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 } 326 }
327 if (ElementShadow* shadow = shadowWhereNodeCanBeDistributed(*shadowInser tionPoint)) 327 if (ElementShadow* shadow = shadowWhereNodeCanBeDistributed(*shadowInser tionPoint))
328 shadow->setNeedsDistributionRecalc(); 328 shadow->setNeedsDistributionRecalc();
329 } 329 }
330 InspectorInstrumentation::didPerformElementShadowDistribution(host()); 330 InspectorInstrumentation::didPerformElementShadowDistribution(host());
331 } 331 }
332 332
333 void ElementShadow::distributeV1() 333 void ElementShadow::distributeV1()
334 { 334 {
335 if (!m_slotAssignment) 335 if (!m_slotAssignment)
336 m_slotAssignment = adoptPtr(new SlotAssignment()); 336 m_slotAssignment = SlotAssignment::create();
337 m_slotAssignment->resolveAssignment(youngestShadowRoot()); 337 m_slotAssignment->resolveAssignment(youngestShadowRoot());
338 } 338 }
339 339
340 void ElementShadow::didDistributeNode(const Node* node, InsertionPoint* insertio nPoint) 340 void ElementShadow::didDistributeNode(const Node* node, InsertionPoint* insertio nPoint)
341 { 341 {
342 #if ENABLE(OILPAN) 342 #if ENABLE(OILPAN)
343 NodeToDestinationInsertionPoints::AddResult result = m_nodeToInsertionPoints .add(node, nullptr); 343 NodeToDestinationInsertionPoints::AddResult result = m_nodeToInsertionPoints .add(node, nullptr);
344 if (result.isNewEntry) 344 if (result.isNewEntry)
345 result.storedValue->value = adoptPtrWillBeNoop(new DestinationInsertionP oints()); 345 result.storedValue->value = adoptPtrWillBeNoop(new DestinationInsertionP oints());
346 result.storedValue->value->append(insertionPoint); 346 result.storedValue->value->append(insertionPoint);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 397
398 DEFINE_TRACE(ElementShadow) 398 DEFINE_TRACE(ElementShadow)
399 { 399 {
400 #if ENABLE(OILPAN) 400 #if ENABLE(OILPAN)
401 visitor->trace(m_nodeToInsertionPoints); 401 visitor->trace(m_nodeToInsertionPoints);
402 visitor->trace(m_selectFeatures); 402 visitor->trace(m_selectFeatures);
403 // Shadow roots are linked with previous and next pointers which are traced. 403 // Shadow roots are linked with previous and next pointers which are traced.
404 // It is therefore enough to trace one of the shadow roots here and the 404 // It is therefore enough to trace one of the shadow roots here and the
405 // rest will be traced from there. 405 // rest will be traced from there.
406 visitor->trace(m_shadowRoots.head()); 406 visitor->trace(m_shadowRoots.head());
407 visitor->trace(m_slotAssignment);
407 #endif 408 #endif
408 } 409 }
409 410
410 } // namespace 411 } // namespace
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/shadow/ElementShadow.h ('k') | third_party/WebKit/Source/core/dom/shadow/SlotAssignment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698