Commit 647be15c authored by darin's avatar darin

Reviewed by Geoff.

        - more preparation for splitting up Frame into sub-pieces
        - removed unnecessary includes from Frame.h

        * page/Frame.h: Removed unneeded includes and forward declarations.
        Added additional forward declarations. Removed the constant
        NoXPosForVerticalArrowNavigation, now moved inside SelectionController.
        Created sections of functions to be moved into Chrome, Editor,
        EventHandler, FrameLoader, SelectionController, and the Platform
        directory, as well as marking one function for deletion.

        * page/FramePrivate.h: Removed the definition of the constructor and
        destructor and removed unnecessary includes.

        * page/FrameView.h: Removed unneeded forward declarations and friend
        declarations. Created a section of functions and data to be moved into
        EventHandler.

        * bridge/mac/FrameMac.h: Removed unneeded forward declarations.
        Created sections of functions and data to be moved into Chrome,
        Editor, EventHandler, FrameLoader, and the Platform directory.

        * bridge/mac/WebCoreFrameBridge.h: Removed obsolete comment.
        Removed unused methods areScrollbarsVisible,
        nextValidKeyViewOutsideWebFrameViews, and fileWrapperForURL:.

        * page/Frame.cpp:
        (WebCore::Frame::begin): Added an overload, so Frame.h doesn't have
        to include KURL.h just for the KURL default constructor.
        (WebCore::FramePrivate::FramePrivate): Moved here from FramePrivate.h.
        (WebCore::FramePrivate::~FramePrivate): Ditto.

        * page/FrameView.cpp: Removed unused scrollbarMoved and scrollingSelf
        booleans, scrollbarMoved and cleared funcitons.
        (WebCore::FrameView::clear): Moved the code from the cleared
        function in here.
        (WebCore::FrameView::scrollTo): Removed code to set scrollingSelf.

        * bridge/mac/FrameMac.mm: (WebCore::FrameMac::FrameMac): Updated
        for changes to header.

        * editing/SelectionController.cpp:
        (WebCore::SelectionController::setSelection):
        (WebCore::SelectionController::xPosForVerticalArrowNavigation):
        Moved NoXPosForVerticalArrowNavigation into this file.

        * bindings/js/kjs_events.cpp:
        * bindings/js/kjs_html.cpp:
        * bindings/js/kjs_window.cpp:
        * bridge/mac/WebCoreAXObject.mm:
        * bridge/mac/WebCoreFrameBridge.mm:
        * css/cssstyleselector.cpp:
        * dom/Document.cpp:
        * dom/Element.cpp:
        * dom/EventTargetNode.cpp:
        * dom/MouseRelatedEvent.cpp:
        * dom/XMLTokenizer.cpp:
        * html/HTMLBaseElement.cpp:
        * html/HTMLDocument.cpp:
        * html/HTMLEmbedElement.cpp:
        * html/HTMLFrameElementBase.cpp:
        * html/HTMLGenericFormElement.cpp:
        * html/HTMLObjectElement.cpp:
        * html/HTMLTokenizer.cpp:
        * loader/mac/FrameLoaderMac.mm:
        * page/PageState.cpp:
        * rendering/RenderApplet.cpp:
        * rendering/RenderBlock.cpp:
        * rendering/RenderLayer.cpp:
        * rendering/RenderObject.cpp:
        * rendering/RenderPartObject.cpp:
        * rendering/RenderTreeAsText.cpp:
        * xml/XSLTProcessor.cpp:
        Added includes as needed to keep compiling, since there are fewer
        includes in Frame.h.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17604 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5ec33463
