diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:51:35 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:31 +0100 |
| commit | e7bbc0900fd93114f04d2690ce8eab67b784b8c8 (patch) | |
| tree | 4ddccfbcd09cf67984060411d0af2f2da3ed9c67 /WebCore/page/DOMWindow.h | |
| parent | f05b935882198ccf7d81675736e3aeb089c5113a (diff) | |
| download | external_webkit-e7bbc0900fd93114f04d2690ce8eab67b784b8c8.zip external_webkit-e7bbc0900fd93114f04d2690ce8eab67b784b8c8.tar.gz external_webkit-e7bbc0900fd93114f04d2690ce8eab67b784b8c8.tar.bz2 | |
Merge WebKit at r74534: Fix conflicts.
.gitignore - keep ours
Android.mk http://trac.webkit.org/changeset/74431
Parser.cpp http://trac.webkit.org/changeset/74377
ImageDecoder.cpp http://trac.webkit.org/changeset/73819
GraphicsContext.cpp http://trac.webkit.org/changeset/73729
ContextMenuItem.h http://trac.webkit.org/changeset/74028
SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493
RenderView.h http://trac.webkit.org/changeset/74524
RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926
InlineTextBox.cpp http://trac.webkit.org/changeset/73548
SliderThumbElement.cpp
RenderSlider.cpp http://trac.webkit.org/changeset/74044
StyleRareInheritedData.cpp|h
CSSStyleSelector.cpp
CSSParser.cpp http://trac.webkit.org/changeset/73219
RenderBox.h http://trac.webkit.org/changeset/73385
FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426
ResourceLoader.cpp http://trac.webkit.org/changeset/74453
DOMWindow.cpp|h http://trac.webkit.org/changeset/73829
HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476
V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994
RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926
Remove loader.cpp http://trac.webkit.org/changeset/74049
Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f
Diffstat (limited to 'WebCore/page/DOMWindow.h')
| -rw-r--r-- | WebCore/page/DOMWindow.h | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h index 5c1f680..4889a13 100644 --- a/WebCore/page/DOMWindow.h +++ b/WebCore/page/DOMWindow.h @@ -203,27 +203,8 @@ namespace WebCore { PassRefPtr<CSSRuleList> getMatchedCSSRules(Element*, const String& pseudoElt, bool authorOnly = true) const; double devicePixelRatio() const; -<<<<<<< HEAD - PassRefPtr<WebKitPoint> webkitConvertPointFromPageToNode(Node* node, const WebKitPoint* p) const; - PassRefPtr<WebKitPoint> webkitConvertPointFromNodeToPage(Node* node, const WebKitPoint* p) const; - -#if ENABLE(DATABASE) - // HTML 5 client-side database - PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&); -#endif - -#if ENABLE(DOM_STORAGE) - // HTML 5 key/value storage - Storage* sessionStorage(ExceptionCode&) const; - Storage* localStorage(ExceptionCode&) const; -#ifdef ANDROID - void clearDOMStorage(); -#endif -#endif -======= PassRefPtr<WebKitPoint> webkitConvertPointFromPageToNode(Node*, const WebKitPoint*) const; PassRefPtr<WebKitPoint> webkitConvertPointFromNodeToPage(Node*, const WebKitPoint*) const; ->>>>>>> webkit.org at r74534 (trunk) Console* console() const; @@ -379,6 +360,9 @@ namespace WebCore { Storage* localStorage(ExceptionCode&) const; Storage* optionalSessionStorage() const { return m_sessionStorage.get(); } Storage* optionalLocalStorage() const { return m_localStorage.get(); } +#ifdef ANDROID + void clearDOMStorage(); +#endif #endif #if ENABLE(FILE_SYSTEM) |