diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 20:16:57 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 20:16:57 +0000 |
| commit | 4f5025c94935842bbbe68131de009dc63dd8fb3f (patch) | |
| tree | a681fb2a6d7ff4a9833c266e83522ce1974b2cd0 /webkit/pending/Document.cpp | |
| parent | 301415ea99531af12cf34568c908fdbdd128bcda (diff) | |
| download | chromium_src-4f5025c94935842bbbe68131de009dc63dd8fb3f.zip chromium_src-4f5025c94935842bbbe68131de009dc63dd8fb3f.tar.gz chromium_src-4f5025c94935842bbbe68131de009dc63dd8fb3f.tar.bz2 | |
Changes to pending to get WebCore to compile on linux. This
doesn't enable it yet since there are more changes to WebKit
that we need from the merge. Once the merge lands, pending
will probably be clobbered, so this is temporary to allow us
to keep moving forward.
Go ahead and switch from PLATFORM_CHROME to PLATFORM_CHROMIUM
and try to change all the places in the mac code.
This change includes bits from http://codereview.chromium.org/228
which is by Seo Sanghyeon.
Everything still compiles on Windows.
Review URL: http://codereview.chromium.org/1201
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/pending/Document.cpp')
| -rw-r--r-- | webkit/pending/Document.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/pending/Document.cpp b/webkit/pending/Document.cpp index 14e4c91..657664e 100644 --- a/webkit/pending/Document.cpp +++ b/webkit/pending/Document.cpp @@ -139,9 +139,9 @@ #endif #if defined(__APPLE__) -// we need to be PLATFORM(CHROME) for this file, even if we're not building +// we need to be PLATFORM(CHROMIUM) for this file, even if we're not building // that particular target, for the a11y ifdefs. -#define WTF_PLATFORM_CHROME 1 +#define WTF_PLATFORM_CHROMIUM 1 #endif using namespace std; @@ -274,12 +274,12 @@ Document::Document(DOMImplementation* impl, Frame* frame, bool isXHTML) , m_titleSetExplicitly(false) , m_imageLoadEventTimer(this, &Document::imageLoadEventTimerFired) , m_updateFocusAppearanceTimer(this, &Document::updateFocusAppearanceTimerFired) - , m_dominantScript(USCRIPT_INVALID_CODE) #if ENABLE(XSLT) , m_transformSource(0) #endif , m_xmlVersion("1.0") , m_xmlStandalone(false) + , m_dominantScript(USCRIPT_INVALID_CODE) #if ENABLE(XBL) , m_bindingManager(new XBLBindingManager(this)) #endif @@ -2511,7 +2511,7 @@ bool Document::setFocusedNode(PassRefPtr<Node> newFocusedNode) } } -#if PLATFORM(MAC) && !PLATFORM(CHROME) +#if PLATFORM(MAC) && !PLATFORM(CHROMIUM) if (!focusChangeBlocked && m_focusedNode && AXObjectCache::accessibilityEnabled()) axObjectCache()->handleFocusedUIElementChanged(); #endif |