2006-11-05 Darin Adler <darin@apple.com>
Reviewed by Geoff.
- more preparation for splitting up Frame into sub-pieces
- removed unnecessary includes from Frame.h
* page/Frame.h: Removed unneeded includes and forward declarations.
Added additional forward declarations. Removed the constant
NoXPosForVerticalArrowNavigation, now moved inside SelectionController.
Created sections of functions to be moved into Chrome, Editor,
EventHandler, FrameLoader, SelectionController, and the Platform
directory, as well as marking one function for deletion.
* page/FramePrivate.h: Removed the definition of the constructor and
destructor and removed unnecessary includes.
* page/FrameView.h: Removed unneeded forward declarations and friend
declarations. Created a section of functions and data to be moved into
EventHandler.
* bridge/mac/FrameMac.h: Removed unneeded forward declarations.
Created sections of functions and data to be moved into Chrome,
Editor, EventHandler, FrameLoader, and the Platform directory.
* bridge/mac/WebCoreFrameBridge.h: Removed obsolete comment.
Removed unused methods areScrollbarsVisible,
nextValidKeyViewOutsideWebFrameViews, and fileWrapperForURL:.
* page/Frame.cpp:
(WebCore::Frame::begin): Added an overload, so Frame.h doesn't have
to include KURL.h just for the KURL default constructor.
(WebCore::FramePrivate::FramePrivate): Moved here from FramePrivate.h.
(WebCore::FramePrivate::~FramePrivate): Ditto.
* page/FrameView.cpp: Removed unused scrollbarMoved and scrollingSelf
booleans, scrollbarMoved and cleared funcitons.
(WebCore::FrameView::clear): Moved the code from the cleared
function in here.
(WebCore::FrameView::scrollTo): Removed code to set scrollingSelf.
* bridge/mac/FrameMac.mm: (WebCore::FrameMac::FrameMac): Updated
for changes to header.
* editing/SelectionController.cpp:
(WebCore::SelectionController::setSelection):
(WebCore::SelectionController::xPosForVerticalArrowNavigation):
Moved NoXPosForVerticalArrowNavigation into this file.
* bindings/js/kjs_events.cpp:
* bindings/js/kjs_html.cpp:
* bindings/js/kjs_window.cpp:
* bridge/mac/WebCoreAXObject.mm:
* bridge/mac/WebCoreFrameBridge.mm:
* css/cssstyleselector.cpp:
* dom/Document.cpp:
* dom/Element.cpp:
* dom/EventTargetNode.cpp:
* dom/MouseRelatedEvent.cpp:
* dom/XMLTokenizer.cpp:
* html/HTMLBaseElement.cpp:
* html/HTMLDocument.cpp:
* html/HTMLEmbedElement.cpp:
* html/HTMLFrameElementBase.cpp:
* html/HTMLGenericFormElement.cpp:
* html/HTMLObjectElement.cpp:
* html/HTMLTokenizer.cpp:
* loader/mac/FrameLoaderMac.mm:
* page/PageState.cpp:
* rendering/RenderApplet.cpp:
* rendering/RenderBlock.cpp:
* rendering/RenderLayer.cpp:
* rendering/RenderObject.cpp:
* rendering/RenderPartObject.cpp:
* rendering/RenderTreeAsText.cpp:
* xml/XSLTProcessor.cpp:
Added includes as needed to keep compiling, since there are fewer
includes in Frame.h.
2006-11-05 Alexey Proskuryakov <ap@nypop.com>
Reviewed by Dave Harrison.
......@@ -21,9 +21,9 @@
#include "config.h"
#include "kjs_events.h"
#include "CString.h"
#include "Clipboard.h"
#include "ClipboardEvent.h"
#include "CString.h"
#include "Document.h"
#include "Event.h"
#include "EventNames.h"
......@@ -36,6 +36,7 @@
#include "JSMutationEvent.h"
#include "JSOverflowEvent.h"
#include "JSWheelEvent.h"
#include "KURL.h"
#include "KeyboardEvent.h"
#include "MouseEvent.h"
#include "MutationEvent.h"
......
......@@ -25,6 +25,7 @@
#include "DocLoader.h"
#include "EventNames.h"
#include "Frame.h"
#include "FrameView.h"
#include "HTMLAppletElement.h"
#include "HTMLAreaElement.h"
#include "HTMLBRElement.h"
......
......@@ -34,6 +34,7 @@
#include "FrameLoadRequest.h"
#include "FrameLoader.h"
#include "FrameTree.h"
#include "FrameView.h"
#include "HTMLDocument.h"
#include "JSCSSRule.h"
#include "JSCSSValue.h"
......
......@@ -44,10 +44,8 @@ namespace KJS {
#ifdef __OBJC__
@class NSArray;
@class NSAttributedString;
@class NSDictionary;
@class NSEvent;
@class NSFileWrapper;
@class NSFont;
@class NSImage;
@class NSMenu;
......@@ -60,10 +58,8 @@ namespace KJS {
#else
class NSArray;
class NSAttributedString;
class NSDictionary;
class NSEvent;
class NSFileWrapper;
class NSFont;
class NSImage;
class NSMenu;
......@@ -90,56 +86,62 @@ enum SelectionDirection {
SelectingPrevious
};
class FrameMac : public Frame
{
class FrameMac : public Frame {
friend class Frame;
public:
FrameMac(Page*, Element*, PassRefPtr<EditorClient>);
~FrameMac();
// FIXME: Merge these and move them into FrameLoader.
virtual void urlSelected(const FrameLoadRequest&, Event*);
virtual Frame* createFrame(const KURL&, const String& name, Element* ownerElement, const String& referrer);
virtual void submitForm(const FrameLoadRequest&, Event*);
virtual Plugin* createPlugin(Element*, const KURL&,
const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType);
void setBridge(WebCoreFrameBridge*);
WebCoreFrameBridge* bridge() const { return _bridge; }
virtual void clear(bool clearWindowProperties = true);
private:
WebCoreFrameBridge* _bridge;
void setBridge(WebCoreFrameBridge* p);
WebCoreFrameBridge* bridge() const { return _bridge; }
// === undecided, may or may not belong here
public:
virtual void setView(FrameView*);
virtual void frameDetached();
static WebCoreFrameBridge* bridgeForWidget(const Widget*);
void advanceToNextMisspelling(bool startBeforeSelection = false);
NSString* searchForLabelsAboveCell(RegularExpression*, HTMLTableCellElement*);
NSString* searchForLabelsBeforeElement(NSArray* labels, Element*);
NSString* matchLabelsAgainstElement(NSArray* labels, Element*);
virtual KJS::Bindings::Instance* getEmbedInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getObjectInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getAppletInstanceForWidget(Widget*);
virtual KJS::Bindings::RootObject* bindingRootObject();
void addPluginRootObject(KJS::Bindings::RootObject*);
virtual void setTitle(const String&);
virtual void setStatusBarText(const String&);
KJS::Bindings::RootObject* executionContextForDOM();
WebScriptObject* windowScriptObject();
NPObject* windowScriptNPObject();
NSMutableDictionary* dashboardRegionsDictionary();
void dashboardRegionsChanged();
virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
virtual void redirectDataToPlugin(Widget* pluginWidget);
void willPopupMenu(NSMenu *);
virtual void scheduleClose();
private:
KJS::Bindings::RootObject* _bindingRoot; // The root object used for objects bound outside the context of a plugin.
Vector<KJS::Bindings::RootObject*> m_rootObjects;
WebScriptObject* _windowScriptObject;
NPObject* _windowScriptNPObject;
// === to be moved into Chrome
public:
virtual void setStatusBarText(const String&);
virtual void focusWindow();
virtual void unfocusWindow();
virtual void saveDocumentState();
virtual void restoreDocumentState();
virtual void addMessageToConsole(const String& message, unsigned int lineNumber, const String& sourceID);
NSView* nextKeyView(Node* startingPoint, SelectionDirection);
NSView* nextKeyViewInFrameHierarchy(Node* startingPoint, SelectionDirection);
static NSView* nextKeyViewForWidget(Widget* startingPoint, SelectionDirection);
static bool currentEventIsKeyboardOptionTab();
static bool handleKeyboardOptionTabInView(NSView* view);
virtual bool tabsToLinks() const;
virtual bool tabsToAllControls() const;
static bool currentEventIsMouseDownInWidget(Widget* candidate);
virtual void addMessageToConsole(const String& message, unsigned int lineNumber, const String& sourceID);
virtual void runJavaScriptAlert(const String&);
virtual bool runJavaScriptConfirm(const String&);
......@@ -151,20 +153,15 @@ public:
virtual bool statusbarVisible();
virtual bool toolbarVisible();
bool shouldClose();
virtual void createEmptyDocument();
static WebCoreFrameBridge* bridgeForWidget(const Widget*);
virtual String userAgent() const;
FloatRect customHighlightLineRect(const AtomicString& type, const FloatRect& lineRect);
void paintCustomHighlight(const AtomicString& type, const FloatRect& boxRect, const FloatRect& lineRect, bool text, bool line);
virtual String mimeTypeForFileName(const String&) const;
virtual void print();
NSImage* selectionImage(bool forceWhiteText = false) const;
NSImage* snapshotDragImage(Node* node, NSRect* imageRect, NSRect* elementRect) const;
// === to be moved into Editor
bool dispatchDragSrcEvent(const AtomicString &eventType, const PlatformMouseEvent&) const;
public:
void advanceToNextMisspelling(bool startBeforeSelection = false);
NSFont* fontForSelection(bool* hasMultipleFonts) const;
NSDictionary* fontAttributesForSelectionStart() const;
......@@ -174,23 +171,6 @@ public:
virtual void markMisspellingsInAdjacentWords(const VisiblePosition&);
virtual void markMisspellings(const Selection&);
void mouseDown(NSEvent*);
void mouseDragged(NSEvent*);
void mouseUp(NSEvent*);
void mouseMoved(NSEvent*);
bool keyEvent(NSEvent*);
bool wheelEvent(NSEvent*);
void sendFakeEventsAfterWidgetTracking(NSEvent* initiatingEvent);
virtual bool lastEventIsMouseUp() const;
void setActivationEventNumber(int num) { _activationEventNumber = num; }
bool dragHysteresisExceeded(float dragLocationX, float dragLocationY) const;
bool eventMayStartDrag(NSEvent*) const;
void dragSourceMovedTo(const PlatformMouseEvent&);
void dragSourceEndedAt(const PlatformMouseEvent&, NSDragOperation);
bool canDHTMLCut();
bool canDHTMLCopy();
bool canDHTMLPaste();
......@@ -198,35 +178,6 @@ public:
bool tryDHTMLCopy();
bool tryDHTMLPaste();
bool sendContextMenuEvent(NSEvent*);
bool passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults&);
bool passWidgetMouseDownEventToWidget(RenderWidget*);
bool passMouseDownEventToWidget(Widget*);
bool passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame* subframePart);
bool passWheelEventToWidget(Widget*);
NSString* searchForLabelsAboveCell(RegularExpression*, HTMLTableCellElement*);
NSString* searchForLabelsBeforeElement(NSArray* labels, Element* element);
NSString* matchLabelsAgainstElement(NSArray* labels, Element* element);
virtual void tokenizerProcessedData();
virtual String overrideMediaType() const;
WebCoreKeyboardUIMode keyboardUIMode() const;
void didTellBridgeAboutLoad(const String& URL);
bool haveToldBridgeAboutLoad(const String& URL);
virtual KJS::Bindings::Instance* getEmbedInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getObjectInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getAppletInstanceForWidget(Widget*);
virtual KJS::Bindings::RootObject* bindingRootObject();
virtual Widget* createJavaAppletWidget(const IntSize&, Element*, const HashMap<String, String>& args);
void addPluginRootObject(KJS::Bindings::RootObject* root);
virtual void registerCommandForUndo(PassRefPtr<EditCommand>);
virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
virtual void clearUndoRedoOperations();
......@@ -247,65 +198,87 @@ public:
virtual void didBeginEditing() const;
virtual void didEndEditing() const;
virtual void textFieldDidBeginEditing(Element*);
virtual void textFieldDidEndEditing(Element*);
virtual void textDidChangeInTextField(Element*);
virtual bool doTextFieldCommandFromEvent(Element*, const PlatformKeyboardEvent*);
virtual void textWillBeDeletedInTextField(Element*);
virtual void textDidChangeInTextArea(Element*);
virtual bool inputManagerHasMarkedText() const;
virtual void setSecureKeyboardEntry(bool);
virtual bool isSecureKeyboardEntry();
KJS::Bindings::RootObject* executionContextForDOM();
void setMarkedTextRange(const Range* , NSArray* attributes, NSArray* ranges);
virtual Range* markedTextRange() const { return m_markedTextRange.get(); }
private:
bool dispatchCPPEvent(const AtomicString &eventType, ClipboardAccessPolicy policy);
void freeClipboard();
void registerCommandForUndoOrRedo(PassRefPtr<EditCommand>, bool isRedo);
bool _haveUndoRedoOperations;
RefPtr<Range> m_markedTextRange;
WebScriptObject* windowScriptObject();
NPObject* windowScriptNPObject();
// === to be moved into EventHandler
public:
NSView* nextKeyView(Node* startingPoint, SelectionDirection);
NSView* nextKeyViewInFrameHierarchy(Node* startingPoint, SelectionDirection);
static NSView* nextKeyViewForWidget(Widget* startingPoint, SelectionDirection);
static bool currentEventIsKeyboardOptionTab();
static bool handleKeyboardOptionTabInView(NSView* view);
virtual void partClearedInBegin();
virtual bool tabsToLinks() const;
virtual bool tabsToAllControls() const;
// Implementation of CSS property -webkit-user-drag == auto
virtual bool shouldDragAutoNode(Node*, const IntPoint&) const;
static bool currentEventIsMouseDownInWidget(Widget* candidate);
void setMarkedTextRange(const Range* , NSArray* attributes, NSArray* ranges);
virtual Range* markedTextRange() const { return m_markedTextRange.get(); }
NSImage* selectionImage(bool forceWhiteText = false) const;
NSImage* snapshotDragImage(Node* node, NSRect* imageRect, NSRect* elementRect) const;
virtual void didFirstLayout();
NSMutableDictionary* dashboardRegionsDictionary();
void dashboardRegionsChanged();
bool dispatchDragSrcEvent(const AtomicString &eventType, const PlatformMouseEvent&) const;
void willPopupMenu(NSMenu *);
void mouseDown(NSEvent*);
void mouseDragged(NSEvent*);
void mouseUp(NSEvent*);
void mouseMoved(NSEvent*);
bool keyEvent(NSEvent*);
bool wheelEvent(NSEvent*);
void sendFakeEventsAfterWidgetTracking(NSEvent* initiatingEvent);
virtual bool lastEventIsMouseUp() const;
void setActivationEventNumber(int num) { _activationEventNumber = num; }
bool dragHysteresisExceeded(float dragLocationX, float dragLocationY) const;
bool eventMayStartDrag(NSEvent*) const;
void dragSourceMovedTo(const PlatformMouseEvent&);
void dragSourceEndedAt(const PlatformMouseEvent&, NSDragOperation);
bool sendContextMenuEvent(NSEvent*);
bool passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults&);
bool passWidgetMouseDownEventToWidget(RenderWidget*);
bool passMouseDownEventToWidget(Widget*);
bool passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame* subframePart);
bool passWheelEventToWidget(Widget*);
virtual bool isCharacterSmartReplaceExempt(UChar, bool);
WebCoreKeyboardUIMode keyboardUIMode() const;
virtual void textFieldDidBeginEditing(Element*);
virtual void textFieldDidEndEditing(Element*);
virtual void textDidChangeInTextField(Element*);
virtual bool doTextFieldCommandFromEvent(Element*, const PlatformKeyboardEvent*);
virtual void textWillBeDeletedInTextField(Element*);
virtual void textDidChangeInTextArea(Element*);
virtual bool mouseDownMayStartSelect() const { return _mouseDownMayStartSelect; }
virtual bool inputManagerHasMarkedText() const;
virtual void handledOnloadEvents();
// Implementation of CSS property -webkit-user-drag == auto
virtual bool shouldDragAutoNode(Node*, const IntPoint&) const;
virtual bool canRedo() const;
virtual bool canUndo() const;
virtual void print();
FloatRect customHighlightLineRect(const AtomicString& type, const FloatRect& lineRect);
void paintCustomHighlight(const AtomicString& type, const FloatRect& boxRect, const FloatRect& lineRect, bool text, bool line);
virtual bool mouseDownMayStartSelect() const { return _mouseDownMayStartSelect; }
NSEvent* currentEvent() { return _currentEvent; }
virtual KURL originalRequestURL() const;
virtual bool canGoBackOrForward(int distance) const;
virtual void goBackOrForward(int distance);
virtual int getHistoryLength();
virtual KURL historyURL(int distance);
protected:
virtual void startRedirectionTimer();
virtual void stopRedirectionTimer();
virtual void cleanupPluginObjects();
virtual bool isLoadTypeReload();
private:
virtual void handleMousePressEvent(const MouseEventWithHitTestResults&);
virtual void handleMouseMoveEvent(const MouseEventWithHitTestResults&);
......@@ -315,17 +288,9 @@ private:
NSView* nextKeyViewInFrame(Node* startingPoint, SelectionDirection, bool* focusCallResultedInViewBeingCreated = 0);
static NSView* documentViewForNode(Node*);
bool dispatchCPPEvent(const AtomicString &eventType, ClipboardAccessPolicy policy);
NSImage* imageFromRect(NSRect) const;
void freeClipboard();
void registerCommandForUndoOrRedo(PassRefPtr<EditCommand>, bool isRedo);
WebCoreFrameBridge* _bridge;
NSView* _mouseDownView;
bool _mouseDownWasInSubframe;
bool _sendingEventToSubview;
......@@ -338,19 +303,72 @@ private:
static NSEvent* _currentEvent;
bool _haveUndoRedoOperations;
// === to be moved into FrameLoader
public:
virtual void urlSelected(const FrameLoadRequest&, Event*);
virtual Frame* createFrame(const KURL&, const String& name, Element* ownerElement, const String& referrer);
virtual void submitForm(const FrameLoadRequest&, Event*);
virtual Plugin* createPlugin(Element*, const KURL&,
const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType);
virtual void clear(bool clearWindowProperties = true);
virtual void frameDetached();
virtual void setTitle(const String&);
virtual void scheduleClose();
virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
virtual void redirectDataToPlugin(Widget* pluginWidget);
virtual void saveDocumentState();
virtual void restoreDocumentState();
HashSet<String> urlsBridgeKnowsAbout;
bool shouldClose();
friend class Frame;
virtual void createEmptyDocument();
KJS::Bindings::RootObject* _bindingRoot; // The root object used for objects
// bound outside the context of a plugin.
Vector<KJS::Bindings::RootObject*> m_rootObjects;
WebScriptObject* _windowScriptObject;
NPObject* _windowScriptNPObject;
virtual String userAgent() const;
RefPtr<Range> m_markedTextRange;
virtual void tokenizerProcessedData();
virtual String overrideMediaType() const;
void didTellBridgeAboutLoad(const String& URL);
bool haveToldBridgeAboutLoad(const String& URL);
virtual Widget* createJavaAppletWidget(const IntSize&, Element*, const HashMap<String, String>& args);
virtual void partClearedInBegin();
virtual void didFirstLayout();
virtual void handledOnloadEvents();
virtual KURL originalRequestURL() const;
virtual bool canGoBackOrForward(int distance) const;
virtual void goBackOrForward(int distance);
virtual int getHistoryLength();
virtual KURL historyURL(int distance);
private:
virtual void startRedirectionTimer();
virtual void stopRedirectionTimer();
virtual void cleanupPluginObjects();
virtual bool isLoadTypeReload();
HashSet<String> urlsBridgeKnowsAbout;
// === to be moved into the Platform directory
public:
virtual String mimeTypeForFileName(const String&) const;
virtual bool isCharacterSmartReplaceExempt(UChar, bool);
};
inline FrameMac* Mac(Frame* frame) { return static_cast<FrameMac*>(frame); }
......
......@@ -37,6 +37,8 @@
#import "Cursor.h"
#import "DOMInternal.h"
#import "DocumentLoader.h"
#import "EditCommand.h"
#import "EditorClient.h"
#import "Event.h"
#import "EventNames.h"
#import "FloatRect.h"
......@@ -47,6 +49,7 @@
#import "FrameLoaderClient.h"
#import "FrameLoaderTypes.h"
#import "FramePrivate.h"
#import "FrameView.h"
#import "GraphicsContext.h"
#import "HTMLDocument.h"
#import "HTMLFormElement.h"
......@@ -83,6 +86,7 @@
#import "WebScriptObjectPrivate.h"
#import "csshelper.h"
#import "htmlediting.h"
#import "kjs_proxy.h"
#import "kjs_window.h"
#import "visible_units.h"
#import <Carbon/Carbon.h>
......@@ -160,13 +164,13 @@ static SEL selectorForKeyEvent(const PlatformKeyboardEvent* event)
FrameMac::FrameMac(Page* page, Element* ownerElement, PassRefPtr<EditorClient> client)
: Frame(page, ownerElement, client)
, _bridge(nil)
, _bindingRoot(0)
, _windowScriptObject(0)
, _windowScriptNPObject(0)
, _mouseDownView(nil)
, _sendingEventToSubview(false)
, _mouseDownMayStartSelect(false)
, _activationEventNumber(0)
, _bindingRoot(0)
, _windowScriptObject(0)
, _windowScriptNPObject(0)
{
if (!sharedDragInfo)
sharedDragInfo = new FrameMacDragInfo;
......
......@@ -31,16 +31,16 @@
#import "EventNames.h"
#import "FontData.h"
#import "FrameMac.h"
#import "FrameView.h"
#import "HTMLAreaElement.h"
#import "HTMLCollection.h"
#import "HTMLTextAreaElement.h"
#import "htmlediting.h"
#import "HTMLFrameElement.h"
#import "HTMLInputElement.h"
#import "HTMLLabelElement.h"
#import "HTMLMapElement.h"
#import "HTMLNames.h"
#import "HTMLSelectElement.h"
#import "HTMLTextAreaElement.h"
#import "HitTestRequest.h"
#import "HitTestResult.h"
#import "RenderImage.h"
......@@ -55,6 +55,7 @@
#import "WebCoreFrameBridge.h"
#import "WebCoreFrameView.h"
#import "WebCoreViewFactory.h"
#import "htmlediting.h"
#import "kjs_html.h"
#import "visible_units.h"
#include <mach-o/dyld.h>
......
......@@ -370,9 +370,6 @@ typedef enum {
// The WebCoreFrameBridge protocol contains methods for use by the WebCore side of the bridge.
// In NSArray objects for post data, NSData objects represent literal data, and NSString objects represent encoded files.
// The encoding is the standard form encoding for uploading files.