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

Side by Side Diff: third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp

Issue 2623273006: Fix crash in CSS.getLayoutTreeAndStyles (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | 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) 2010, Google Inc. All rights reserved. 2 * Copyright (C) 2010, 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 2351 matching lines...) Expand 10 before | Expand all | Expand 10 after
2362 visitLayoutTreeNodes(&elementShadow->youngestShadowRoot(), 2362 visitLayoutTreeNodes(&elementShadow->youngestShadowRoot(),
2363 layoutTreeNodes, cssPropertyWhitelist, 2363 layoutTreeNodes, cssPropertyWhitelist,
2364 styleToIndexMap, computedStyles); 2364 styleToIndexMap, computedStyles);
2365 } 2365 }
2366 } 2366 }
2367 2367
2368 // Pierce iframe boundaries. 2368 // Pierce iframe boundaries.
2369 if (node->isFrameOwnerElement()) { 2369 if (node->isFrameOwnerElement()) {
2370 Document* contentDocument = 2370 Document* contentDocument =
2371 toHTMLFrameOwnerElement(node)->contentDocument(); 2371 toHTMLFrameOwnerElement(node)->contentDocument();
2372 contentDocument->updateStyleAndLayoutTree(); 2372 if (contentDocument) {
2373 visitLayoutTreeNodes(contentDocument->documentElement(), layoutTreeNodes, 2373 contentDocument->updateStyleAndLayoutTree();
2374 cssPropertyWhitelist, styleToIndexMap, 2374 visitLayoutTreeNodes(contentDocument->documentElement(),
2375 computedStyles); 2375 layoutTreeNodes, cssPropertyWhitelist,
2376 styleToIndexMap, computedStyles);
2377 }
2376 } 2378 }
2377 2379
2378 LayoutObject* layoutObject = node->layoutObject(); 2380 LayoutObject* layoutObject = node->layoutObject();
2379 if (!layoutObject) 2381 if (!layoutObject)
2380 continue; 2382 continue;
2381 2383
2382 int nodeId = m_domAgent->boundNodeId(node); 2384 int nodeId = m_domAgent->boundNodeId(node);
2383 if (!nodeId) 2385 if (!nodeId)
2384 continue; 2386 continue;
2385 2387
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
2514 visitor->trace(m_cssStyleSheetToInspectorStyleSheet); 2516 visitor->trace(m_cssStyleSheetToInspectorStyleSheet);
2515 visitor->trace(m_documentToCSSStyleSheets); 2517 visitor->trace(m_documentToCSSStyleSheets);
2516 visitor->trace(m_invalidatedDocuments); 2518 visitor->trace(m_invalidatedDocuments);
2517 visitor->trace(m_nodeToInspectorStyleSheet); 2519 visitor->trace(m_nodeToInspectorStyleSheet);
2518 visitor->trace(m_inspectorUserAgentStyleSheet); 2520 visitor->trace(m_inspectorUserAgentStyleSheet);
2519 visitor->trace(m_tracker); 2521 visitor->trace(m_tracker);
2520 InspectorBaseAgent::trace(visitor); 2522 InspectorBaseAgent::trace(visitor);
2521 } 2523 }
2522 2524
2523 } // namespace blink 2525 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698