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

Side by Side Diff: Source/core/history/CachedFrame.cpp

Issue 14323004: Make Frame's ScriptController an OwnPtr and remove the #include (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/ScriptElement.cpp ('k') | Source/core/html/HTMLCanvasElement.cpp » ('j') | 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) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple 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 24 matching lines...) Expand all
35 #include "FocusController.h" 35 #include "FocusController.h"
36 #include "Frame.h" 36 #include "Frame.h"
37 #include "FrameLoader.h" 37 #include "FrameLoader.h"
38 #include "FrameLoaderClient.h" 38 #include "FrameLoaderClient.h"
39 #include "FrameView.h" 39 #include "FrameView.h"
40 #include "HistoryItem.h" 40 #include "HistoryItem.h"
41 #include "Logging.h" 41 #include "Logging.h"
42 #include "Page.h" 42 #include "Page.h"
43 #include "PageCache.h" 43 #include "PageCache.h"
44 #include "PageTransitionEvent.h" 44 #include "PageTransitionEvent.h"
45 #include "ScriptController.h"
45 #include "SerializedScriptValue.h" 46 #include "SerializedScriptValue.h"
46 #include <wtf/text/CString.h> 47 #include <wtf/text/CString.h>
47 #include <wtf/RefCountedLeakCounter.h> 48 #include <wtf/RefCountedLeakCounter.h>
48 49
49 #if ENABLE(SVG) 50 #if ENABLE(SVG)
50 #include "SVGDocumentExtensions.h" 51 #include "SVGDocumentExtensions.h"
51 #endif 52 #endif
52 53
53 #if ENABLE(TOUCH_EVENTS) 54 #if ENABLE(TOUCH_EVENTS)
54 #include "Chrome.h" 55 #include "Chrome.h"
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 int CachedFrame::descendantFrameCount() const 272 int CachedFrame::descendantFrameCount() const
272 { 273 {
273 int count = m_childFrames.size(); 274 int count = m_childFrames.size();
274 for (size_t i = 0; i < m_childFrames.size(); ++i) 275 for (size_t i = 0; i < m_childFrames.size(); ++i)
275 count += m_childFrames[i]->descendantFrameCount(); 276 count += m_childFrames[i]->descendantFrameCount();
276 277
277 return count; 278 return count;
278 } 279 }
279 280
280 } // namespace WebCore 281 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/ScriptElement.cpp ('k') | Source/core/html/HTMLCanvasElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698