diff options
| -rw-r--r-- | webkit/pending/DerivedSources.make | 7 | ||||
| -rw-r--r-- | webkit/pending/Document.cpp | 10 | ||||
| -rw-r--r-- | webkit/pending/GlobalHistory.h | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/webkit/pending/DerivedSources.make b/webkit/pending/DerivedSources.make index 4f15083..00a65ff 100644 --- a/webkit/pending/DerivedSources.make +++ b/webkit/pending/DerivedSources.make @@ -43,7 +43,10 @@ VPATH = \ ifeq ($(OS),MACOS) all : \ - CharsetData.cpp \ + CharsetData.cpp +endif + +# we don't want to generate objC bindings \ DOMAbstractView.h \ DOMAttr.h \ DOMCDATASection.h \ @@ -300,7 +303,7 @@ all : \ DOMWheelEvent.h \ DOMXPathExpression.h \ DOMXPathNSResolver.h \ - DOMXPathResult.h + DOMXPathResult.h \ endif all : \ diff --git a/webkit/pending/Document.cpp b/webkit/pending/Document.cpp index fb4ddf4..c607b5e 100644 --- a/webkit/pending/Document.cpp +++ b/webkit/pending/Document.cpp @@ -34,7 +34,6 @@ #include "ClassNodeList.h" #include "Comment.h" #include "CookieJar.h" -#include "Database.h" #include "DOMImplementation.h" #include "DocLoader.h" #include "DocumentFragment.h" @@ -112,6 +111,7 @@ #include "JSBridge.h" #if ENABLE(DATABASE) +#include "Database.h" #include "DatabaseThread.h" #endif @@ -138,6 +138,12 @@ #include "TimeScheduler.h" #endif +#if defined(__APPLE__) +// we need to be PLATFORM(CHROME) for this file, even if we're not building +// that particular target, for the a11y ifdefs. +#define WTF_PLATFORM_CHROME 1 +#endif + using namespace std; using namespace WTF; using namespace Unicode; @@ -2505,7 +2511,7 @@ bool Document::setFocusedNode(PassRefPtr<Node> newFocusedNode) } } -#if PLATFORM(MAC) +#if PLATFORM(MAC) && !PLATFORM(CHROME) if (!focusChangeBlocked && m_focusedNode && AXObjectCache::accessibilityEnabled()) axObjectCache()->handleFocusedUIElementChanged(); #endif diff --git a/webkit/pending/GlobalHistory.h b/webkit/pending/GlobalHistory.h index 08bb332..04338fb 100644 --- a/webkit/pending/GlobalHistory.h +++ b/webkit/pending/GlobalHistory.h @@ -28,6 +28,8 @@ #include <wtf/unicode/Unicode.h> +class Document; + namespace WebCore { bool historyContains(const UChar* characters, unsigned length, |