Commit b35848ab authored by eric@webkit.org's avatar eric@webkit.org

2010-06-10 Eric Seidel <eric@webkit.org>

        Reviewed by Adam Barth.

        Reduce FrameView.h includes to speed up build times
        https://bugs.webkit.org/show_bug.cgi?id=40408

        Cleaned up FrameView.h includes and then propagated the
        cascade of includes to the necessary .cpp files.
        This should reduce the set of files rebuilt every
        time FrameView.h changes, and should also reduce the size
        of some .o files.

        No functional changes, thus no tests.

        * accessibility/AccessibilityRenderObject.cpp:
        * dom/ContainerNode.cpp:
        * dom/Document.cpp:
        * dom/Element.cpp:
        * dom/EventTarget.h:
        * dom/Node.cpp:
        * editing/EditorCommand.cpp:
        * editing/SelectionController.cpp:
        * html/HTML5Tokenizer.cpp:
        (WebCore::HTML5Tokenizer::script):
         - No need for this to be inline.  Being inline required
           Frame.h in the header, which causes huge include cascade.
        * html/HTML5Tokenizer.h:
        * page/DragController.cpp:
        * page/EventHandler.cpp:
        * page/Frame.h:
        * page/FrameView.h:
        * page/PrintContext.cpp:
        * page/SpatialNavigation.cpp:
        * rendering/RenderBlock.cpp:
        * rendering/RenderBlockLineLayout.cpp:
        * rendering/RenderImage.cpp:
        * rendering/RenderInline.cpp:
        * rendering/RenderObject.h:
        * rendering/RenderTextControlSingleLine.cpp:
        * rendering/RenderWidget.cpp:
        * rendering/SVGRenderSupport.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60943 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 74bec183
