diff options
Diffstat (limited to 'Source/WebKit/chromium/public')
39 files changed, 216 insertions, 133 deletions
diff --git a/Source/WebKit/chromium/public/WebAccessibilityObject.h b/Source/WebKit/chromium/public/WebAccessibilityObject.h index 67a79e0..bdc3d09d 100644 --- a/Source/WebKit/chromium/public/WebAccessibilityObject.h +++ b/Source/WebKit/chromium/public/WebAccessibilityObject.h @@ -118,6 +118,7 @@ public: WEBKIT_API WebDocument document() const; WEBKIT_API bool hasComputedStyle() const; WEBKIT_API WebString computedStyleDisplay() const; + WEBKIT_API bool accessibilityIsIgnored() const; #if WEBKIT_IMPLEMENTATION WebAccessibilityObject(const WTF::PassRefPtr<WebCore::AccessibilityObject>&); diff --git a/Source/WebKit/chromium/public/WebAccessibilityRole.h b/Source/WebKit/chromium/public/WebAccessibilityRole.h index b0748a7..391b3e2 100644 --- a/Source/WebKit/chromium/public/WebAccessibilityRole.h +++ b/Source/WebKit/chromium/public/WebAccessibilityRole.h @@ -116,6 +116,11 @@ enum WebAccessibilityRole { WebAccessibilityRoleMenuListPopup, WebAccessibilityRoleMenuListOption, + WebAccessibilityRoleParagraph, + WebAccessibilityRoleLabel, + WebAccessibilityRoleDiv, + WebAccessibilityRoleForm, + WebAccessibilityRoleLandmarkApplication, WebAccessibilityRoleLandmarkBanner, WebAccessibilityRoleLandmarkComplementary, diff --git a/Source/WebKit/chromium/public/WebApplicationCacheHost.h b/Source/WebKit/chromium/public/WebApplicationCacheHost.h index acbc106..8539d82 100644 --- a/Source/WebKit/chromium/public/WebApplicationCacheHost.h +++ b/Source/WebKit/chromium/public/WebApplicationCacheHost.h @@ -38,6 +38,7 @@ namespace WebKit { class WebApplicationCacheHostClient; +class WebFrame; class WebURL; class WebURLRequest; class WebURLResponse; @@ -73,9 +74,11 @@ public: virtual ~WebApplicationCacheHost() { } // Called for every request made within the context. - virtual void willStartMainResourceRequest(WebURLRequest&) { } + virtual void willStartMainResourceRequest(WebURLRequest& r, const WebFrame*) { willStartMainResourceRequest(r); } virtual void willStartSubResourceRequest(WebURLRequest&) { } + virtual void willStartMainResourceRequest(WebURLRequest&) { } // DEPRECATED, remove after derived classes have caught up. + // One or the other selectCache methods is called after having parsed the <html> tag. // The latter returns false if the current document has been identified as a "foreign" // entry, in which case the frame navigation will be restarted by webkit. diff --git a/Source/WebKit/chromium/public/WebAudioDevice.h b/Source/WebKit/chromium/public/WebAudioDevice.h index a9f5a1c..00aea97 100644 --- a/Source/WebKit/chromium/public/WebAudioDevice.h +++ b/Source/WebKit/chromium/public/WebAudioDevice.h @@ -48,6 +48,7 @@ public: virtual void start() = 0; virtual void stop() = 0; + virtual double sampleRate() = 0; }; } // namespace WebKit diff --git a/Source/WebKit/chromium/public/WebBindings.h b/Source/WebKit/chromium/public/WebBindings.h index cb33781..149bff3 100644 --- a/Source/WebKit/chromium/public/WebBindings.h +++ b/Source/WebKit/chromium/public/WebBindings.h @@ -40,6 +40,7 @@ namespace WebKit { class WebDragData; class WebElement; +class WebNode; class WebRange; // A haphazard collection of functions for dealing with plugins. @@ -55,7 +56,7 @@ public: WEBKIT_API static NPObject* createObject(NPP, NPClass*); // NPN_Enumerate - WEBKIT_API static bool enumerate(NPP, NPObject*, NPIdentifier**, uint32_t* count); + WEBKIT_API static bool enumerate(NPP, NPObject*, NPIdentifier**, uint32_t* identifierCount); // NPN_Evaluate WEBKIT_API static bool evaluate(NPP, NPObject*, NPString* script, NPVariant* result); @@ -67,7 +68,7 @@ public: WEBKIT_API static NPIdentifier getIntIdentifier(int32_t number); // NPN_GetProperty - WEBKIT_API static bool getProperty(NPP, NPObject*, NPIdentifier propertyName, NPVariant *result); + WEBKIT_API static bool getProperty(NPP, NPObject*, NPIdentifier property, NPVariant *result); // NPN_GetStringIdentifier WEBKIT_API static NPIdentifier getStringIdentifier(const NPUTF8* string); @@ -76,10 +77,10 @@ public: WEBKIT_API static void getStringIdentifiers(const NPUTF8** names, int32_t nameCount, NPIdentifier*); // NPN_HasMethod - WEBKIT_API static bool hasMethod(NPP, NPObject*, NPIdentifier methodName); + WEBKIT_API static bool hasMethod(NPP, NPObject*, NPIdentifier method); // NPN_HasProperty - WEBKIT_API static bool hasProperty(NPP, NPObject*, NPIdentifier propertyName); + WEBKIT_API static bool hasProperty(NPP, NPObject*, NPIdentifier property); // NPN_IdentifierIsString WEBKIT_API static bool identifierIsString(NPIdentifier); @@ -91,10 +92,10 @@ public: WEBKIT_API static int32_t intFromIdentifier(NPIdentifier); // NPN_Invoke - WEBKIT_API static bool invoke(NPP, NPObject*, NPIdentifier methodName, const NPVariant* args, uint32_t count, NPVariant* result); + WEBKIT_API static bool invoke(NPP, NPObject*, NPIdentifier method, const NPVariant* args, uint32_t argCount, NPVariant* result); // NPN_InvokeDefault - WEBKIT_API static bool invokeDefault(NPP, NPObject*, const NPVariant* args, uint32_t count, NPVariant* result); + WEBKIT_API static bool invokeDefault(NPP, NPObject*, const NPVariant* args, uint32_t argCount, NPVariant* result); // NPN_ReleaseObject WEBKIT_API static void releaseObject(NPObject*); @@ -127,17 +128,6 @@ public: // undefined. If iString is false, the opposite is true. WEBKIT_API static void extractIdentifierData(const NPIdentifier&, const NPUTF8*& string, int32_t& number, bool& isString); - // Return true (success) if the given npobj is the current drag event in browser dispatch, - // and is accessible based on context execution frames and their security origins and - // WebKit clipboard access policy. If so, return the event id and the clipboard data (WebDragData). - // This only works with V8. If compiled without V8, it'll always return false. - WEBKIT_API static bool getDragData(NPObject* event, int* eventId, WebDragData*); - - // Invoke the event access policy checks listed above with GetDragData(). No need for clipboard - // data or event_id outputs, just confirm the given npobj is the current & accessible drag event. - // This only works with V8. If compiled without V8, it'll always return false. - WEBKIT_API static bool isDragEvent(NPObject* event); - // Return true (success) if the given npobj is a range object. // If so, return that range as a WebRange object. WEBKIT_API static bool getRange(NPObject* range, WebRange*); @@ -148,6 +138,7 @@ public: WEBKIT_API static NPObject* makeIntArray(const WebVector<int>&); WEBKIT_API static NPObject* makeStringArray(const WebVector<WebString>&); + WEBKIT_API static NPObject* makeNode(const WebNode&); // Exceptions ------------------------------------------------------------- diff --git a/Source/WebKit/chromium/public/WebClipboard.h b/Source/WebKit/chromium/public/WebClipboard.h index f9a06cf..1be255a 100644 --- a/Source/WebKit/chromium/public/WebClipboard.h +++ b/Source/WebKit/chromium/public/WebClipboard.h @@ -32,18 +32,20 @@ #define WebClipboard_h #include "WebCommon.h" -#include "WebImage.h" +#include "WebData.h" #include "WebString.h" #include "WebVector.h" namespace WebKit { class WebDragData; +class WebImage; class WebURL; class WebClipboard { public: enum Format { + FormatPlainText, FormatHTML, FormatBookmark, FormatSmartPaste @@ -62,7 +64,7 @@ public: virtual WebString readPlainText(Buffer) { return WebString(); } virtual WebString readHTML(Buffer, WebURL*) { return WebString(); } - virtual WebImage readImage(Buffer) { return WebImage(); } + virtual WebData readImage(Buffer) { return WebData(); } virtual void writePlainText(const WebString&) { } virtual void writeHTML( diff --git a/Source/WebKit/chromium/public/WebCommonWorkerClient.h b/Source/WebKit/chromium/public/WebCommonWorkerClient.h index b99d39d..9f11aa2 100644 --- a/Source/WebKit/chromium/public/WebCommonWorkerClient.h +++ b/Source/WebKit/chromium/public/WebCommonWorkerClient.h @@ -92,12 +92,6 @@ public: WEBKIT_ASSERT_NOT_REACHED(); } - // This will be removed once changes in chromium use the new method above. - virtual void openFileSystem(WebFileSystem::Type, long long size, WebFileSystemCallbacks*) - { - WEBKIT_ASSERT_NOT_REACHED(); - } - protected: ~WebCommonWorkerClient() { } }; diff --git a/Source/WebKit/chromium/public/WebConsoleMessage.h b/Source/WebKit/chromium/public/WebConsoleMessage.h index d7a0ead..3dcbc77 100644 --- a/Source/WebKit/chromium/public/WebConsoleMessage.h +++ b/Source/WebKit/chromium/public/WebConsoleMessage.h @@ -49,7 +49,7 @@ struct WebConsoleMessage { WebConsoleMessage() : level(LevelLog) { } WebConsoleMessage(Level level, const WebString& text) - : level(LevelLog) + : level(level) , text(text) { } }; diff --git a/Source/WebKit/chromium/public/WebDOMMouseEvent.h b/Source/WebKit/chromium/public/WebDOMMouseEvent.h index 4c38b56..c3de098 100644 --- a/Source/WebKit/chromium/public/WebDOMMouseEvent.h +++ b/Source/WebKit/chromium/public/WebDOMMouseEvent.h @@ -44,10 +44,10 @@ public: WEBKIT_API int screenY() const; WEBKIT_API int clientX() const; WEBKIT_API int clientY() const; - WEBKIT_API int layerX() const; - WEBKIT_API int layerY() const; - WEBKIT_API int offsetX() const; - WEBKIT_API int offsetY() const; + WEBKIT_API int layerX(); + WEBKIT_API int layerY(); + WEBKIT_API int offsetX(); + WEBKIT_API int offsetY(); WEBKIT_API int pageX() const; WEBKIT_API int pageY() const; WEBKIT_API int x() const; diff --git a/Source/WebKit/chromium/public/WebDevToolsAgent.h b/Source/WebKit/chromium/public/WebDevToolsAgent.h index d6a7bcd..03303f7 100644 --- a/Source/WebKit/chromium/public/WebDevToolsAgent.h +++ b/Source/WebKit/chromium/public/WebDevToolsAgent.h @@ -33,13 +33,6 @@ #include "WebCommon.h" -#if WEBKIT_USING_V8 -namespace v8 { -class Value; -template <class T> class Handle; -} -#endif - namespace WebKit { class WebDevToolsAgentClient; class WebDevToolsMessageTransport; @@ -65,9 +58,6 @@ public: virtual void dispatchOnInspectorBackend(const WebString& message) = 0; virtual void inspectElementAt(const WebPoint&) = 0; -#if WEBKIT_USING_V8 - virtual void inspectNode(v8::Handle<v8::Value>) = 0; -#endif virtual void setRuntimeProperty(const WebString& name, const WebString& value) = 0; // Exposed for LayoutTestController. @@ -98,13 +88,6 @@ public: // Installs dispatch handle that is going to be called periodically // while on a breakpoint. WEBKIT_API static void setMessageLoopDispatchHandler(MessageLoopDispatchHandler); - - virtual void identifierForInitialRequest(unsigned long resourceId, WebFrame*, const WebURLRequest&) = 0; - virtual void willSendRequest(unsigned long resourceId, WebURLRequest&) = 0; - virtual void didReceiveData(unsigned long resourceId, int length) = 0; - virtual void didReceiveResponse(unsigned long resourceId, const WebURLResponse&) = 0; - virtual void didFinishLoading(unsigned long resourceId) = 0; - virtual void didFailLoading(unsigned long resourceId, const WebURLError&) = 0; }; } // namespace WebKit diff --git a/Source/WebKit/chromium/public/WebDevToolsAgentClient.h b/Source/WebKit/chromium/public/WebDevToolsAgentClient.h index b373b60..3ec5487 100644 --- a/Source/WebKit/chromium/public/WebDevToolsAgentClient.h +++ b/Source/WebKit/chromium/public/WebDevToolsAgentClient.h @@ -42,7 +42,6 @@ class WebDevToolsAgentClient { public: virtual void sendMessageToInspectorFrontend(const WebString&) { } virtual void sendDebuggerOutput(const WebString&) { } - virtual void sendDispatchToAPU(const WebString&) { } // Returns the identifier of the entity hosting this agent. virtual int hostIdentifier() { return -1; } @@ -50,8 +49,6 @@ public: // Notifies host upon runtime feature being enabled/disabled. virtual void runtimePropertyChanged(const WebString& name, const WebString& value) { } - virtual WebCString debuggerScriptSource() { return WebCString(); } - class WebKitClientMessageLoop { public: virtual ~WebKitClientMessageLoop() { } diff --git a/Source/WebKit/chromium/public/WebDocument.h b/Source/WebKit/chromium/public/WebDocument.h index d9f7386..23f28c3 100644 --- a/Source/WebKit/chromium/public/WebDocument.h +++ b/Source/WebKit/chromium/public/WebDocument.h @@ -42,6 +42,7 @@ namespace WTF { template <typename T> class PassRefPtr; } #endif namespace WebKit { +class WebAccessibilityObject; class WebDocumentType; class WebElement; class WebFrame; @@ -79,6 +80,7 @@ public: WEBKIT_API WebElement getElementById(const WebString&) const; WEBKIT_API WebNode focusedNode() const; WEBKIT_API WebDocumentType doctype() const; + WEBKIT_API WebAccessibilityObject accessibilityObject() const; #if WEBKIT_IMPLEMENTATION WebDocument(const WTF::PassRefPtr<WebCore::Document>&); diff --git a/Source/WebKit/chromium/public/WebElement.h b/Source/WebKit/chromium/public/WebElement.h index 8d51e98..2072dd3 100644 --- a/Source/WebKit/chromium/public/WebElement.h +++ b/Source/WebKit/chromium/public/WebElement.h @@ -58,6 +58,7 @@ class WebNamedNodeMap; WEBKIT_API bool setAttribute(const WebString& name, const WebString& value); WEBKIT_API WebNamedNodeMap attributes() const; WEBKIT_API WebString innerText() const; + WEBKIT_API WebNode shadowRoot(); // Returns the language code specified for this element. This attribute // is inherited, so the returned value is drawn from the closest parent diff --git a/Source/WebKit/chromium/public/WebFileInfo.h b/Source/WebKit/chromium/public/WebFileInfo.h index be0b3e4..d326e06 100644 --- a/Source/WebKit/chromium/public/WebFileInfo.h +++ b/Source/WebKit/chromium/public/WebFileInfo.h @@ -31,6 +31,8 @@ #ifndef WebFileInfo_h #define WebFileInfo_h +#include "WebString.h" + namespace WebKit { struct WebFileInfo { @@ -50,6 +52,8 @@ struct WebFileInfo { Type type; + WebString platformPath; + WebFileInfo() : modificationTime(0.0), length(-1), type(TypeUnknown) { } }; diff --git a/Source/WebKit/chromium/public/WebFormControlElement.h b/Source/WebKit/chromium/public/WebFormControlElement.h index e70b995..53ef850 100644 --- a/Source/WebKit/chromium/public/WebFormControlElement.h +++ b/Source/WebKit/chromium/public/WebFormControlElement.h @@ -54,6 +54,7 @@ public: void assign(const WebFormControlElement& e) { WebElement::assign(e); } WEBKIT_API bool isEnabled() const; + WEBKIT_API bool isReadOnly() const; WEBKIT_API WebString formControlName() const; WEBKIT_API WebString formControlType() const; diff --git a/Source/WebKit/chromium/public/WebFrame.h b/Source/WebKit/chromium/public/WebFrame.h index f3f5ba6..d5d2ff4 100644 --- a/Source/WebKit/chromium/public/WebFrame.h +++ b/Source/WebKit/chromium/public/WebFrame.h @@ -70,11 +70,9 @@ struct WebFindOptions; struct WebRect; struct WebScriptSource; struct WebSize; +struct WebURLLoaderOptions; template <typename T> class WebVector; -// FIXME(jam): take this out once Chromium has this -#define WEBFRAME_PRINTBEGIN_TAKES_NODE - class WebFrame { public: // Returns the number of live WebFrame objects, used for leak checking. @@ -345,10 +343,13 @@ public: // DEPRECATED: Please use createAssociatedURLLoader instead. virtual void dispatchWillSendRequest(WebURLRequest&) = 0; + // FIXME: Remove this overload when clients have been changed to pass options. + virtual WebURLLoader* createAssociatedURLLoader() = 0; + // Returns a WebURLLoader that is associated with this frame. The loader // will, for example, be cancelled when WebFrame::stopLoading is called. // FIXME: stopLoading does not yet cancel an associated loader!! - virtual WebURLLoader* createAssociatedURLLoader() = 0; + virtual WebURLLoader* createAssociatedURLLoader(const WebURLLoaderOptions&) = 0; // Called from within WebFrameClient::didReceiveDocumentData to commit // data for the frame that will be used to construct the frame's @@ -365,10 +366,6 @@ public: // with a suppressed opener. virtual bool willSuppressOpenerInNewFrame() const = 0; - // Returns true if this frame is in the midst of executing a beforeunload - // or unload event handler. - virtual bool pageDismissalEventBeingDispatched() const = 0; - // Editing ------------------------------------------------------------- @@ -549,7 +546,7 @@ public: // Returns a text representation of the render tree. This method is used // to support layout tests. - virtual WebString renderTreeAsText() const = 0; + virtual WebString renderTreeAsText(bool showDebugInfo = false) const = 0; // Returns the counter value for the specified element. This method is // used to support layout tests. @@ -582,7 +579,7 @@ public: // Dumps the layer tree, used by the accelerated compositor, in // text form. This is used only by layout tests. - virtual WebString layerTreeAsText() const = 0; + virtual WebString layerTreeAsText(bool showDebugInfo = false) const = 0; protected: ~WebFrame() { } diff --git a/Source/WebKit/chromium/public/WebGeolocationClientMock.h b/Source/WebKit/chromium/public/WebGeolocationClientMock.h index 08a85e2..9a39e2e 100644 --- a/Source/WebKit/chromium/public/WebGeolocationClientMock.h +++ b/Source/WebKit/chromium/public/WebGeolocationClientMock.h @@ -51,6 +51,7 @@ public: WEBKIT_API void setPosition(double latitude, double longitude, double accuracy); WEBKIT_API void setError(int errorCode, const WebString& message); WEBKIT_API void setPermission(bool); + WEBKIT_API int numberOfPendingPermissionRequests() const; WEBKIT_API void resetMock(); virtual void startUpdating(); diff --git a/Source/WebKit/chromium/public/WebIDBCallbacks.h b/Source/WebKit/chromium/public/WebIDBCallbacks.h index 1eb6d3a..ec7c095 100644 --- a/Source/WebKit/chromium/public/WebIDBCallbacks.h +++ b/Source/WebKit/chromium/public/WebIDBCallbacks.h @@ -49,8 +49,8 @@ public: virtual void onSuccess(WebIDBCursor*) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void onSuccess(WebIDBDatabase*) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void onSuccess(const WebIDBKey&) { WEBKIT_ASSERT_NOT_REACHED(); } + // FIXME: remove after Webkit roll. virtual void onSuccess(WebIDBIndex*) { WEBKIT_ASSERT_NOT_REACHED(); } - virtual void onSuccess(WebIDBObjectStore*) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void onSuccess(WebIDBTransaction*) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void onSuccess(const WebSerializedScriptValue&) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void onBlocked() { WEBKIT_ASSERT_NOT_REACHED(); } diff --git a/Source/WebKit/chromium/public/WebIDBFactory.h b/Source/WebKit/chromium/public/WebIDBFactory.h index 977510f..29414e8 100755 --- a/Source/WebKit/chromium/public/WebIDBFactory.h +++ b/Source/WebKit/chromium/public/WebIDBFactory.h @@ -51,8 +51,18 @@ public: virtual ~WebIDBFactory() { } + enum BackingStoreType { + DefaultBackingStore, + LevelDBBackingStore + }; + // The WebKit implementation of open ignores the WebFrame* parameter. - virtual void open(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir, unsigned long long maximumSize) { WEBKIT_ASSERT_NOT_REACHED(); } + // FIXME: Assert not reached when Chromium side is updated. + virtual void open(const WebString& name, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir, unsigned long long maximumSize, BackingStoreType) { open(name, callbacks, origin, frame, dataDir, maximumSize); } + + // FIXME: Remove this when Chromium side is updated. + virtual void open(const WebString& name, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir, unsigned long long maximumSize) { open(name, callbacks, origin, frame, dataDir, maximumSize, DefaultBackingStore); } + virtual void deleteDatabase(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); } }; diff --git a/Source/WebKit/chromium/public/WebInputElement.h b/Source/WebKit/chromium/public/WebInputElement.h index 1f0836b..3ae6578 100644 --- a/Source/WebKit/chromium/public/WebInputElement.h +++ b/Source/WebKit/chromium/public/WebInputElement.h @@ -60,8 +60,6 @@ namespace WebKit { WEBKIT_API bool isPasswordField() const; WEBKIT_API bool isImageButton() const; WEBKIT_API bool autoComplete() const; - WEBKIT_API bool isReadOnly() const; - WEBKIT_API bool isEnabledFormControl() const; WEBKIT_API int maxLength() const; WEBKIT_API bool isActivatedSubmit() const; WEBKIT_API void setActivatedSubmit(bool); diff --git a/Source/WebKit/chromium/public/WebKitClient.h b/Source/WebKit/chromium/public/WebKitClient.h index 208ecdd..eb99531 100644 --- a/Source/WebKit/chromium/public/WebKitClient.h +++ b/Source/WebKit/chromium/public/WebKitClient.h @@ -286,6 +286,7 @@ public: // Audio -------------------------------------------------------------- + virtual double audioHardwareSampleRate() { return 0; } virtual WebAudioDevice* createAudioDevice(size_t bufferSize, unsigned numberOfChannels, double sampleRate, WebAudioDevice::RenderCallback*) { return 0; } // FileSystem ---------------------------------------------------------- diff --git a/Source/WebKit/chromium/public/WebMediaPlayerClient.h b/Source/WebKit/chromium/public/WebMediaPlayerClient.h index 7e5dd68..5f60870 100644 --- a/Source/WebKit/chromium/public/WebMediaPlayerClient.h +++ b/Source/WebKit/chromium/public/WebMediaPlayerClient.h @@ -49,6 +49,7 @@ public: virtual void sizeChanged() = 0; virtual void sawUnsupportedTracks() = 0; virtual float volume() const = 0; + virtual void playbackStateChanged() = 0; protected: ~WebMediaPlayerClient() { } diff --git a/Source/WebKit/chromium/public/WebMenuItemInfo.h b/Source/WebKit/chromium/public/WebMenuItemInfo.h index f6e622a..742b4ef 100644 --- a/Source/WebKit/chromium/public/WebMenuItemInfo.h +++ b/Source/WebKit/chromium/public/WebMenuItemInfo.h @@ -49,6 +49,8 @@ struct WebMenuItemInfo { WebMenuItemInfo() : type(Option) , action(0) + , textDirection(WebTextDirectionDefault) + , hasTextDirectionOverride(false) , enabled(false) , checked(false) { diff --git a/Source/WebKit/chromium/public/WebNode.h b/Source/WebKit/chromium/public/WebNode.h index 7116dfa..92b17d4 100644 --- a/Source/WebKit/chromium/public/WebNode.h +++ b/Source/WebKit/chromium/public/WebNode.h @@ -96,6 +96,7 @@ public: WEBKIT_API WebNodeList childNodes(); WEBKIT_API WebString createMarkup() const; WEBKIT_API bool isTextNode() const; + WEBKIT_API bool isFocusable() const; WEBKIT_API bool isContentEditable() const; WEBKIT_API bool isElementNode() const; WEBKIT_API void addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture); diff --git a/Source/WebKit/chromium/public/WebPageSerializer.h b/Source/WebKit/chromium/public/WebPageSerializer.h index 94f7994..b4d5715 100644 --- a/Source/WebKit/chromium/public/WebPageSerializer.h +++ b/Source/WebKit/chromium/public/WebPageSerializer.h @@ -34,10 +34,12 @@ #include "WebCommon.h" namespace WebKit { +class WebCString; class WebFrame; class WebPageSerializerClient; class WebString; class WebURL; +class WebView; template <typename T> class WebVector; // Get html data by serializing all frames of current page with lists @@ -69,6 +71,14 @@ public: const WebVector<WebString>& localPaths, const WebString& localDirectoryName); + // Retrieve all the resource for the passed view, including the main frame + // and sub-frames. Returns true if all resources were retrieved + // successfully. + WEBKIT_API static bool retrieveAllResources(WebView*, + const WebVector<WebCString>& supportedSchemes, + WebVector<WebURL>* resources, + WebVector<WebURL>* frames); + // FIXME: The following are here for unit testing purposes. Consider // changing the unit tests instead. @@ -80,6 +90,6 @@ public: WEBKIT_API static WebString generateBaseTagDeclaration(const WebString& baseTarget); }; -} // namespace WebKit +} // namespace WebKit #endif diff --git a/Source/WebKit/chromium/public/WebPlugin.h b/Source/WebKit/chromium/public/WebPlugin.h index 4a6f081..17e29e2 100644 --- a/Source/WebKit/chromium/public/WebPlugin.h +++ b/Source/WebKit/chromium/public/WebPlugin.h @@ -64,10 +64,6 @@ public: virtual void updateGeometry( const WebRect& frameRect, const WebRect& clipRect, const WebVector<WebRect>& cutOutsRects, bool isVisible) = 0; - - // If the plugin instance is backed by an OpenGL texture, return its ID in the - // compositors namespace. Otherwise return 0. Returns 0 by default. - virtual unsigned getBackingTextureId() { return 0; } virtual void updateFocus(bool) = 0; virtual void updateVisibility(bool) = 0; diff --git a/Source/WebKit/chromium/public/WebPluginContainer.h b/Source/WebKit/chromium/public/WebPluginContainer.h index c580f81..026028b 100644 --- a/Source/WebKit/chromium/public/WebPluginContainer.h +++ b/Source/WebKit/chromium/public/WebPluginContainer.h @@ -55,6 +55,10 @@ public: // WebPlugin::updateGeometry. virtual void reportGeometry() = 0; + // Sets the id of the texture used for hw-accel compositing. + // The default value for id is zero which indicates software rendering. + // A non-zero value will trigger hw-accelerated compositing. + virtual void setBackingTextureId(unsigned) = 0; // Called when the backing texture is ready to be composited. virtual void commitBackingTexture() {} diff --git a/Source/WebKit/chromium/public/WebRuntimeFeatures.h b/Source/WebKit/chromium/public/WebRuntimeFeatures.h index c9e32f5..dfaae5e 100644 --- a/Source/WebKit/chromium/public/WebRuntimeFeatures.h +++ b/Source/WebKit/chromium/public/WebRuntimeFeatures.h @@ -63,6 +63,9 @@ public: WEBKIT_API static void enableApplicationCache(bool); WEBKIT_API static bool isApplicationCacheEnabled(); + + WEBKIT_API static void enableDataTransferItems(bool); + WEBKIT_API static bool isDataTransferItemsEnabled(); WEBKIT_API static void enableGeolocation(bool); WEBKIT_API static bool isGeolocationEnabled(); @@ -73,9 +76,6 @@ public: WEBKIT_API static void enableWebAudio(bool); WEBKIT_API static bool isWebAudioEnabled(); - WEBKIT_API static void enableWebGL(bool); - WEBKIT_API static bool isWebGLEnabled(); - WEBKIT_API static void enablePushState(bool); WEBKIT_API static bool isPushStateEnabled(bool); diff --git a/Source/WebKit/chromium/public/WebSettings.h b/Source/WebKit/chromium/public/WebSettings.h index 11ed49d..113de52 100644 --- a/Source/WebKit/chromium/public/WebSettings.h +++ b/Source/WebKit/chromium/public/WebSettings.h @@ -101,6 +101,7 @@ public: virtual bool showPlatformLayerTree() const = 0; virtual void setEditingBehavior(EditingBehavior) = 0; virtual void setAcceleratedCompositingEnabled(bool) = 0; + virtual void setForceCompositingMode(bool) = 0; virtual void setCompositeToTextureEnabled(bool) = 0; virtual bool compositeToTextureEnabled() const = 0; virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool) = 0; diff --git a/Source/WebKit/chromium/public/WebSpellCheckClient.h b/Source/WebKit/chromium/public/WebSpellCheckClient.h new file mode 100755 index 0000000..87bdf9e --- /dev/null +++ b/Source/WebKit/chromium/public/WebSpellCheckClient.h @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2010 Google 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: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT + * OWNER OR 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. + */ + +#ifndef WebSpellCheckClient_h +#define WebSpellCheckClient_h + +#include "WebString.h" + +namespace WebKit { + +class WebString; +class WebTextCheckingCompletion; + +class WebSpellCheckClient { +public: + // The client should perform spell-checking on the given text. If the + // text contains a misspelled word, then upon return misspelledOffset + // will point to the start of the misspelled word, and misspelledLength + // will indicates its length. Otherwise, if there was not a spelling + // error, then upon return misspelledLength is 0. + virtual void spellCheck( + const WebString& text, int& misspelledOffset, int& misspelledLength) { } + // Requests asynchronous spelling and grammar checking, whose result should be + // returned by passed completion object. + virtual void requestCheckingOfText(const WebString&, WebTextCheckingCompletion*) { } + + // Computes an auto-corrected replacement for a misspelled word. If no + // replacement is found, then an empty string is returned. + virtual WebString autoCorrectWord(const WebString& misspelledWord) { return WebString(); } + + // Show or hide the spelling UI. + virtual void showSpellingUI(bool show) { } + + // Returns true if the spelling UI is showing. + virtual bool isShowingSpellingUI() { return false; } + + // Update the spelling UI with the given word. + virtual void updateSpellingUIWithMisspelledWord(const WebString& word) { } + +protected: + ~WebSpellCheckClient() { } +}; + +} // namespace WebKit + +#endif diff --git a/Source/WebKit/chromium/public/WebTextCheckingCompletion.h b/Source/WebKit/chromium/public/WebTextCheckingCompletion.h index 7e6526d..a207a27 100644 --- a/Source/WebKit/chromium/public/WebTextCheckingCompletion.h +++ b/Source/WebKit/chromium/public/WebTextCheckingCompletion.h @@ -35,7 +35,7 @@ namespace WebKit { -class WebTextCheckingResult; +struct WebTextCheckingResult; template <typename T> class WebVector; // Gets called back when WebViewClient finished an asynchronous spell checking. diff --git a/Source/WebKit/chromium/public/WebTextCheckingResult.h b/Source/WebKit/chromium/public/WebTextCheckingResult.h index 4d16d31..79fbb56 100644 --- a/Source/WebKit/chromium/public/WebTextCheckingResult.h +++ b/Source/WebKit/chromium/public/WebTextCheckingResult.h @@ -36,28 +36,22 @@ namespace WebKit { // A checked entry of text checking. -class WebTextCheckingResult { -public: +struct WebTextCheckingResult { enum Error { ErrorSpelling = 1 << 0, ErrorGrammar = 1 << 1 }; - Error error() const { return m_error; } - int position() const { return m_position; } - int length() const { return m_length; } - - explicit WebTextCheckingResult(Error error = ErrorSpelling, int position = 0, int length = 0) - : m_error(error) - , m_position(position) - , m_length(length) + explicit WebTextCheckingResult(Error e = ErrorSpelling, int p = 0, int l = 0) + : error(e) + , position(p) + , length(l) { } - -private: - Error m_error; - int m_position; - int m_length; + + Error error; + int position; + int length; }; } // namespace WebKit diff --git a/Source/WebKit/chromium/public/WebURL.h b/Source/WebKit/chromium/public/WebURL.h index bb90e32..707ba08 100644 --- a/Source/WebKit/chromium/public/WebURL.h +++ b/Source/WebKit/chromium/public/WebURL.h @@ -143,6 +143,16 @@ inline bool operator<(const WebURL& a, const WebURL& b) return a.spec() < b.spec(); } +inline bool operator==(const WebURL& a, const WebURL& b) +{ + return !a.spec().compare(b.spec()); +} + +inline bool operator!=(const WebURL& a, const WebURL& b) +{ + return !(a == b); +} + } // namespace WebKit #endif diff --git a/Source/WebKit/chromium/public/WebURLLoader.h b/Source/WebKit/chromium/public/WebURLLoader.h index 54d105e..38efcb4 100644 --- a/Source/WebKit/chromium/public/WebURLLoader.h +++ b/Source/WebKit/chromium/public/WebURLLoader.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Google Inc. All rights reserved. + * Copyright (C) 2009, 2011 Google Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -41,6 +41,21 @@ class WebURLRequest; class WebURLResponse; struct WebURLError; +enum WebCrossOriginRequestPolicy { + DenyCrossOriginRequests, + UseAccessControl, + AllowCrossOriginRequests +}; + +struct WebURLLoaderOptions { + WebURLLoaderOptions() : sniffContent(false), allowCredentials(false), forcePreflight(false), crossOriginRequestPolicy(DenyCrossOriginRequests) { } + + bool sniffContent; // Whether to sniff content. + bool allowCredentials; // Whether to send HTTP credentials and cookies with the request. + bool forcePreflight; // If AccessControl is used, whether to force a preflight. + WebCrossOriginRequestPolicy crossOriginRequestPolicy; +}; + class WebURLLoader { public: // The WebURLLoader may be deleted in a call to its client. diff --git a/Source/WebKit/chromium/public/WebURLLoaderClient.h b/Source/WebKit/chromium/public/WebURLLoaderClient.h index 87d100f..e306b19 100644 --- a/Source/WebKit/chromium/public/WebURLLoaderClient.h +++ b/Source/WebKit/chromium/public/WebURLLoaderClient.h @@ -58,6 +58,10 @@ public: virtual void didDownloadData(WebURLLoader*, int dataLength) { } // Called when a chunk of response data is received. + // FIXME(vsevik): rename once original didReceiveData() is removed. + virtual void didReceiveData2(WebURLLoader*, const char* data, int dataLength, int lengthReceived) { } + + // FIXME(vsevik): remove once not used downstream virtual void didReceiveData(WebURLLoader*, const char* data, int dataLength) { } // Called when a chunk of renderer-generated metadata is received from the cache. diff --git a/Source/WebKit/chromium/public/WebVector.h b/Source/WebKit/chromium/public/WebVector.h index cf3ec95..bb02abc 100644 --- a/Source/WebKit/chromium/public/WebVector.h +++ b/Source/WebKit/chromium/public/WebVector.h @@ -125,6 +125,15 @@ public: WEBKIT_ASSERT(i < m_size); return m_ptr[i]; } + + bool contains(const T& value) const + { + for (size_t i = 0; i < m_size; i++) { + if (m_ptr[i] == value) + return true; + } + return false; + } T* data() { return m_ptr; } const T* data() const { return m_ptr; } @@ -172,6 +181,6 @@ private: size_t m_size; }; -} // namespace WebKit +} // namespace WebKit #endif diff --git a/Source/WebKit/chromium/public/WebView.h b/Source/WebKit/chromium/public/WebView.h index 081fddb..d32e09c 100644 --- a/Source/WebKit/chromium/public/WebView.h +++ b/Source/WebKit/chromium/public/WebView.h @@ -36,9 +36,6 @@ #include "WebVector.h" #include "WebWidget.h" -// FIXME(jam): take out once Chromium rolls past this revision -#define WEBKIT_HAS_WEB_AUTO_FILL_CLIENT - namespace WebKit { class WebAccessibilityObject; @@ -51,6 +48,7 @@ class WebFrameClient; class WebGraphicsContext3D; class WebNode; class WebSettings; +class WebSpellCheckClient; class WebString; class WebViewClient; struct WebMediaPlayerAction; @@ -86,9 +84,7 @@ public: // Creates a WebView that is NOT yet initialized. You will need to // call initializeMainFrame to finish the initialization. It is valid // to pass null client pointers. - WEBKIT_API static WebView* create(WebViewClient*, - WebDevToolsAgentClient*, - WebAutoFillClient*); + WEBKIT_API static WebView* create(WebViewClient*); // After creating a WebView, you should immediately call this method. // You can optionally modify the settings before calling this method. @@ -96,6 +92,11 @@ public: // child frames. It is valid to pass a null WebFrameClient pointer. virtual void initializeMainFrame(WebFrameClient*) = 0; + // Initializes the various client interfaces. + virtual void setDevToolsAgentClient(WebDevToolsAgentClient*) = 0; + virtual void setAutoFillClient(WebAutoFillClient*) = 0; + virtual void setSpellCheckClient(WebSpellCheckClient*) = 0; + // Options ------------------------------------------------------------- @@ -229,7 +230,11 @@ public: // Callback methods when a drag-and-drop operation is trying to drop // something on the WebView. virtual WebDragOperation dragTargetDragEnter( - const WebDragData&, int identity, + const WebDragData&, int identity, // FIXME: remove identity from this function signature. + const WebPoint& clientPoint, const WebPoint& screenPoint, + WebDragOperationsMask operationsAllowed) = 0; + virtual WebDragOperation dragTargetDragEnter( + const WebDragData&, const WebPoint& clientPoint, const WebPoint& screenPoint, WebDragOperationsMask operationsAllowed) = 0; virtual WebDragOperation dragTargetDragOver( @@ -239,13 +244,6 @@ public: virtual void dragTargetDrop( const WebPoint& clientPoint, const WebPoint& screenPoint) = 0; - virtual int dragIdentity() = 0; - - // Helper method for drag and drop target operations: override the - // default drop effect with either a "copy" (accept true) or "none" - // (accept false) effect. Return true on success. - virtual bool setDropEffect(bool accept) = 0; - // Support for resource loading initiated by plugins ------------------- diff --git a/Source/WebKit/chromium/public/WebViewClient.h b/Source/WebKit/chromium/public/WebViewClient.h index 2588788..c168ef2 100644 --- a/Source/WebKit/chromium/public/WebViewClient.h +++ b/Source/WebKit/chromium/public/WebViewClient.h @@ -64,7 +64,6 @@ class WebRange; class WebSpeechInputController; class WebSpeechInputListener; class WebStorageNamespace; -class WebTextCheckingCompletion; class WebURL; class WebURLRequest; class WebView; @@ -170,32 +169,6 @@ public: virtual bool handleCurrentKeyboardEvent() { return false; } - // Spellchecker -------------------------------------------------------- - - // The client should perform spell-checking on the given text. If the - // text contains a misspelled word, then upon return misspelledOffset - // will point to the start of the misspelled word, and misspelledLength - // will indicates its length. Otherwise, if there was not a spelling - // error, then upon return misspelledLength is 0. - virtual void spellCheck( - const WebString& text, int& misspelledOffset, int& misspelledLength) { } - // Requests asynchronous spelling and grammar checking, whose result should be - // returned by passed completion object. - virtual void requestCheckingOfText(const WebString&, WebTextCheckingCompletion*) { } - // Computes an auto-corrected replacement for a misspelled word. If no - // replacement is found, then an empty string is returned. - virtual WebString autoCorrectWord(const WebString& misspelledWord) { return WebString(); } - - // Show or hide the spelling UI. - virtual void showSpellingUI(bool show) { } - - // Returns true if the spelling UI is showing. - virtual bool isShowingSpellingUI() { return false; } - - // Update the spelling UI with the given word. - virtual void updateSpellingUIWithMisspelledWord(const WebString& word) { } - - // Dialogs ------------------------------------------------------------- // This method returns immediately after showing the dialog. When the diff --git a/Source/WebKit/chromium/public/gtk/WebFontInfo.h b/Source/WebKit/chromium/public/gtk/WebFontInfo.h index d603372..aa31faf 100644 --- a/Source/WebKit/chromium/public/gtk/WebFontInfo.h +++ b/Source/WebKit/chromium/public/gtk/WebFontInfo.h @@ -50,7 +50,7 @@ public: // // Returns: the font family or an empty string if the request could not be // satisfied. - WEBKIT_API static WebCString familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale = 0); + WEBKIT_API static WebCString familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale); // Fill out the given WebFontRenderStyle with the user's preferences for // rendering the given font at the given size. |