diff options
Diffstat (limited to 'Source/WebKit/chromium/public')
25 files changed, 287 insertions, 271 deletions
diff --git a/Source/WebKit/chromium/public/WebDeliveredIntentClient.h b/Source/WebKit/chromium/public/WebDeliveredIntentClient.h new file mode 100644 index 000000000..2fb9af23b --- /dev/null +++ b/Source/WebKit/chromium/public/WebDeliveredIntentClient.h @@ -0,0 +1,55 @@ +/* + * Copyright (C) 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 + * 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 WebDeliveredIntentClient_h +#define WebDeliveredIntentClient_h + +#include "platform/WebCommon.h" + +namespace WebKit { + +class WebSerializedScriptValue; + +// The embedder implements this interface to receive reply calls from the service +// in response to the delivery of a web intent. This client must remain valid +// until the destroy() method is called. +// See spec at http://www.chromium.org/developers/design-documents/webintentsapi +class WebDeliveredIntentClient { +public: + virtual ~WebDeliveredIntentClient() { } + + virtual void postResult(const WebSerializedScriptValue& data) const = 0; + virtual void postFailure(const WebSerializedScriptValue& data) const = 0; + virtual void destroy() = 0; +}; + +} // namespace WebKit + +#endif // WebDeliveredIntentClient_h diff --git a/Source/WebKit/chromium/public/WebFileUtilities.h b/Source/WebKit/chromium/public/WebFileUtilities.h index 8b3b7b26b..b2cca5f2f 100644 --- a/Source/WebKit/chromium/public/WebFileUtilities.h +++ b/Source/WebKit/chromium/public/WebFileUtilities.h @@ -28,50 +28,4 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WebFileUtilities_h -#define WebFileUtilities_h - -#include "platform/WebCommon.h" -#include "platform/WebString.h" -#include "platform/WebURL.h" - -#ifdef WIN32 -typedef void *HANDLE; -#endif - -namespace WebKit { - -class WebFileUtilities { -public: -#ifdef WIN32 - typedef HANDLE FileHandle; -#else - typedef int FileHandle; -#endif - virtual void revealFolderInOS(const WebString& path) { } - virtual bool fileExists(const WebString& path) { return false; } - virtual bool deleteFile(const WebString& path) { return false; } - virtual bool deleteEmptyDirectory(const WebString& path) { return false; } - virtual bool getFileSize(const WebString& path, long long& result) { return false; } - virtual bool getFileModificationTime(const WebString& path, double& result) { return false; } - virtual WebString directoryName(const WebString& path) { return WebString(); } - virtual WebString pathByAppendingComponent(const WebString& path, const WebString& component) { return WebString(); } - virtual bool makeAllDirectories(const WebString& path) { return false; } - virtual WebString getAbsolutePath(const WebString& path) { return WebString(); } - virtual bool isDirectory(const WebString& path) { return false; } - virtual WebURL filePathToURL(const WebString& path) { return WebURL(); } - virtual FileHandle openFile(const WebString& path, int mode) { return FileHandle(); } - // Should set the FileHandle to a invalid value if the file is closed successfully. - virtual void closeFile(FileHandle&) { } - virtual long long seekFile(FileHandle, long long offset, int origin) { return 0; } - virtual bool truncateFile(FileHandle, long long offset) { return false; } - virtual int readFromFile(FileHandle, char* data, int length) { return 0; } - virtual int writeToFile(FileHandle, const char* data, int length) { return 0; } - -protected: - ~WebFileUtilities() {} -}; - -} // namespace WebKit - -#endif +#include "../../../Platform/chromium/public/WebFileUtilities.h" diff --git a/Source/WebKit/chromium/public/WebFrame.h b/Source/WebKit/chromium/public/WebFrame.h index 017cb0de8..87659ee99 100644 --- a/Source/WebKit/chromium/public/WebFrame.h +++ b/Source/WebKit/chromium/public/WebFrame.h @@ -57,11 +57,13 @@ namespace WebKit { class WebAnimationController; class WebData; class WebDataSource; +class WebDeliveredIntentClient; class WebDocument; class WebElement; class WebFormElement; class WebHistoryItem; class WebInputElement; +class WebIntent; class WebPerformance; class WebRange; class WebSecurityOrigin; @@ -73,6 +75,7 @@ class WebView; struct WebConsoleMessage; struct WebFindOptions; struct WebPoint; +struct WebPrintParams; struct WebRect; struct WebScriptSource; struct WebSize; @@ -452,19 +455,35 @@ public: // Printing ------------------------------------------------------------ - // Reformats the WebFrame for printing. pageSize is the page size in - // points (a point in 1/72 of an inch). If |constrainToNode| node is - // specified, then only the given node is printed (for now only plugins are - // supported), instead of the entire frame. printerDPI is the user - // selected, DPI for the printer. Returns the number of pages that can be - // printed at the given page size. The out param useBrowserOverlays + // Reformats the WebFrame for printing. printContentSize is the print + // content size in points (a point is 1/72 of an inch). If constrainToNode + // node is specified, then only the given node is printed (for now only + // plugins are supported), instead of the entire frame. printerDPI is the + // user selected, DPI for the printer. Returns the number of pages that can + // be printed at the given page size. The out param useBrowserOverlays // specifies whether the browser process should use its overlays (header, // footer, margins etc) or whether the renderer controls this. - virtual int printBegin(const WebSize& pageSize, + // + // FIXME: This is a temporary interface to avoid the compile errors. Remove + // this interface after fixing crbug.com/85132. We will use the overloaded + // printBegin function. + virtual int printBegin(const WebSize& printContentSize, const WebNode& constrainToNode = WebNode(), int printerDPI = 72, bool* useBrowserOverlays = 0) = 0; + // Reformats the WebFrame for printing. WebPrintParams specifies the printable + // content size, paper size, printable area size, printer DPI and print + // scaling option. If constrainToNode node is specified, then only the given node + // is printed (for now only plugins are supported), instead of the entire frame. + // Returns the number of pages that can be printed at the given + // page size. The out param useBrowserOverlays specifies whether the browser + // process should use its overlays (header, footer, margins etc) or whether + // the renderer controls this. + virtual int printBegin(const WebPrintParams&, + const WebNode& constrainToNode = WebNode(), + bool* useBrowserOverlays = 0) = 0; + // Returns the page shrinking factor calculated by webkit (usually // between 1/1.25 and 1/2). Returns 0 if the page number is invalid or // not in printing mode. @@ -588,16 +607,8 @@ public: // Web Intents --------------------------------------------------------- - // Forwards a web intents reply from the invoked activity back to the - // appropriate registered Javascript callback. The |intentIdentifier| is - // the WebIntent parameter received from the dispatchIntent method. - virtual void handleIntentResult(int intentIdentifier, const WebString&) = 0; - - // Forwards a web intents failure notification from the invoked activity - // or intervening browser logic back to the appropriate registered - // Javascript callback. The |intentIdentifier| is the WebIntent parameter - // received from the dispatchIntent method. - virtual void handleIntentFailure(int intentIdentifier, const WebString&) = 0; + // Called on a target service page to deliver an intent to the window. + virtual void deliverIntent(const WebIntent&, WebDeliveredIntentClient*) = 0; // Utility ------------------------------------------------------------- diff --git a/Source/WebKit/chromium/public/WebIDBIndex.h b/Source/WebKit/chromium/public/WebIDBIndex.h index 37af02c0c..8c3df193e 100644 --- a/Source/WebKit/chromium/public/WebIDBIndex.h +++ b/Source/WebKit/chromium/public/WebIDBIndex.h @@ -47,6 +47,7 @@ public: WEBKIT_ASSERT_NOT_REACHED(); return WebString(); } + // FIXME: Remove method once callers are updated. virtual WebString storeName() const { WEBKIT_ASSERT_NOT_REACHED(); diff --git a/Source/WebKit/chromium/public/WebIDBObjectStore.h b/Source/WebKit/chromium/public/WebIDBObjectStore.h index dcf485692..4008e1d2e 100644 --- a/Source/WebKit/chromium/public/WebIDBObjectStore.h +++ b/Source/WebKit/chromium/public/WebIDBObjectStore.h @@ -63,6 +63,11 @@ public: WEBKIT_ASSERT_NOT_REACHED(); return WebDOMStringList(); } + virtual bool autoIncrement() const + { + WEBKIT_ASSERT_NOT_REACHED(); + return false; + } virtual void get(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } diff --git a/Source/WebKit/chromium/public/WebInputElement.h b/Source/WebKit/chromium/public/WebInputElement.h index b1c407c59..23e85aa73 100644 --- a/Source/WebKit/chromium/public/WebInputElement.h +++ b/Source/WebKit/chromium/public/WebInputElement.h @@ -74,6 +74,12 @@ namespace WebKit { WEBKIT_EXPORT int size() const; WEBKIT_EXPORT void setValue(const WebString&, bool sendChangeEvent = false); WEBKIT_EXPORT WebString value() const; + // This returns the non-sanitized, exact value inside the text field. + WEBKIT_EXPORT WebString editingValue() const; + // Sets the value inside the text field without being sanitized. + // Can't be used if a renderer doesn't exist or on a non text field type. + // Caret will be moved to the end. + WEBKIT_EXPORT void setEditingValue(const WebString&); WEBKIT_EXPORT void setSuggestedValue(const WebString&); WEBKIT_EXPORT WebString suggestedValue() const; WEBKIT_EXPORT void setPlaceholder(const WebString&); diff --git a/Source/WebKit/chromium/public/WebInputEvent.h b/Source/WebKit/chromium/public/WebInputEvent.h index d5d6394f8..6ac9f1f57 100644 --- a/Source/WebKit/chromium/public/WebInputEvent.h +++ b/Source/WebKit/chromium/public/WebInputEvent.h @@ -359,11 +359,9 @@ public: int globalX; int globalY; - // NOTE: |deltaX| and |deltaY| represents the amount to scroll for Scroll gesture events. For Pinch gesture events, |deltaX| represents the scaling/magnification factor. For Tap and Press events, |deltaX|,|deltaY| and |gammaX|,|gammaY| correspond to the top left and bottom right corners of the ellipse's enlosing rectangle for tap target fuzzing. + // NOTE: |deltaX| and |deltaY| represents the amount to scroll for Scroll gesture events. For Pinch gesture events, |deltaX| represents the scaling/magnification factor. For a GestureTap event, |deltaX| and |deltaY| represent the horizontal and vertical radii of the touch region. float deltaX; float deltaY; - float gammaX; - float gammaY; WebGestureEvent(unsigned sizeParam = sizeof(WebGestureEvent)) : WebInputEvent(sizeParam) @@ -373,8 +371,6 @@ public: , globalY(0) , deltaX(0.0f) , deltaY(0.0f) - , gammaX(0.0f) - , gammaY(0.0f) { } }; diff --git a/Source/WebKit/chromium/public/WebIntent.h b/Source/WebKit/chromium/public/WebIntent.h index cc080ad99..aefc3ebb3 100644 --- a/Source/WebKit/chromium/public/WebIntent.h +++ b/Source/WebKit/chromium/public/WebIntent.h @@ -48,6 +48,7 @@ namespace WebKit { class WebIntent { public: WebIntent() { } + WEBKIT_EXPORT WebIntent(const WebString& action, const WebString& type, const WebString& data); WebIntent(const WebIntent& other) { assign(other); } ~WebIntent() { reset(); } @@ -80,6 +81,7 @@ public: #if WEBKIT_IMPLEMENTATION WebIntent(const WTF::PassRefPtr<WebCore::Intent>&); + operator WebCore::Intent*() const; #endif private: diff --git a/Source/WebKit/chromium/public/WebMediaPlayer.h b/Source/WebKit/chromium/public/WebMediaPlayer.h index a2a9fb9b4..670630f95 100644 --- a/Source/WebKit/chromium/public/WebMediaPlayer.h +++ b/Source/WebKit/chromium/public/WebMediaPlayer.h @@ -184,10 +184,11 @@ public: virtual MediaKeyException addKey(const WebString& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; } virtual MediaKeyException cancelKeyRequest(const WebString& keySystem, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; } - // Instuct WebMediaPlayer to enter/exit fullscreen. - // Returns true if the player can enter fullscreen. - virtual bool enterFullscreen() { return false; } + // Instruct WebMediaPlayer to enter/exit fullscreen. + virtual void enterFullscreen() { } virtual void exitFullscreen() { } + // Returns true if the player can enter fullscreen. + virtual bool canEnterFullscreen() const { return false; } }; } // namespace WebKit diff --git a/Source/WebKit/chromium/public/WebPlugin.h b/Source/WebKit/chromium/public/WebPlugin.h index edfda32a4..717f6a7e1 100644 --- a/Source/WebKit/chromium/public/WebPlugin.h +++ b/Source/WebKit/chromium/public/WebPlugin.h @@ -46,6 +46,7 @@ class WebPluginContainer; class WebURLResponse; struct WebCursorInfo; struct WebPluginParams; +struct WebPrintParams; struct WebPoint; struct WebRect; struct WebURLError; @@ -56,6 +57,8 @@ public: virtual bool initialize(WebPluginContainer*) = 0; virtual void destroy() = 0; + virtual WebPluginContainer* container() const { return 0; } + virtual NPObject* scriptableObject() = 0; // Returns true if the form submission value is successfully obtained @@ -94,10 +97,17 @@ public: // Returns true if the printed content should not be scaled to // the printer's printable area. virtual bool isPrintScalingDisabled() { return false; } - // Sets up printing at the given print rect and printer DPI. printableArea - // is in points (a point is 1/72 of an inch).Returns the number of pages to - // be printed at these settings. - virtual int printBegin(const WebRect& printableArea, int printerDPI) { return 0; } + + // Sets up printing at the given print rect and printer DPI. + // printContentArea is in points ( a point is 1/72 of an inch). Returns the + // number of pages to be printed at these settings. + // FIXME: Remove this function after fixing crbug.com/85132. For detailed + // information, please refer to the comments in WebFrame.h + virtual int printBegin(const WebRect& printContentArea, int printerDPI) { return 0; } + // Sets up printing with the specified printParams. Returns the number of + // pages to be printed at these settings. + virtual int printBegin(const WebPrintParams& printParams) { return 0; } + // Prints the page specified by pageNumber (0-based index) into the supplied canvas. virtual bool printPage(int pageNumber, WebCanvas* canvas) { return false; } // Ends the print operation. diff --git a/Source/WebKit/chromium/public/WebPrintParams.h b/Source/WebKit/chromium/public/WebPrintParams.h new file mode 100644 index 000000000..d2d25bdad --- /dev/null +++ b/Source/WebKit/chromium/public/WebPrintParams.h @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2012 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 WebPrintParams_h +#define WebPrintParams_h + +#include "WebPrintScalingOption.h" +#include "platform/WebRect.h" +#include "platform/WebSize.h" + +namespace WebKit { + +struct WebPrintParams { + // Specifies printable content rect in points (a point is 1/72 of an inch). + WebRect printContentArea; + + // Specifies the selected printer default printable area details in + // points. + WebRect printableArea; + + // Specifies the selected printer default paper size in points. + WebSize paperSize; + + // Specifies user selected DPI for printing. + int printerDPI; + + // Specifies whether to reduce/enlarge/retain the print contents to fit the + // printable area. (This is used only by plugin printing). + WebPrintScalingOption printScalingOption; + + WebPrintParams() + : printerDPI(72) + , printScalingOption(WebPrintScalingOptionFitToPrintableArea) { } + + WebPrintParams(const WebRect& printContentArea, const WebRect& printableArea, const WebSize& paperSize, int printerDPI, WebPrintScalingOption printScalingOption) + : printContentArea(printContentArea) + , printableArea(printableArea) + , paperSize(paperSize) + , printerDPI(printerDPI) + , printScalingOption(printScalingOption) { } +}; + +} // namespace WebKit + +#endif diff --git a/Source/WebKit/chromium/public/WebSettings.h b/Source/WebKit/chromium/public/WebSettings.h index ec7d03785..7e11141ea 100644 --- a/Source/WebKit/chromium/public/WebSettings.h +++ b/Source/WebKit/chromium/public/WebSettings.h @@ -32,6 +32,7 @@ #define WebSettings_h #include "platform/WebCommon.h" +#include "platform/WebSize.h" #include <unicode/uscript.h> #define HAS_WEBAUDIO_FEATURE_ENABLE 1 @@ -63,6 +64,7 @@ public: virtual void setMinimumFontSize(int) = 0; virtual void setMinimumLogicalFontSize(int) = 0; virtual void setDefaultDeviceScaleFactor(int) = 0; + virtual void setApplyDefaultDeviceScaleFactorInCompositor(bool) = 0; virtual void setDefaultTextEncodingName(const WebString&) = 0; virtual void setJavaScriptEnabled(bool) = 0; virtual void setWebSecurityEnabled(bool) = 0; @@ -104,9 +106,8 @@ public: virtual void setWebGLErrorsToConsoleEnabled(bool) = 0; virtual void setShowDebugBorders(bool) = 0; virtual void setShowFPSCounter(bool) = 0; - virtual bool showFPSCounter() const = 0; virtual void setShowPlatformLayerTree(bool) = 0; - virtual bool showPlatformLayerTree() const = 0; + virtual void setShowPaintRects(bool) = 0; virtual void setEditingBehavior(EditingBehavior) = 0; virtual void setAcceleratedCompositingEnabled(bool) = 0; virtual void setForceCompositingMode(bool) = 0; @@ -146,6 +147,9 @@ public: virtual void setThreadedAnimationEnabled(bool) = 0; virtual void setViewportEnabled(bool) = 0; virtual bool viewportEnabled() const = 0; + virtual void setDefaultTileSize(WebSize) = 0; + virtual void setMaxUntiledLayerSize(WebSize) = 0; + protected: ~WebSettings() { } diff --git a/Source/WebKit/chromium/public/WebSpeechRecognitionParams.h b/Source/WebKit/chromium/public/WebSpeechRecognitionParams.h index b2dcce055..562bfa0c4 100644 --- a/Source/WebKit/chromium/public/WebSpeechRecognitionParams.h +++ b/Source/WebKit/chromium/public/WebSpeechRecognitionParams.h @@ -26,6 +26,7 @@ #ifndef WebSpeechRecognitionParams_h #define WebSpeechRecognitionParams_h +#include "WebSecurityOrigin.h" #include "WebSpeechGrammar.h" #include "platform/WebString.h" #include "platform/WebVector.h" @@ -36,21 +37,24 @@ class WebSpeechGrammar; class WebSpeechRecognitionParams { public: - WebSpeechRecognitionParams(const WebVector<WebSpeechGrammar>& grammars, const WebString& language, bool continuous) + WebSpeechRecognitionParams(const WebVector<WebSpeechGrammar>& grammars, const WebString& language, bool continuous, const WebSecurityOrigin& origin) : m_grammars(grammars) , m_language(language) , m_continuous(continuous) + , m_origin(origin) { } const WebVector<WebSpeechGrammar>& grammars() const { return m_grammars; } const WebString& language() const { return m_language; } bool continuous() const { return m_continuous; } + const WebSecurityOrigin& origin() const { return m_origin; } private: WebVector<WebSpeechGrammar> m_grammars; WebString m_language; bool m_continuous; + WebSecurityOrigin m_origin; }; } // namespace WebKit diff --git a/Source/WebKit/chromium/public/WebSpeechRecognizerClient.h b/Source/WebKit/chromium/public/WebSpeechRecognizerClient.h index 35c637834..608bfb481 100644 --- a/Source/WebKit/chromium/public/WebSpeechRecognizerClient.h +++ b/Source/WebKit/chromium/public/WebSpeechRecognizerClient.h @@ -37,6 +37,18 @@ class WebString; // A client for reporting progress on speech recognition for a specific handle. class WebSpeechRecognizerClient { public: + enum ErrorCode { + OtherError = 0, + NoSpeechError = 1, + AbortedError = 2, + AudioCaptureError = 3, + NetworkError = 4, + NotAllowedError = 5, + ServiceNotAllowedError = 6, + BadGrammarError = 7, + LanguageNotSupportedError = 8 + }; + // These methods correspond to the events described in the spec: // http://speech-javascript-api-spec.googlecode.com/git/speechapi.html#speechreco-events @@ -74,8 +86,7 @@ public: virtual void didDeleteResult(const WebSpeechRecognitionHandle&, unsigned resultIndex, const WebVector<WebSpeechRecognitionResult>& resultHistory) = 0; // To be called when a speech recognition error occurs. - // FIXME: Introduce an enum for the error code. - virtual void didReceiveError(const WebSpeechRecognitionHandle&, const WebString& message, unsigned short code) = 0; + virtual void didReceiveError(const WebSpeechRecognitionHandle&, const WebString& message, ErrorCode) = 0; // To be called when the recognizer has begun to listen to the audio with // the intention of recognizing. diff --git a/Source/WebKit/chromium/public/WebStorageArea.h b/Source/WebKit/chromium/public/WebStorageArea.h index 23b799af1..cb5ee8d36 100644 --- a/Source/WebKit/chromium/public/WebStorageArea.h +++ b/Source/WebKit/chromium/public/WebStorageArea.h @@ -38,6 +38,9 @@ namespace WebKit { class WebURL; +// In WebCore, there's one distinct StorageArea per origin per StorageNamespace. This +// class wraps a StorageArea. All the methods have obvious connections to the spec: +// http://dev.w3.org/html5/webstorage/ class WebStorageArea { public: virtual ~WebStorageArea() { } @@ -60,34 +63,16 @@ public: virtual WebString getItem(const WebString& key) = 0; // Set the value that corresponds to a specific key. Result will either be ResultOK - // or some particular error. The value is NOT set when there's an error. |pageUrl| is the + // or some particular error. The value is NOT set when there's an error. url is the // url that should be used if a storage event fires. - virtual void setItem(const WebString& key, const WebString& newValue, const WebURL& pageUrl, Result& result) - { - WebString unused; - setItem(key, newValue, pageUrl, result, unused); - } - + virtual void setItem(const WebString& key, const WebString& newValue, const WebURL&, Result&, WebString& oldValue) = 0; - // Remove the value associated with a particular key. |pageUrl| is the url that should be used + // Remove the value associated with a particular key. url is the url that should be used // if a storage event fires. - virtual void removeItem(const WebString& key, const WebURL& pageUrl) - { - WebString unused; - removeItem(key, pageUrl, unused); - } + virtual void removeItem(const WebString& key, const WebURL& url, WebString& oldValue) = 0; - // Clear all key/value pairs. |pageUrl| is the url that should be used if a storage event fires. - virtual void clear(const WebURL& pageUrl) - { - bool unused; - clear(pageUrl, unused); - } - - // DEPRECATED - being replaced by the async variants above which do not return oldValues or block until completion. - virtual void setItem(const WebString& key, const WebString& newValue, const WebURL&, Result&, WebString& oldValue) = 0; - virtual void removeItem(const WebString& key, const WebURL& pageUrl, WebString& oldValue) = 0; - virtual void clear(const WebURL& pageUrl, bool& somethingCleared) = 0; + // Clear all key/value pairs. url is the url that should be used if a storage event fires. + virtual void clear(const WebURL& url, bool& somethingCleared) = 0; }; } // namespace WebKit diff --git a/Source/WebKit/chromium/public/WebStorageEventDispatcher.h b/Source/WebKit/chromium/public/WebStorageEventDispatcher.h index b321bf0e9..4fbc596b2 100644 --- a/Source/WebKit/chromium/public/WebStorageEventDispatcher.h +++ b/Source/WebKit/chromium/public/WebStorageEventDispatcher.h @@ -55,8 +55,13 @@ public: const WebURL& pageUrl, const WebStorageNamespace&, WebStorageArea* sourceAreaInstance, bool originatedInProcess); - private: - WebStorageEventDispatcher() { } + // DEPRECATED - The instance methods are going away soon in favor + // of the two static dispatch methods above. + WEBKIT_EXPORT static WebStorageEventDispatcher* create(); + virtual ~WebStorageEventDispatcher() { } + virtual void dispatchStorageEvent(const WebString& key, const WebString& oldValue, + const WebString& newValue, const WebString& origin, + const WebURL& url, bool isLocalStorage) = 0; }; } // namespace WebKit diff --git a/Source/WebKit/chromium/public/WebStorageNamespace.h b/Source/WebKit/chromium/public/WebStorageNamespace.h index dd4a8fd44..894330717 100644 --- a/Source/WebKit/chromium/public/WebStorageNamespace.h +++ b/Source/WebKit/chromium/public/WebStorageNamespace.h @@ -55,6 +55,9 @@ public: // Returns true of the two instances represent the same storage namespace. virtual bool isSameNamespace(const WebStorageNamespace&) const { return false; } + + // DEPRECATED + virtual void close() { } }; } // namespace WebKit diff --git a/Source/WebKit/chromium/public/WebView.h b/Source/WebKit/chromium/public/WebView.h index 111ecc641..0f7093ac4 100644 --- a/Source/WebKit/chromium/public/WebView.h +++ b/Source/WebKit/chromium/public/WebView.h @@ -107,9 +107,7 @@ public: virtual void setAutofillClient(WebAutofillClient*) = 0; virtual void setDevToolsAgentClient(WebDevToolsAgentClient*) = 0; virtual void setPermissionClient(WebPermissionClient*) = 0; - // FIXME: After the Prerendering API lands in chrome, remove this staging thunk - // for setPrerendererClient(). - virtual void setPrerendererClient(WebPrerendererClient*) { } + virtual void setPrerendererClient(WebPrerendererClient*) = 0; virtual void setSpellCheckClient(WebSpellCheckClient*) = 0; virtual void addTextFieldDecoratorClient(WebTextFieldDecoratorClient*) = 0; @@ -307,16 +305,31 @@ public: // Callback methods when a drag-and-drop operation is trying to drop // something on the WebView. + // FIXME: Remove this method after chromium changes catch up. virtual WebDragOperation dragTargetDragEnter( const WebDragData&, const WebPoint& clientPoint, const WebPoint& screenPoint, WebDragOperationsMask operationsAllowed) = 0; + virtual WebDragOperation dragTargetDragEnter( + const WebDragData&, + const WebPoint& clientPoint, const WebPoint& screenPoint, + WebDragOperationsMask operationsAllowed, + int keyModifiers) = 0; + // FIXME: Remove this method after chromium changes catch up. virtual WebDragOperation dragTargetDragOver( const WebPoint& clientPoint, const WebPoint& screenPoint, WebDragOperationsMask operationsAllowed) = 0; + virtual WebDragOperation dragTargetDragOver( + const WebPoint& clientPoint, const WebPoint& screenPoint, + WebDragOperationsMask operationsAllowed, + int keyModifiers) = 0; virtual void dragTargetDragLeave() = 0; + // FIXME: Remove this method after chromium changes catch up. virtual void dragTargetDrop( const WebPoint& clientPoint, const WebPoint& screenPoint) = 0; + virtual void dragTargetDrop( + const WebPoint& clientPoint, const WebPoint& screenPoint, + int keyModifiers) = 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 c4a5e40d2..21dc250a9 100644 --- a/Source/WebKit/chromium/public/WebViewClient.h +++ b/Source/WebKit/chromium/public/WebViewClient.h @@ -250,6 +250,8 @@ public: virtual void showContextMenu(WebFrame*, const WebContextMenuData&) { } // Called when a drag-n-drop operation should begin. + virtual void startDragging(WebFrame*, const WebDragData& dragData, WebDragOperationsMask mask, const WebImage& dragImage, const WebPoint& dragImageOffset) { startDragging(dragData, mask, dragImage, dragImageOffset); } + // FIXME: Remove once the chromium side has landed. virtual void startDragging( const WebDragData&, WebDragOperationsMask, const WebImage&, const WebPoint&) { } diff --git a/Source/WebKit/chromium/public/WebWidget.h b/Source/WebKit/chromium/public/WebWidget.h index fad319d78..c756eb2a6 100644 --- a/Source/WebKit/chromium/public/WebWidget.h +++ b/Source/WebKit/chromium/public/WebWidget.h @@ -177,6 +177,10 @@ public: // If the selection range is empty, it returns the caret bounds. virtual bool selectionBounds(WebRect& start, WebRect& end) const { return false; } + // Returns the text direction at the start and end bounds of the current selection. + // If the selection range is empty, it returns false. + virtual bool selectionTextDirection(WebTextDirection& start, WebTextDirection& end) const { return false; } + // Fetch the current selection range of this WebWidget. If there is no // selection, it will output a 0-length range with the location at the // caret. Returns true and fills the out-paramters on success; returns false diff --git a/Source/WebKit/chromium/public/WebWorkerRunLoop.h b/Source/WebKit/chromium/public/WebWorkerRunLoop.h index d15abed91..032024adb 100644 --- a/Source/WebKit/chromium/public/WebWorkerRunLoop.h +++ b/Source/WebKit/chromium/public/WebWorkerRunLoop.h @@ -22,46 +22,4 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WebWorkerRunLoop_h -#define WebWorkerRunLoop_h - -#include "platform/WebCommon.h" - -namespace WebCore { -class WorkerRunLoop; -} - -namespace WebKit { - -class WebWorkerRunLoop { -public: - class Task { - public: - virtual ~Task() { } - virtual void Run() = 0; - }; - WEBKIT_EXPORT void postTask(Task*); - WEBKIT_EXPORT bool equals(const WebWorkerRunLoop&) const; - WEBKIT_EXPORT bool lessThan(const WebWorkerRunLoop&) const; - -#if WEBKIT_IMPLEMENTATION - WebWorkerRunLoop(WebCore::WorkerRunLoop*); -#endif - -private: - WebCore::WorkerRunLoop* m_workerRunLoop; -}; - -inline bool operator==(const WebWorkerRunLoop& a, const WebWorkerRunLoop& b) -{ - return a.equals(b); -} - -inline bool operator<(const WebWorkerRunLoop& a, const WebWorkerRunLoop& b) -{ - return a.lessThan(b); -} - -} - -#endif +#include "../../../Platform/chromium/public/WebWorkerRunLoop.h" diff --git a/Source/WebKit/chromium/public/android/WebInputEventFactory.h b/Source/WebKit/chromium/public/android/WebInputEventFactory.h index fb52787a7..f1edbb1a7 100644 --- a/Source/WebKit/chromium/public/android/WebInputEventFactory.h +++ b/Source/WebKit/chromium/public/android/WebInputEventFactory.h @@ -46,6 +46,13 @@ public: MouseEventTypeMove, }; + enum MouseWheelDirectionType { + MouseWheelDirectionTypeUp = 0, + MouseWheelDirectionTypeDown, + MouseWheelDirectionTypeLeft, + MouseWheelDirectionTypeRight, + }; + WEBKIT_EXPORT static WebKeyboardEvent keyboardEvent(WebInputEvent::Type, int modifiers, double timeStampSeconds, @@ -53,15 +60,27 @@ public: WebUChar unicodeCharacter, bool isSystemKey); - WEBKIT_EXPORT static WebMouseEvent mouseEvent(int x, - int y, + WEBKIT_EXPORT static WebMouseEvent mouseEvent(MouseEventType, + WebMouseEvent::Button, + double timeStampSeconds, int windowX, int windowY, - MouseEventType, - double timeStampSeconds, int modifiers, - int clickCount, - WebMouseEvent::Button = WebMouseEvent::ButtonLeft); + int clickCount); + + WEBKIT_EXPORT static WebMouseWheelEvent mouseWheelEvent(MouseWheelDirectionType, + double timeStampSeconds, + int windowX, + int windowY); + + WEBKIT_EXPORT static WebGestureEvent gestureEvent(WebInputEvent::Type, + double timeStampSeconds, + int x, + int y, + float deltaX, + float deltaY, + int modifiers); + }; } // namespace WebKit diff --git a/Source/WebKit/chromium/public/platform/WebBlobData.h b/Source/WebKit/chromium/public/platform/WebBlobData.h index 7fa32d3b6..e6c093e81 100644 --- a/Source/WebKit/chromium/public/platform/WebBlobData.h +++ b/Source/WebKit/chromium/public/platform/WebBlobData.h @@ -28,67 +28,4 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WebBlobData_h -#define WebBlobData_h - -#include "WebString.h" -#include "WebThreadSafeData.h" -#include "WebURL.h" - -#if WEBKIT_IMPLEMENTATION -namespace WebCore { class BlobData; } -namespace WTF { template <typename T> class PassOwnPtr; } -#endif - -namespace WebKit { - -class WebBlobDataPrivate; - -class WebBlobData { -public: - struct Item { - enum { TypeData, TypeFile, TypeBlob } type; - WebThreadSafeData data; - WebString filePath; - WebURL blobURL; - long long offset; - long long length; // -1 means go to the end of the file/blob. - double expectedModificationTime; // 0.0 means that the time is not set. - }; - - ~WebBlobData() { reset(); } - - WebBlobData() : m_private(0) { } - - WEBKIT_EXPORT void initialize(); - WEBKIT_EXPORT void reset(); - - bool isNull() const { return !m_private; } - - // Returns the number of items. - WEBKIT_EXPORT size_t itemCount() const; - - // Retrieves the values of the item at the given index. Returns false if - // index is out of bounds. - WEBKIT_EXPORT bool itemAt(size_t index, Item& result) const; - - WEBKIT_EXPORT WebString contentType() const; - - WEBKIT_EXPORT WebString contentDisposition() const; - -#if WEBKIT_IMPLEMENTATION - WebBlobData(const WTF::PassOwnPtr<WebCore::BlobData>&); - WebBlobData& operator=(const WTF::PassOwnPtr<WebCore::BlobData>&); - operator WTF::PassOwnPtr<WebCore::BlobData>(); -#endif - -private: -#if WEBKIT_IMPLEMENTATION - void assign(const WTF::PassOwnPtr<WebCore::BlobData>&); -#endif - WebBlobDataPrivate* m_private; -}; - -} // namespace WebKit - -#endif // WebBlobData_h +#include "../../../../Platform/chromium/public/WebBlobData.h" diff --git a/Source/WebKit/chromium/public/platform/WebBlobRegistry.h b/Source/WebKit/chromium/public/platform/WebBlobRegistry.h index d882abad9..f5489df1a 100644 --- a/Source/WebKit/chromium/public/platform/WebBlobRegistry.h +++ b/Source/WebKit/chromium/public/platform/WebBlobRegistry.h @@ -28,31 +28,4 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WebBlobRegistry_h -#define WebBlobRegistry_h - -#include "WebCommon.h" - -namespace WebKit { - -class WebBlobData; -class WebURL; - -class WebBlobRegistry { -public: - WEBKIT_EXPORT static WebBlobRegistry* create(); - - virtual ~WebBlobRegistry() { } - - // Registers a blob URL referring to the specified blob data. - virtual void registerBlobURL(const WebURL&, WebBlobData&) = 0; - - // Registers a blob URL referring to the blob data identified by the specified srcURL. - virtual void registerBlobURL(const WebURL&, const WebURL& srcURL) = 0; - - virtual void unregisterBlobURL(const WebURL&) = 0; -}; - -} // namespace WebKit - -#endif // WebBlobRegistry_h +#include "../../../../Platform/chromium/public/WebBlobRegistry.h" diff --git a/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h b/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h index cc5571ea6..43282315f 100644 --- a/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h +++ b/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h @@ -50,9 +50,7 @@ namespace WebKit { class WebApplicationCacheHost; // FIXME: Does this belong in platform? class WebApplicationCacheHostClient; // FIXME: Does this belong in platform? -class WebBlobRegistry; class WebCookieJar; -class WebFileUtilities; class WebIDBFactory; // FIXME: Does this belong in platform? class WebIDBKey; // FIXME: Does this belong in platform? class WebMessagePortChannel; // FIXME: Does this belong in platform? @@ -61,14 +59,10 @@ class WebSandboxSupport; class WebSharedWorkerRepository; // FIXME: Does this belong in platform? class WebStorageNamespace; // FIXME: Does this belong in platform? class WebThemeEngine; -class WebWorkerRunLoop; // FIXME: Eventually all these API will need to move to WebKit::Platform. class WebKitPlatformSupport : public Platform { public: - // Must return non-null. - virtual WebFileUtilities* fileUtilities() { return 0; } - // May return null if sandbox support is not necessary virtual WebSandboxSupport* sandboxSupport() { return 0; } @@ -78,16 +72,16 @@ public: // May return null. virtual WebCookieJar* cookieJar() { return 0; } - // Blob ---------------------------------------------------------------- - - // Must return non-null. - virtual WebBlobRegistry* blobRegistry() { return 0; } - // DOM Storage -------------------------------------------------- // Return a LocalStorage namespace that corresponds to the following path. virtual WebStorageNamespace* createLocalStorageNamespace(const WebString& path, unsigned quota) { return 0; } + // DEPRECATED + virtual void dispatchStorageEvent(const WebString& key, const WebString& oldValue, + const WebString& newValue, const WebString& origin, + const WebURL& url, bool isLocalStorage) { } + // HTML5 Database ------------------------------------------------------ @@ -154,10 +148,6 @@ public: virtual WebSharedWorkerRepository* sharedWorkerRepository() { return 0; } // GPU ---------------------------------------------------------------- - // - // May return null if GPU is not supported. - // Returns newly allocated and initialized offscreen WebGraphicsContext3D instance. - virtual WebGraphicsContext3D* createOffscreenGraphicsContext3D(const WebGraphicsContext3D::Attributes&) { return 0; } // Returns true if the platform is capable of producing an offscreen context suitable for accelerating 2d canvas. // This will return false if the platform cannot promise that contexts will be preserved across operations like @@ -167,11 +157,6 @@ public: virtual bool canAccelerate2dCanvas() { return false; } - // WebWorker ---------------------------------------------------------- - - virtual void didStartWorkerRunLoop(const WebWorkerRunLoop&) { } - virtual void didStopWorkerRunLoop(const WebWorkerRunLoop&) { } - protected: ~WebKitPlatformSupport() { } }; |