2010-06-10 Eric Seidel <eric@webkit.org>
Reviewed by Adam Barth.
Reduce FrameView.h includes to speed up build times
https://bugs.webkit.org/show_bug.cgi?id=40408
Cleaned up FrameView.h includes and then propagated the
cascade of includes to the necessary .cpp files.
This should reduce the set of files rebuilt every
time FrameView.h changes, and should also reduce the size
of some .o files.
No functional changes, thus no tests.
* accessibility/AccessibilityRenderObject.cpp:
* dom/ContainerNode.cpp:
* dom/Document.cpp:
* dom/Element.cpp:
* dom/EventTarget.h:
* dom/Node.cpp:
* editing/EditorCommand.cpp:
* editing/SelectionController.cpp:
* html/HTML5Tokenizer.cpp:
(WebCore::HTML5Tokenizer::script):
- No need for this to be inline. Being inline required
Frame.h in the header, which causes huge include cascade.
* html/HTML5Tokenizer.h:
* page/DragController.cpp:
* page/EventHandler.cpp:
* page/Frame.h:
* page/FrameView.h:
* page/PrintContext.cpp:
* page/SpatialNavigation.cpp:
* rendering/RenderBlock.cpp:
* rendering/RenderBlockLineLayout.cpp:
* rendering/RenderImage.cpp:
* rendering/RenderInline.cpp:
* rendering/RenderObject.h:
* rendering/RenderTextControlSingleLine.cpp:
* rendering/RenderWidget.cpp:
* rendering/SVGRenderSupport.cpp:
2010-06-10 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
......
......@@ -60,6 +60,7 @@
#include "RenderHTMLCanvas.h"
#include "RenderImage.h"
#include "RenderInline.h"
#include "RenderLayer.h"
#include "RenderListBox.h"
#include "RenderListMarker.h"
#include "RenderMenuList.h"
......
......@@ -36,6 +36,7 @@
#include "InspectorController.h"
#include "MutationEvent.h"
#include "Page.h"
#include "RenderBox.h"
#include "RenderTheme.h"
#include "RootInlineBox.h"
#include "loader.h"
......
......@@ -107,6 +107,7 @@
#include "ProgressEvent.h"
#include "RegisteredEventListener.h"
#include "RenderArena.h"
#include "RenderLayer.h"
#include "RenderTextControl.h"
#include "RenderView.h"
#include "RenderWidget.h"
......
......@@ -47,6 +47,7 @@
#include "NodeList.h"
#include "NodeRenderStyle.h"
#include "Page.h"
#include "RenderLayer.h"
#include "RenderView.h"
#include "RenderWidget.h"
#include "TextIterator.h"
......
......@@ -166,6 +166,8 @@ namespace WebCore {
void fireEventListeners(Event*, EventTargetData*, EventListenerVector&);
};
// FIXME: These macros should be split into separate DEFINE and DECLARE
// macros to avoid causing so many header includes.
#define DEFINE_ATTRIBUTE_EVENT_LISTENER(attribute) \
EventListener* on##attribute() { return getAttributeEventListener(eventNames().attribute##Event); } \
void setOn##attribute(PassRefPtr<EventListener> listener) { setAttributeEventListener(eventNames().attribute##Event, listener); } \
......
......@@ -66,7 +66,7 @@
#include "ProcessingInstruction.h"
#include "ProgressEvent.h"
#include "RegisteredEventListener.h"
#include "RenderObject.h"
#include "RenderBox.h"
#include "ScriptController.h"
#include "SelectorNodeList.h"
#include "StringBuilder.h"
......
......@@ -49,6 +49,7 @@
#include "InsertListCommand.h"
#include "KillRing.h"
#include "Page.h"
#include "RenderBox.h"
#include "ReplaceSelectionCommand.h"
#include "Scrollbar.h"
#include "Settings.h"
......
......@@ -44,6 +44,7 @@
#include "HitTestResult.h"
#include "Page.h"
#include "Range.h"
#include "RenderLayer.h"
#include "RenderTheme.h"
#include "RenderView.h"
#include "SecureTextInput.h"
......
......@@ -270,4 +270,9 @@ void HTML5Tokenizer::executeScriptsWaitingForStylesheets()
resumeParsingAfterScriptExecution();
}
ScriptController* HTML5Tokenizer::script() const
{
return m_document->frame() ? m_document->frame()->script() : 0;
}
}
......@@ -27,16 +27,15 @@
#define HTML5Tokenizer_h
#include "CachedResourceClient.h"
#include "Frame.h"
#include "HTML5ScriptRunnerHost.h"
#include "HTML5Token.h"
#include "HTMLDocument.h"
#include "SegmentedString.h"
#include "Tokenizer.h"
#include <wtf/OwnPtr.h>
namespace WebCore {
class HTMLDocument;
class HTML5Lexer;
class HTML5ScriptRunner;
class HTML5TreeBuilder;
......@@ -169,7 +168,7 @@ private:
void endIfDelayed();
bool inWrite() const { return m_writeNestingLevel > 0; }
ScriptController* script() const { return m_document->frame() ? m_document->frame()->script() : 0; }
ScriptController* script() const;
InputStream m_input;
......
......@@ -56,6 +56,7 @@
#include "PlatformKeyboardEvent.h"
#include "RenderFileUploadControl.h"
#include "RenderImage.h"
#include "RenderLayer.h"
#include "RenderView.h"
#include "ReplaceSelectionCommand.h"
#include "ResourceRequest.h"
......
......@@ -59,6 +59,7 @@
#include "PlatformWheelEvent.h"
#include "PluginDocument.h"
#include "RenderFrameSet.h"
#include "RenderLayer.h"
#include "RenderTextControlSingleLine.h"
#include "RenderView.h"
#include "RenderWidget.h"
......
......@@ -29,7 +29,6 @@
#define Frame_h
#include "AnimationController.h"
#include "CSSMutableStyleDeclaration.h"
#include "DragImage.h"
#include "Editor.h"
#include "EventHandler.h"
......
......@@ -25,10 +25,10 @@
#ifndef FrameView_h
#define FrameView_h
#include "Frame.h"
#include "Frame.h" // Only used by FrameView::inspectorTimelineAgent()
#include "IntSize.h"
#include "Page.h"
#include "RenderLayer.h"
#include "Page.h" // Only used by FrameView::inspectorTimelineAgent()
#include "RenderObject.h" // For PaintBehavior
#include "ScrollView.h"
#include <wtf/Forward.h>
#include <wtf/OwnPtr.h>
......@@ -37,7 +37,6 @@ namespace WebCore {
class Color;
class Event;
class Frame;
class FrameViewPrivate;
class InspectorTimelineAgent;
class IntRect;
......@@ -46,6 +45,7 @@ class PlatformMouseEvent;
class RenderLayer;
class RenderObject;
class RenderEmbeddedObject;
class RenderScrollbarPart;
class ScheduledEvent;
class String;
......
......@@ -24,6 +24,7 @@
#include "GraphicsContext.h"
#include "Frame.h"
#include "FrameView.h"
#include "RenderLayer.h"
#include "RenderView.h"
using namespace WebCore;
......
......@@ -35,6 +35,7 @@
#include "HTMLFrameOwnerElement.h"
#include "IntRect.h"
#include "Node.h"
#include "RenderLayer.h"
#include "Page.h"
namespace WebCore {
......
......@@ -36,6 +36,7 @@
#include "RenderFlexibleBox.h"
#include "RenderImage.h"
#include "RenderInline.h"
#include "RenderLayer.h"
#include "RenderMarquee.h"
#include "RenderReplica.h"
#include "RenderTableCell.h"
......
......@@ -29,6 +29,7 @@
#include "Logging.h"
#include "RenderArena.h"
#include "RenderInline.h"
#include "RenderLayer.h"
#include "RenderListMarker.h"
#include "RenderView.h"
#include "TrailingFloatsRootInlineBox.h"
......
......@@ -36,6 +36,7 @@
#include "HTMLNames.h"
#include "HitTestResult.h"
#include "Page.h"
#include "RenderLayer.h"
#include "RenderTheme.h"
#include "RenderView.h"
#include "SelectionController.h"
......
......@@ -30,6 +30,7 @@
#include "Page.h"
#include "RenderArena.h"
#include "RenderBlock.h"
#include "RenderLayer.h"
#include "RenderView.h"
#include "TransformState.h"
#include "VisiblePosition.h"
......
......@@ -66,6 +66,7 @@ class RenderSVGResourceContainer;
* three phases invoked on them during this phase.
*/
// FIXME: These enums should move to their own header since they're used by other headers.
enum PaintPhase {
PaintPhaseBlockBackground,
PaintPhaseChildBlockBackground,
......
......@@ -27,13 +27,14 @@
#include "EventNames.h"
#include "Frame.h"
#include "FrameView.h"
#include "HitTestResult.h"
#include "HTMLInputElement.h"
#include "HTMLNames.h"
#include "HitTestResult.h"
#include "InputElement.h"
#include "LocalizedStrings.h"
#include "MouseEvent.h"
#include "PlatformKeyboardEvent.h"
#include "RenderLayer.h"
#include "RenderScrollbar.h"
#include "RenderTheme.h"
#include "SearchPopupMenu.h"
......
......@@ -27,6 +27,7 @@
#include "AnimationController.h"
#include "GraphicsContext.h"
#include "HitTestResult.h"
#include "RenderLayer.h"
#include "RenderView.h"
#include "RenderWidgetProtector.h"
......
......@@ -32,6 +32,7 @@
#include "Document.h"
#include "ImageBuffer.h"
#include "NodeRenderStyle.h"
#include "RenderLayer.h"
#include "RenderObject.h"
#include "RenderSVGContainer.h"
#include "RenderSVGResource.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment