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

Side by Side Diff: third_party/WebKit/Source/core/frame/Frame.cpp

Issue 2316533004: Don't include headers from the layout API from other headers needlessly. (Closed)
Patch Set: The runway sure is slippery today. Created 4 years, 3 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 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 22 matching lines...) Expand all
33 #include "core/events/Event.h" 33 #include "core/events/Event.h"
34 #include "core/frame/FrameHost.h" 34 #include "core/frame/FrameHost.h"
35 #include "core/frame/LocalDOMWindow.h" 35 #include "core/frame/LocalDOMWindow.h"
36 #include "core/frame/Settings.h" 36 #include "core/frame/Settings.h"
37 #include "core/frame/UseCounter.h" 37 #include "core/frame/UseCounter.h"
38 #include "core/html/HTMLFrameElementBase.h" 38 #include "core/html/HTMLFrameElementBase.h"
39 #include "core/input/EventHandler.h" 39 #include "core/input/EventHandler.h"
40 #include "core/inspector/InspectorInstrumentation.h" 40 #include "core/inspector/InspectorInstrumentation.h"
41 #include "core/inspector/InstanceCounters.h" 41 #include "core/inspector/InstanceCounters.h"
42 #include "core/layout/LayoutPart.h" 42 #include "core/layout/LayoutPart.h"
43 #include "core/layout/api/LayoutPartItem.h"
43 #include "core/loader/EmptyClients.h" 44 #include "core/loader/EmptyClients.h"
44 #include "core/loader/FrameLoaderClient.h" 45 #include "core/loader/FrameLoaderClient.h"
45 #include "core/loader/NavigationScheduler.h" 46 #include "core/loader/NavigationScheduler.h"
46 #include "core/page/FocusController.h" 47 #include "core/page/FocusController.h"
47 #include "core/page/Page.h" 48 #include "core/page/Page.h"
48 #include "platform/Histogram.h" 49 #include "platform/Histogram.h"
49 #include "platform/UserGestureIndicator.h" 50 #include "platform/UserGestureIndicator.h"
50 51
51 namespace blink { 52 namespace blink {
52 53
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 return nullptr; 279 return nullptr;
279 // FIXME: If <object> is ever fixed to disassociate itself from frames 280 // FIXME: If <object> is ever fixed to disassociate itself from frames
280 // that it has started but canceled, then this can turn into an ASSERT 281 // that it has started but canceled, then this can turn into an ASSERT
281 // since ownerElement() would be 0 when the load is canceled. 282 // since ownerElement() would be 0 when the load is canceled.
282 // https://bugs.webkit.org/show_bug.cgi?id=18585 283 // https://bugs.webkit.org/show_bug.cgi?id=18585
283 if (!object->isLayoutPart()) 284 if (!object->isLayoutPart())
284 return nullptr; 285 return nullptr;
285 return toLayoutPart(object); 286 return toLayoutPart(object);
286 } 287 }
287 288
289 LayoutPartItem Frame::ownerLayoutItem() const
290 {
291 return LayoutPartItem(ownerLayoutObject());
292 }
293
288 Settings* Frame::settings() const 294 Settings* Frame::settings() const
289 { 295 {
290 if (m_host) 296 if (m_host)
291 return &m_host->settings(); 297 return &m_host->settings();
292 return nullptr; 298 return nullptr;
293 } 299 }
294 300
295 void Frame::didChangeVisibilityState() 301 void Frame::didChangeVisibilityState()
296 { 302 {
297 HeapVector<Member<Frame>> childFrames; 303 HeapVector<Member<Frame>> childFrames;
(...skipping 14 matching lines...) Expand all
312 318
313 ASSERT(page()); 319 ASSERT(page());
314 320
315 if (m_owner) 321 if (m_owner)
316 m_owner->setContentFrame(*this); 322 m_owner->setContentFrame(*this);
317 else 323 else
318 page()->setMainFrame(this); 324 page()->setMainFrame(this);
319 } 325 }
320 326
321 } // namespace blink 327 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Frame.h ('k') | third_party/WebKit/Source/core/frame/FrameView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698