Merge in WebKit r47029.

1 files changed, 161 insertions, 0 deletions

diff --git a/WebKit/mac/WebView/WebViewData.h b/WebKit/mac/WebView/WebViewData.h
new file mode 100644
index 0000000..91d83a7
--- /dev/null
+++ b/WebKit/mac/WebView/WebViewData.h
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "WebTypesInternal.h"
+#import "WebDelegateImplementationCaching.h"
+#import <WebCore/PlatformString.h>
+#import <WebCore/WebCoreKeyboardUIMode.h>
+#import <wtf/HashMap.h>
+#import <wtf/RetainPtr.h>
+
+namespace WebCore {
+    class Page;
+}
+
+@class WebInspector;
+@class WebNodeHighlight;
+@class WebPluginDatabase;
+@class WebPreferences;
+@class WebTextCompletionController;
+@protocol WebFormDelegate;
+
+extern BOOL applicationIsTerminating;
+extern int pluginDatabaseClientCount;
+
+// FIXME: This should be renamed to WebViewData.
+@interface WebViewPrivate : NSObject {
+@public
+    WebCore::Page* page;
+    
+    id UIDelegate;
+    id UIDelegateForwarder;
+    id resourceProgressDelegate;
+    id downloadDelegate;
+    id policyDelegate;
+    id policyDelegateForwarder;
+    id frameLoadDelegate;
+    id frameLoadDelegateForwarder;
+    id <WebFormDelegate> formDelegate;
+    id editingDelegate;
+    id editingDelegateForwarder;
+    id scriptDebugDelegate;
+
+    WebInspector *inspector;
+    WebNodeHighlight *currentNodeHighlight;
+
+    BOOL allowsUndo;
+        
+    float zoomMultiplier;
+
+    NSString *applicationNameForUserAgent;
+    WebCore::String userAgent;
+    BOOL userAgentOverridden;
+    
+    WebPreferences *preferences;
+    BOOL useSiteSpecificSpoofing;
+
+    NSWindow *hostWindow;
+
+    int programmaticFocusCount;
+    
+    WebResourceDelegateImplementationCache resourceLoadDelegateImplementations;
+    WebFrameLoadDelegateImplementationCache frameLoadDelegateImplementations;
+    WebScriptDebugDelegateImplementationCache scriptDebugDelegateImplementations;
+
+    void *observationInfo;
+    
+    BOOL closed;
+    BOOL shouldCloseWithWindow;
+    BOOL mainFrameDocumentReady;
+    BOOL drawsBackground;
+    BOOL editable;
+    BOOL tabKeyCyclesThroughElementsChanged;
+    BOOL becomingFirstResponder;
+    BOOL becomingFirstResponderFromOutside;
+    BOOL hoverFeedbackSuspended;
+    BOOL usesPageCache;
+    BOOL catchesDelegateExceptions;
+
+    NSColor *backgroundColor;
+
+    NSString *mediaStyle;
+    
+    BOOL hasSpellCheckerDocumentTag;
+    NSInteger spellCheckerDocumentTag;
+
+    BOOL smartInsertDeleteEnabled;
+    BOOL selectTrailingWhitespaceEnabled;
+        
+#if ENABLE(DASHBOARD_SUPPORT)
+    BOOL dashboardBehaviorAlwaysSendMouseEventsToAllWindows;
+    BOOL dashboardBehaviorAlwaysSendActiveNullEventsToPlugIns;
+    BOOL dashboardBehaviorAlwaysAcceptsFirstMouse;
+    BOOL dashboardBehaviorAllowWheelScrolling;
+#endif
+    
+    // WebKit has both a global plug-in database and a separate, per WebView plug-in database. Dashboard uses the per WebView database.
+    WebPluginDatabase *pluginDatabase;
+    
+    HashMap<unsigned long, RetainPtr<id> > identifierMap;
+
+    BOOL _keyboardUIModeAccessed;
+    WebCore::KeyboardUIMode _keyboardUIMode;
+
+    BOOL shouldUpdateWhileOffscreen;
+    
+    // When this flag is set, we will not make any subviews underneath this WebView.  This means no WebFrameViews and no WebHTMLViews.
+    BOOL usesDocumentViews;
+    
+#if USE(ACCELERATED_COMPOSITING)
+    // When this flag is set, next time a WebHTMLView draws, it needs to temporarily disable screen updates
+    // so that the NSView drawing is visually synchronized with CALayer updates.
+    BOOL needsOneShotDrawingSynchronization;
+    // Number of WebHTMLViews using accelerated compositing. Used to implement _isUsingAcceleratedCompositing.
+    int acceleratedFramesCount;
+    // Run loop observer used to implement the compositing equivalent of -viewWillDraw
+    CFRunLoopObserverRef layerSyncRunLoopObserver;
+#endif
+
+    NSPasteboard *insertionPasteboard;
+            
+    NSSize lastLayoutSize;
+
+    BOOL ignoringMouseDraggedEvents;
+
+    NSEvent *mouseDownEvent; // Kept after handling the event.
+    BOOL handlingMouseDownEvent;
+    NSEvent *keyDownEvent; // Kept after handling the event.
+
+    WebTextCompletionController *completionController;
+
+    NSTimer *autoscrollTimer;
+    NSEvent *autoscrollTriggerEvent;
+
+    CFRunLoopTimerRef updateMouseoverTimer;
+}
+@end