diff options
Diffstat (limited to 'WebKit/chromium/public')
25 files changed, 305 insertions, 44 deletions
diff --git a/WebKit/chromium/public/WebAccessibilityNotification.h b/WebKit/chromium/public/WebAccessibilityNotification.h new file mode 100644 index 0000000..c4a9551 --- /dev/null +++ b/WebKit/chromium/public/WebAccessibilityNotification.h @@ -0,0 +1,57 @@ +/* + * 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 WebAccessibilityNotification_h +#define WebAccessibilityNotification_h + +namespace WebKit { + +enum WebAccessibilityNotification { + WebAccessibilityNotificationActiveDescendantChanged, + WebAccessibilityNotificationCheckedStateChanged, + WebAccessibilityNotificationChildrenChanged, + WebAccessibilityNotificationFocusedUIElementChanged, + WebAccessibilityNotificationLayoutComplete, + WebAccessibilityNotificationLoadComplete, + WebAccessibilityNotificationSelectedChildrenChanged, + WebAccessibilityNotificationSelectedTextChanged, + WebAccessibilityNotificationValueChanged, + WebAccessibilityNotificationScrolledToAnchor, + WebAccessibilityNotificationLiveRegionChanged, + WebAccessibilityNotificationMenuListValueChanged, + WebAccessibilityNotificationRowCountChanged, + WebAccessibilityNotificationRowCollapsed, + WebAccessibilityNotificationRowExpanded, + WebAccessibilityNotificationInvalid +}; + +} // namespace WebKit + +#endif // WebAccessibilityNotification_h diff --git a/WebKit/chromium/public/WebAccessibilityObject.h b/WebKit/chromium/public/WebAccessibilityObject.h index 6b55376..f7c93f2 100644 --- a/WebKit/chromium/public/WebAccessibilityObject.h +++ b/WebKit/chromium/public/WebAccessibilityObject.h @@ -70,6 +70,7 @@ public: WEBKIT_API WebString actionVerb() const; WEBKIT_API bool canSetFocusAttribute() const; WEBKIT_API bool canSetValueAttribute() const; + WEBKIT_API bool isValid() const; WEBKIT_API unsigned childCount() const; diff --git a/WebKit/chromium/public/WebDOMEvent.h b/WebKit/chromium/public/WebDOMEvent.h index d34c8d4..fa02b0c 100644 --- a/WebKit/chromium/public/WebDOMEvent.h +++ b/WebKit/chromium/public/WebDOMEvent.h @@ -50,6 +50,8 @@ public: BubblingPhase = 3 }; + ~WebDOMEvent() { reset(); } + WebDOMEvent() : m_private(0) { } WebDOMEvent(const WebDOMEvent& e) : m_private(0) { assign(e); } WebDOMEvent& operator=(const WebDOMEvent& e) diff --git a/WebKit/chromium/public/WebDataSource.h b/WebKit/chromium/public/WebDataSource.h index 1aa7a98..1a8c270 100644 --- a/WebKit/chromium/public/WebDataSource.h +++ b/WebKit/chromium/public/WebDataSource.h @@ -95,6 +95,10 @@ public: // The application cache host associated with this datasource. virtual WebApplicationCacheHost* applicationCacheHost() = 0; + // Set deferMainResourceDataLoad flag on the loader. This is used for + // testing. + virtual void setDeferMainResourceDataLoad(bool) = 0; + protected: ~WebDataSource() { } }; diff --git a/WebKit/chromium/public/WebDeviceOrientationClientMock.h b/WebKit/chromium/public/WebDeviceOrientationClientMock.h index 9cbccf7..7fae792 100644 --- a/WebKit/chromium/public/WebDeviceOrientationClientMock.h +++ b/WebKit/chromium/public/WebDeviceOrientationClientMock.h @@ -36,7 +36,7 @@ namespace WebKit { class WebDeviceOrientationClientMock : public WebDeviceOrientationClient { public: - WebDeviceOrientationClientMock() { initialize(); } + WEBKIT_API static WebDeviceOrientationClientMock* create(); ~WebDeviceOrientationClientMock() { reset(); } virtual void setController(WebDeviceOrientationController*); @@ -47,6 +47,7 @@ public: WEBKIT_API void setOrientation(WebDeviceOrientation&); private: + WebDeviceOrientationClientMock() { initialize(); } WEBKIT_API void initialize(); WEBKIT_API void reset(); diff --git a/WebKit/chromium/public/WebFileSystem.h b/WebKit/chromium/public/WebFileSystem.h index 641c169..b21235d 100644 --- a/WebKit/chromium/public/WebFileSystem.h +++ b/WebKit/chromium/public/WebFileSystem.h @@ -37,6 +37,8 @@ namespace WebKit { class WebFileSystemCallbacks; +class WebFileWriter; +class WebFileWriterClient; class WebFileSystem { public: @@ -100,6 +102,10 @@ public: // WebFileSystemCallbacks::didFail() must be called otherwise. virtual void readDirectory(const WebString& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } + // Creates a WebFileWriter that can be used to write to the given file. + // This is a fast, synchronous call, and should not stat the filesystem. + virtual WebFileWriter* createFileWriter(const WebString& path, WebFileWriterClient*) { WEBKIT_ASSERT_NOT_REACHED(); return 0; } + protected: virtual ~WebFileSystem() { } }; diff --git a/WebKit/chromium/public/WebFileWriter.h b/WebKit/chromium/public/WebFileWriter.h new file mode 100644 index 0000000..9cde098 --- /dev/null +++ b/WebKit/chromium/public/WebFileWriter.h @@ -0,0 +1,57 @@ +/* + * 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 WebFileWriter_h +#define WebFileWriter_h + +#include "WebCommon.h" +#include "WebString.h" + +namespace WebKit { + +class WebURL; + +class WebFileWriter { +public: + virtual ~WebFileWriter() { } + + // Only one write or one truncate operation can be in progress at a time. + // These functions are asynchronous and will report results through the WebFileWriter's associated WebFileWriterClient. + virtual void write(long long position, const WebURL& blobURL) = 0; + virtual void truncate(long long length) = 0; + + // Cancel will attempt to abort a running write or truncate. However, it may not be possible to cancel an in-progress action, or the call may have come in too late. Partial writes are possible. + // Do not call cancel when there is no write or truncate in progress. + virtual void cancel() = 0; +}; + +} // namespace WebKit + +#endif diff --git a/WebKit/chromium/public/WebFileWriterClient.h b/WebKit/chromium/public/WebFileWriterClient.h new file mode 100644 index 0000000..d371582 --- /dev/null +++ b/WebKit/chromium/public/WebFileWriterClient.h @@ -0,0 +1,57 @@ +/* + * 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 WebFileWriterClient_h +#define WebFileWriterClient_h + +#include "WebCommon.h" +#include "WebFileError.h" + +namespace WebKit { + +class WebFileWriterClient { +public: + // Called for each chunk of a write, to indicate progress. + // On the final chunk, when the write is finished, complete will be true. + virtual void didWrite(long long bytes, bool complete) = 0; + + // Called once when the truncate completes successfully. + virtual void didTruncate(long long length) = 0; + + // Called if the write or truncate fails, or if it is cancelled before the write or truncate completes. Completion of an operation will be signalled exactly once, either by didFail, didTruncate, or didWrite(..., true). + virtual void didFail(WebFileError) = 0; + +protected: + virtual ~WebFileWriterClient() { } +}; + +} // namespace WebKit + +#endif diff --git a/WebKit/chromium/public/WebFrame.h b/WebKit/chromium/public/WebFrame.h index d8eca6a..6725f58 100644 --- a/WebKit/chromium/public/WebFrame.h +++ b/WebKit/chromium/public/WebFrame.h @@ -533,6 +533,9 @@ public: // empty ((0,0), (0,0)). virtual WebRect selectionBoundsRect() const = 0; + // Only for testing purpose: + // Returns true if selection.anchorNode has a marker on range from |from| with |length|. + virtual bool selectionStartHasSpellingMarkerFor(int from, int length) const = 0; protected: ~WebFrame() { } }; diff --git a/WebKit/chromium/public/WebGeolocationService.h b/WebKit/chromium/public/WebGeolocationService.h index ed8c4e8..ea91b58 100644 --- a/WebKit/chromium/public/WebGeolocationService.h +++ b/WebKit/chromium/public/WebGeolocationService.h @@ -31,10 +31,9 @@ #ifndef WebGeolocationService_h #define WebGeolocationService_h -#include "WebGeolocationServiceBridge.h" - namespace WebKit { +class WebGeolocationServiceBridge; class WebString; class WebURL; @@ -50,10 +49,14 @@ public: // Attaches the WebGeolocationServiceBridge to the embedder and returns its // id, which should be used on subsequent calls for the methods above. + // An ID of zero indicates the attach failed. virtual int attachBridge(WebGeolocationServiceBridge*) { return 0; } // Detaches the WebGeolocationServiceBridge from the embedder. virtual void detachBridge(int bridgeId) { } + +protected: + virtual ~WebGeolocationService() {} }; } // namespace WebKit diff --git a/WebKit/chromium/public/WebGeolocationServiceBridge.h b/WebKit/chromium/public/WebGeolocationServiceBridge.h index 422b32b..d209c23 100644 --- a/WebKit/chromium/public/WebGeolocationServiceBridge.h +++ b/WebKit/chromium/public/WebGeolocationServiceBridge.h @@ -47,7 +47,11 @@ public: virtual void setIsAllowed(bool allowed) = 0; virtual void setLastPosition(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed, long long timestamp) = 0; virtual void setLastError(int errorCode, const WebString& message) = 0; - virtual void onWebGeolocationServiceDestroyed() = 0; + // Called when the WebGeolocationService to which this bridge is attached is going out of scope. On receiving + // this call the bridge implementation must not make any further access to the service. + virtual void didDestroyGeolocationService() = 0; + // FIXME: Remove this badly named method when all callers are using didDestroyGeolocationService directly. + void onWebGeolocationServiceDestroyed() { didDestroyGeolocationService(); } protected: virtual ~WebGeolocationServiceBridge() {} diff --git a/WebKit/chromium/public/WebGeolocationServiceMock.h b/WebKit/chromium/public/WebGeolocationServiceMock.h index 407fe9d..820975e 100644 --- a/WebKit/chromium/public/WebGeolocationServiceMock.h +++ b/WebKit/chromium/public/WebGeolocationServiceMock.h @@ -44,9 +44,6 @@ public: WEBKIT_API static void setMockGeolocationPermission(bool allowed); WEBKIT_API static void setMockGeolocationPosition(double latitude, double longitude, double accuracy); WEBKIT_API static void setMockGeolocationError(int errorCode, const WebString& message); - -protected: - static bool s_mockGeolocationPermission; }; } // namespace WebKit diff --git a/WebKit/chromium/public/WebGraphicsContext3D.h b/WebKit/chromium/public/WebGraphicsContext3D.h index 44a0498..9857174 100644 --- a/WebKit/chromium/public/WebGraphicsContext3D.h +++ b/WebKit/chromium/public/WebGraphicsContext3D.h @@ -83,6 +83,11 @@ public: // Initializes the graphics context; should be the first operation performed // on newly-constructed instances. Returns true on success. + virtual bool initialize(Attributes, WebView*, bool renderDirectlyToWebView) = 0; + + // Initializes the graphics context; should be the first operation performed + // on newly-constructed instances. Returns true on success. + // FIXME: remove this entry point once the compositor is switched to use GraphicsContext3D. virtual bool initialize(Attributes, WebView*) = 0; // Makes the OpenGL context current on the current thread. Returns true on @@ -134,8 +139,20 @@ public: // getError in the order they were added. virtual void synthesizeGLError(unsigned long error) = 0; + // EXT_texture_format_BGRA8888 virtual bool supportsBGRA() = 0; + // GL_CHROMIUM_map_sub + virtual bool supportsMapSubCHROMIUM() = 0; + virtual void* mapBufferSubDataCHROMIUM(unsigned target, int offset, int size, unsigned access) = 0; + virtual void unmapBufferSubDataCHROMIUM(const void*) = 0; + virtual void* mapTexSubImage2DCHROMIUM(unsigned target, int level, int xoffset, int yoffset, int width, int height, unsigned format, unsigned type, unsigned access) = 0; + virtual void unmapTexSubImage2DCHROMIUM(const void*) = 0; + + // GL_CHROMIUM_copy_texture_to_parent_texture + virtual bool supportsCopyTextureToParentTextureCHROMIUM() = 0; + virtual void copyTextureToParentTextureCHROMIUM(unsigned texture, unsigned parentTexture) = 0; + // The entry points below map directly to the OpenGL ES 2.0 API. // See: http://www.khronos.org/registry/gles/ // and: http://www.khronos.org/opengles/sdk/docs/man/ diff --git a/WebKit/chromium/public/WebHTTPBody.h b/WebKit/chromium/public/WebHTTPBody.h index a2bb5cd..6e45bf6 100644 --- a/WebKit/chromium/public/WebHTTPBody.h +++ b/WebKit/chromium/public/WebHTTPBody.h @@ -54,7 +54,9 @@ public: WebString filePath; long long fileStart; long long fileLength; // -1 means to the end of the file. + // FIXME: remove this field once all users of Element have been switched to use 'modificationTime'. WebFileInfo fileInfo; + double modificationTime; WebURL blobURL; }; @@ -85,6 +87,8 @@ public: WEBKIT_API void appendData(const WebData&); WEBKIT_API void appendFile(const WebString&); // Passing -1 to fileLength means to the end of the file. + WEBKIT_API void appendFileRange(const WebString&, long long fileStart, long long fileLength, double modificationTime); + // FIXME: Remove this method once all callers have been switched to use the method above. WEBKIT_API void appendFileRange(const WebString&, long long fileStart, long long fileLength, const WebFileInfo&); WEBKIT_API void appendBlob(const WebURL&); diff --git a/WebKit/chromium/public/WebIDBCursor.h b/WebKit/chromium/public/WebIDBCursor.h index 27eb924..f47a44c 100644 --- a/WebKit/chromium/public/WebIDBCursor.h +++ b/WebKit/chromium/public/WebIDBCursor.h @@ -44,33 +44,30 @@ public: WEBKIT_ASSERT_NOT_REACHED(); return 0; } - virtual WebIDBKey key() const { WEBKIT_ASSERT_NOT_REACHED(); - return WebIDBKey(""); + return WebIDBKey::createInvalid(); } - + // FIXME: Remove the legacy version of value() (the first version) as soon as a WebKit roll happens. virtual WebSerializedScriptValue value() const { - WEBKIT_ASSERT_NOT_REACHED(); - return WebSerializedScriptValue(); - } - - virtual void update(const WebSerializedScriptValue&, WebIDBCallbacks*) - { - WEBKIT_ASSERT_NOT_REACHED(); + WebSerializedScriptValue serializedScriptValue; + WebIDBKey idbKey; + value(serializedScriptValue, idbKey); + WEBKIT_ASSERT(!serializedScriptValue.isNull()); + WEBKIT_ASSERT(idbKey.type() == WebIDBKey::InvalidType); + return serializedScriptValue; } - - virtual void continueFunction(const WebIDBKey&, WebIDBCallbacks*) + // One or the other will set, depending on what type of cursor this is. + virtual void value(WebSerializedScriptValue& serializedScriptValue, WebIDBKey& idbKey) const { - WEBKIT_ASSERT_NOT_REACHED(); + serializedScriptValue = value(); } - virtual void remove(WebIDBCallbacks*) - { - WEBKIT_ASSERT_NOT_REACHED(); - } + virtual void update(const WebSerializedScriptValue&, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual void continueFunction(const WebIDBKey&, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual void remove(WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } }; } // namespace WebKit diff --git a/WebKit/chromium/public/WebIDBFactory.h b/WebKit/chromium/public/WebIDBFactory.h index 7c070a2..ab05b06 100755 --- a/WebKit/chromium/public/WebIDBFactory.h +++ b/WebKit/chromium/public/WebIDBFactory.h @@ -52,16 +52,14 @@ public: virtual ~WebIDBFactory() { } // The WebKit implementation of open ignores the WebFrame* parameter. - virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame) + virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir) { - int exceptionCode; - open(name, description, callbacks, origin, webFrame, exceptionCode); + open(name, description, callbacks, origin, webFrame); } // FIXME: Delete soon. Compatability hack. - virtual void open(const WebString& name, const WebString& description, - WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, int& exceptionCode) + virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame) { - open(name, description, callbacks, origin, webFrame); + open(name, description, callbacks, origin, webFrame, "/tmp/temporary-indexed-db-files"); } virtual void abortPendingTransactions(const WebVector<int>& pendingIDs) { WEBKIT_ASSERT_NOT_REACHED(); } diff --git a/WebKit/chromium/public/WebIDBIndex.h b/WebKit/chromium/public/WebIDBIndex.h index dafea0e..e03fc58 100644 --- a/WebKit/chromium/public/WebIDBIndex.h +++ b/WebKit/chromium/public/WebIDBIndex.h @@ -30,6 +30,10 @@ namespace WebKit { +class WebIDBCallbacks; +class WebIDBKey; +class WebIDBKeyRange; + // See comment in WebIndexedDatabase for a high level overview of these classes. class WebIDBIndex { public: @@ -40,6 +44,11 @@ public: WEBKIT_ASSERT_NOT_REACHED(); return WebString(); } + virtual WebString storeName() const + { + WEBKIT_ASSERT_NOT_REACHED(); + return WebString(); + } virtual WebString keyPath() const { WEBKIT_ASSERT_NOT_REACHED(); @@ -50,6 +59,11 @@ public: WEBKIT_ASSERT_NOT_REACHED(); return false; } + + virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual void getObject(const WebIDBKey&, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual void get(const WebIDBKey&, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } }; } // namespace WebKit diff --git a/WebKit/chromium/public/WebIDBKey.h b/WebKit/chromium/public/WebIDBKey.h index 6aef332..60d3325 100644 --- a/WebKit/chromium/public/WebIDBKey.h +++ b/WebKit/chromium/public/WebIDBKey.h @@ -42,7 +42,7 @@ public: // Please use one of the factory methods. This is public only to allow WebVector. WebIDBKey() { } ~WebIDBKey() { reset(); } - + WEBKIT_API static WebIDBKey createNull(); WEBKIT_API static WebIDBKey createInvalid(); WEBKIT_API static WebIDBKey createFromValueAndKeyPath(const WebSerializedScriptValue&, const WebIDBKeyPath&); diff --git a/WebKit/chromium/public/WebInputElement.h b/WebKit/chromium/public/WebInputElement.h index ef3b577..3ef92de 100644 --- a/WebKit/chromium/public/WebInputElement.h +++ b/WebKit/chromium/public/WebInputElement.h @@ -79,9 +79,17 @@ namespace WebKit { Week }; + // This returns true for all of textfield-looking types such as text, + // password, search, email, url, and number. + WEBKIT_API bool isTextField() const; + // This returns true only for type=text. + WEBKIT_API bool isText() const; + 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; + // Deperated. WEBKIT_API InputType inputType() const; WEBKIT_API int maxLength() const; WEBKIT_API bool isActivatedSubmit() const; diff --git a/WebKit/chromium/public/WebKit.h b/WebKit/chromium/public/WebKit.h index 5550db1..732cac6 100644 --- a/WebKit/chromium/public/WebKit.h +++ b/WebKit/chromium/public/WebKit.h @@ -55,11 +55,6 @@ WEBKIT_API WebKitClient* webKitClient(); WEBKIT_API void setLayoutTestMode(bool); WEBKIT_API bool layoutTestMode(); -// This is a temporary flag while we try to get Linux to match Windows' -// checksum computation. It specifies whether or not the baseline images -// should be opaque or not. -WEBKIT_API bool areLayoutTestImagesOpaque(); - // Enables the named log channel. See WebCore/platform/Logging.h for details. WEBKIT_API void enableLogChannel(const char*); diff --git a/WebKit/chromium/public/WebURLLoaderClient.h b/WebKit/chromium/public/WebURLLoaderClient.h index c716e5d..7614ea3 100644 --- a/WebKit/chromium/public/WebURLLoaderClient.h +++ b/WebKit/chromium/public/WebURLLoaderClient.h @@ -64,7 +64,10 @@ public: virtual void didReceiveCachedMetadata(WebURLLoader*, const char* data, int dataLength) { } // Called when the load completes successfully. - virtual void didFinishLoading(WebURLLoader*) { } + virtual void didFinishLoading(WebURLLoader*, double finishTime) { } + + // FIXME: remove this once clients are updated. + virtual void didFinishLoading(WebURLLoader* loader) { didFinishLoading(loader, 0); } // Called when the load completes with an error. virtual void didFail(WebURLLoader*, const WebURLError&) { } diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h index 1b94da2..d162f26 100644 --- a/WebKit/chromium/public/WebView.h +++ b/WebKit/chromium/public/WebView.h @@ -45,6 +45,7 @@ class WebDragData; class WebFrame; class WebFrameClient; class WebGLES2Context; +class WebGraphicsContext3D; class WebNode; class WebSettings; class WebString; @@ -109,6 +110,9 @@ public: virtual bool isActive() const = 0; virtual void setIsActive(bool) = 0; + // Allows disabling domain relaxation. + virtual void setDomainRelaxationForbidden(bool, const WebString& scheme) = 0; + // Closing ------------------------------------------------------------- @@ -339,8 +343,17 @@ public: // Returns the GLES2Context associated with this WebView. One will be // created if it doesn't already exist. + // FIXME: remove this method once the compositor is fully switched + // over to GraphicsContext3D. virtual WebGLES2Context* gles2Context() = 0; + // Returns the (on-screen) WebGraphicsContext3D associated with + // this WebView. One will be created if it doesn't already exist. + // This is used to set up sharing between this context (which is + // that used by the compositor) and contexts for WebGL and other + // APIs. + virtual WebGraphicsContext3D* graphicsContext3D() = 0; + protected: ~WebView() {} }; diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h index 5c9a79b..f686419 100644 --- a/WebKit/chromium/public/WebViewClient.h +++ b/WebKit/chromium/public/WebViewClient.h @@ -31,6 +31,7 @@ #ifndef WebViewClient_h #define WebViewClient_h +#include "WebAccessibilityNotification.h" #include "WebDragOperation.h" #include "WebEditingAction.h" #include "WebFileChooserCompletion.h" @@ -280,6 +281,9 @@ public: // Notifies embedder that the children of an accessibility object has changed. virtual void didChangeAccessibilityObjectChildren(const WebAccessibilityObject&) { } + + // Notifies embedder about an accessibility notification. + virtual void postAccessibilityNotification(const WebAccessibilityObject&, WebAccessibilityNotification) { } // Developer tools ----------------------------------------------------- diff --git a/WebKit/chromium/public/WebWidget.h b/WebKit/chromium/public/WebWidget.h index 5c9f54e..d010270 100644 --- a/WebKit/chromium/public/WebWidget.h +++ b/WebKit/chromium/public/WebWidget.h @@ -60,13 +60,26 @@ public: // and it may result in calls to WebWidgetClient::didInvalidateRect. virtual void layout() = 0; - // Called to paint the specified region of the WebWidget onto the given - // canvas. You MUST call Layout before calling this method. It is - // okay to call paint multiple times once layout has been called, - // assuming no other changes are made to the WebWidget (e.g., once - // events are processed, it should be assumed that another call to - // layout is warranted before painting again). - virtual void paint(WebCanvas*, const WebRect&) = 0; + // Called to paint the rectangular region within the WebWidget + // onto the specified canvas at (viewPort.x,viewPort.y). You MUST call + // Layout before calling this method. It is okay to call paint + // multiple times once layout has been called, assuming no other + // changes are made to the WebWidget (e.g., once events are + // processed, it should be assumed that another call to layout is + // warranted before painting again). + virtual void paint(WebCanvas*, const WebRect& viewPort) = 0; + + // Triggers compositing of the current layers onto the screen. + // The finish argument controls whether the compositor will wait for the + // GPU to finish rendering before returning. You MUST call Layout + // before calling this method, for the same reasons described in + // the paint method above. + virtual void composite(bool finish) = 0; + + // Called to inform the WebWidget of a change in theme. + // Implementors that cache rendered copies of widgets need to re-render + // on receiving this message + virtual void themeChanged() = 0; // Called to inform the WebWidget of an input event. Returns true if // the event has been processed, false otherwise. diff --git a/WebKit/chromium/public/WebWidgetClient.h b/WebKit/chromium/public/WebWidgetClient.h index bd7bd6a..9bd553f 100644 --- a/WebKit/chromium/public/WebWidgetClient.h +++ b/WebKit/chromium/public/WebWidgetClient.h @@ -50,6 +50,9 @@ public: // scrolled by the specified dx and dy amounts. virtual void didScrollRect(int dx, int dy, const WebRect& clipRect) { } + // Called when a call to WebWidget::composite is required + virtual void scheduleComposite() { } + // Called when the widget acquires or loses focus, respectively. virtual void didFocus() { } virtual void didBlur() { } |