WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-68779-20110925124530.patch (text/plain), 209.17 KB, created by
Adam Barth
on 2011-09-25 12:45:31 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Adam Barth
Created:
2011-09-25 12:45:31 PDT
Size:
209.17 KB
patch
obsolete
>Index: ChangeLog >=================================================================== >--- ChangeLog (revision 95922) >+++ ChangeLog (working copy) >@@ -1,3 +1,13 @@ >+2011-09-25 Adam Barth <abarth@webkit.org> >+ >+ Finish removing PLATFORM(BREWMP) by removing associated code >+ https://bugs.webkit.org/show_bug.cgi?id=68779 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Source/cmake/WebKitPackaging.cmake: >+ * wscript: >+ > 2011-09-25 Adam Barth <abarth@webkit.org> > > Remove PLATFORM(HAIKU) and associated code >Index: wscript >=================================================================== >--- wscript (revision 95922) >+++ wscript (working copy) >@@ -214,7 +214,7 @@ def build(bld): > TaskGen.task_gen.mappings['.m'] = TaskGen.task_gen.mappings['.cxx'] > > features = [Options.options.port.lower()] >- exclude_patterns = ['*AllInOne.cpp', '*Brew.cpp', '*CFNet.cpp', '*Chromium*.cpp', >+ exclude_patterns = ['*AllInOne.cpp', '*CFNet.cpp', '*Chromium*.cpp', > '*Efl.cpp', '*Gtk.cpp', '*Mac.cpp', '*None.cpp', '*Qt.cpp', '*Safari.cpp', > 'test*bindings.*', '*WinCE.cpp', "WebDOMCanvas*.cpp", "WebDOMSVG*.cpp"] > if Options.options.port == 'wx': >Index: Source/JavaScriptCore/ChangeLog >=================================================================== >--- Source/JavaScriptCore/ChangeLog (revision 95922) >+++ Source/JavaScriptCore/ChangeLog (working copy) >@@ -1,3 +1,28 @@ >+2011-09-25 Adam Barth <abarth@webkit.org> >+ >+ Finish removing PLATFORM(BREWMP) by removing associated code >+ https://bugs.webkit.org/show_bug.cgi?id=68779 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * JavaScriptCore.gyp/JavaScriptCore.gyp: >+ * JavaScriptCore.gypi: >+ * gyp/JavaScriptCore.gyp: >+ * wscript: >+ * wtf/FastMalloc.cpp: >+ (WTF::fastMallocSize): >+ * wtf/Vector.h: >+ * wtf/brew: Removed. >+ * wtf/brew/MainThreadBrew.cpp: Removed. >+ * wtf/brew/OwnPtrBrew.cpp: Removed. >+ * wtf/brew/RefPtrBrew.h: Removed. >+ * wtf/brew/ShellBrew.h: Removed. >+ * wtf/brew/StringBrew.cpp: Removed. >+ * wtf/brew/SystemMallocBrew.h: Removed. >+ * wtf/unicode/brew: Removed. >+ * wtf/unicode/brew/UnicodeBrew.cpp: Removed. >+ * wtf/unicode/brew/UnicodeBrew.h: Removed. >+ > 2011-09-25 Adam Barth <abarth@webkit.org> > > Remove PLATFORM(HAIKU) and associated code >Index: Source/JavaScriptCore/JavaScriptCore.gypi >=================================================================== >--- Source/JavaScriptCore/JavaScriptCore.gypi (revision 95922) >+++ Source/JavaScriptCore/JavaScriptCore.gypi (working copy) >@@ -629,12 +629,6 @@ > 'wtf/ThreadingWin.cpp', > 'wtf/TypeTraits.cpp', > 'wtf/WTFThreadData.cpp', >- 'wtf/brew/MainThreadBrew.cpp', >- 'wtf/brew/OwnPtrBrew.cpp', >- 'wtf/brew/RefPtrBrew.h', >- 'wtf/brew/ShellBrew.h', >- 'wtf/brew/StringBrew.cpp', >- 'wtf/brew/SystemMallocBrew.h', > 'wtf/chromium/ChromiumThreading.h', > 'wtf/chromium/MainThreadChromium.cpp', > 'wtf/dtoa.cpp', >@@ -669,8 +663,6 @@ > 'wtf/unicode/ScriptCodesFromICU.h', > 'wtf/unicode/UTF8.cpp', > 'wtf/unicode/UnicodeMacrosFromICU.h', >- 'wtf/unicode/brew/UnicodeBrew.cpp', >- 'wtf/unicode/brew/UnicodeBrew.h', > 'wtf/unicode/glib/UnicodeGLib.cpp', > 'wtf/unicode/glib/UnicodeGLib.h', > 'wtf/unicode/icu/CollatorICU.cpp', >Index: Source/JavaScriptCore/wscript >=================================================================== >--- Source/JavaScriptCore/wscript (revision 95921) >+++ Source/JavaScriptCore/wscript (working copy) >@@ -34,8 +34,7 @@ def build(bld): > import Options > > jscore_excludes = ['jsc.cpp', 'ExecutableAllocatorPosix.cpp'] >- jscore_excludes.extend(get_excludes(jscore_dir, ['*Brew.cpp', '*CF.cpp', '*Symbian.cpp'])) >- >+ jscore_excludes.extend(get_excludes(jscore_dir, ['*CF.cpp', '*Symbian.cpp'])) > jscore_excludes.extend(get_excludes(jscore_dir, ['*None.cpp'])) > > sources = [] >Index: Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp >=================================================================== >--- Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp (revision 95922) >+++ Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp (working copy) >@@ -125,7 +125,6 @@ > # ... Then include what we want. > ['include', '../wtf/'], > # FIXME: This is clearly not sustainable. >- ['exclude', '../wtf/brew'], > ['exclude', '../wtf/efl'], > ['exclude', '../wtf/gobject'], > ['exclude', '../wtf/gtk'], >@@ -134,7 +133,6 @@ > ['exclude', '../wtf/url'], > ['exclude', '../wtf/wince'], > ['exclude', '../wtf/wx'], >- ['exclude', '../wtf/unicode/brew'], > ['exclude', '../wtf/unicode/wince'], > ['exclude', '../wtf/unicode/glib'], > ['exclude', '../wtf/unicode/qt4'], >Index: Source/JavaScriptCore/gyp/JavaScriptCore.gyp >=================================================================== >--- Source/JavaScriptCore/gyp/JavaScriptCore.gyp (revision 95922) >+++ Source/JavaScriptCore/gyp/JavaScriptCore.gyp (working copy) >@@ -80,8 +80,7 @@ > ['exclude', '(?<!unicode)/icu/'], > ['exclude', 'os-win32/'], > ['exclude', 'qt/'], >- ['exclude', 'wtf/(brew|efl|gtk|qt|wince|wx)/'], >- ['exclude', 'wtf/unicode/brew/'], >+ ['exclude', 'wtf/(efl|gtk|qt|wince|wx)/'], > ['exclude', 'wtf/unicode/glib/'], > ['exclude', 'wtf/unicode/qt4/'], > ['exclude', 'wtf/unicode/wince/'], >Index: Source/JavaScriptCore/wtf/FastMalloc.cpp >=================================================================== >--- Source/JavaScriptCore/wtf/FastMalloc.cpp (revision 95921) >+++ Source/JavaScriptCore/wtf/FastMalloc.cpp (working copy) >@@ -385,7 +385,6 @@ size_t fastMallocSize(const void* p) > #elif OS(DARWIN) > return malloc_size(p); > #elif OS(WINDOWS) >- // Brew MP uses its own memory allocator, so _msize does not work on the Brew MP simulator. > return _msize(const_cast<void*>(p)); > #else > return 1; >Index: Source/JavaScriptCore/wtf/Vector.h >=================================================================== >--- Source/JavaScriptCore/wtf/Vector.h (revision 95921) >+++ Source/JavaScriptCore/wtf/Vector.h (working copy) >@@ -357,7 +357,7 @@ namespace WTF { > VectorBuffer(size_t capacity) > { > // Calling malloc(0) might take a lock and may actually do an >- // allocation on some systems (e.g. Brew). >+ // allocation on some systems. > if (capacity) > allocateBuffer(capacity); > } >Index: Source/JavaScriptCore/wtf/brew/MainThreadBrew.cpp >=================================================================== >--- Source/JavaScriptCore/wtf/brew/MainThreadBrew.cpp (revision 95921) >+++ Source/JavaScriptCore/wtf/brew/MainThreadBrew.cpp (working copy) >@@ -1,45 +0,0 @@ >-/* >- * Copyright (C) 2009 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * 3. Neither the name of Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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. >- */ >- >-#include "config.h" >-#include "MainThread.h" >- >-namespace WTF { >- >-void initializeMainThreadPlatform() >-{ >- // not implemented >-} >- >-void scheduleDispatchFunctionsOnMainThread() >-{ >- // not implemented >-} >- >-} // namespace WTF >- >Index: Source/JavaScriptCore/wtf/brew/OwnPtrBrew.cpp >=================================================================== >--- Source/JavaScriptCore/wtf/brew/OwnPtrBrew.cpp (revision 95921) >+++ Source/JavaScriptCore/wtf/brew/OwnPtrBrew.cpp (working copy) >@@ -1,81 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "OwnPtr.h" >- >-#include <AEEBitmap.h> >-#include <AEEFile.h> >-#include <AEEIMemGroup.h> >-#include <AEEIMemSpace.h> >-#include <AEENet.h> >-#include <AEESSL.h> >-#include <AEEStdLib.h> >- >-namespace WTF { >- >-void deleteOwnedPtr(IFileMgr* ptr) >-{ >- if (ptr) >- IFILEMGR_Release(ptr); >-} >- >-void deleteOwnedPtr(IFile* ptr) >-{ >- if (ptr) >- IFILE_Release(ptr); >-} >- >-void deleteOwnedPtr(IBitmap* ptr) >-{ >- if (ptr) >- IBitmap_Release(ptr); >-} >- >-void deleteOwnedPtr(ISSL* ptr) >-{ >- if (ptr) >- ISSL_Release(ptr); >-} >- >-void deleteOwnedPtr(IMemGroup* ptr) >-{ >- if (ptr) >- IMemGroup_Release(ptr); >-} >- >-void deleteOwnedPtr(IMemSpace* ptr) >-{ >- if (ptr) >- IMemSpace_Release(ptr); >-} >- >-void deleteOwnedPtr(ISocket* ptr) >-{ >- if (ptr) >- ISOCKET_Release(ptr); >-} >- >-} >Index: Source/JavaScriptCore/wtf/brew/RefPtrBrew.h >=================================================================== >--- Source/JavaScriptCore/wtf/brew/RefPtrBrew.h (revision 95921) >+++ Source/JavaScriptCore/wtf/brew/RefPtrBrew.h (working copy) >@@ -1,59 +0,0 @@ >-/* >- * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. >- * Copyright (C) 2008 Collabora Ltd. >- * Copyright (C) 2009 Martin Robinson >- * Copyright (C) 2010 Company 100, Inc. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >- >-#ifndef RefPtrBrew_h >-#define RefPtrBrew_h >- >-#include "RefPtr.h" >-#include <AEEIBase.h> >- >-namespace WTF { >- >-// All Brew MP classes are derived from either IBase or IQI. >-template<> void refIfNotNull(IBase* ptr) >-{ >- if (LIKELY(ptr != 0)) >- IBase_AddRef(ptr); >-} >- >-template<> void derefIfNotNull(IBase* ptr) >-{ >- if (LIKELY(ptr != 0)) >- IBase_Release(ptr); >-} >- >-template<> void refIfNotNull(IQI* ptr) >-{ >- if (LIKELY(ptr != 0)) >- IQI_AddRef(ptr); >-} >- >-template<> void derefIfNotNull(IQI* ptr) >-{ >- if (LIKELY(ptr != 0)) >- IQI_Release(ptr); >-} >- >-} // namespace WTF >- >-#endif // RefPtrBrew_h >Index: Source/JavaScriptCore/wtf/brew/ShellBrew.h >=================================================================== >--- Source/JavaScriptCore/wtf/brew/ShellBrew.h (revision 95921) >+++ Source/JavaScriptCore/wtf/brew/ShellBrew.h (working copy) >@@ -1,70 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100 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: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * 3. Neither the name of Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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 ShellBrew_h >-#define ShellBrew_h >- >-#include <AEEAppGen.h> >-#include <AEEStdLib.h> >- >-#include <wtf/Assertions.h> >-#include <wtf/PassOwnPtr.h> >-#include <wtf/RefPtr.h> >- >-namespace WTF { >- >-template <typename T> >-static inline PassOwnPtr<T> createInstance(AEECLSID cls) >-{ >- T* instance = 0; >- >- IShell* shell = reinterpret_cast<AEEApplet*>(GETAPPINSTANCE())->m_pIShell; >- ISHELL_CreateInstance(shell, cls, reinterpret_cast<void**>(&instance)); >- ASSERT(instance); >- >- return instance; >-} >- >-template <typename T> >-static inline RefPtr<T> createRefPtrInstance(AEECLSID cls) >-{ >- T* instance = 0; >- >- IShell* shell = reinterpret_cast<AEEApplet*>(GETAPPINSTANCE())->m_pIShell; >- ISHELL_CreateInstance(shell, cls, reinterpret_cast<void**>(&instance)); >- ASSERT(instance); >- >- return adoptRef(instance); >-} >- >-} // namespace WTF >- >-using WTF::createInstance; >-using WTF::createRefPtrInstance; >- >-#endif // ShellBrew_h >Index: Source/JavaScriptCore/wtf/brew/StringBrew.cpp >=================================================================== >--- Source/JavaScriptCore/wtf/brew/StringBrew.cpp (revision 95921) >+++ Source/JavaScriptCore/wtf/brew/StringBrew.cpp (working copy) >@@ -1,43 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "PlatformString.h" >- >-#include <AEEstd.h> >- >-namespace WTF { >- >-// String conversions >-String::String(const AECHAR* string) >-{ >- // It is safe to cast AECHAR to UChar as both of them use 16 bits representation. >- const UChar* str = reinterpret_cast<const UChar*>(string); >- const size_t len = std_wstrlen(string); >- >- m_impl = StringImpl::create(str, len); >-} >- >-} // namespace WTF >Index: Source/JavaScriptCore/wtf/brew/SystemMallocBrew.h >=================================================================== >--- Source/JavaScriptCore/wtf/brew/SystemMallocBrew.h (revision 95921) >+++ Source/JavaScriptCore/wtf/brew/SystemMallocBrew.h (working copy) >@@ -1,65 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * 3. Neither the name of Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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 SystemMallocBrew_h >-#define SystemMallocBrew_h >- >-#include <AEEStdLib.h> >- >-static inline void* mallocBrew(size_t n) >-{ >- // By default, memory allocated using MALLOC() is initialized >- // to zero. This behavior can be disabled by performing a bitwise >- // OR of the flag ALLOC_NO_ZMEM with the dwSize parameter. >- return MALLOC(n | ALLOC_NO_ZMEM); >-} >- >-static inline void* callocBrew(size_t numElements, size_t elementSize) >-{ >- return MALLOC(numElements * elementSize); >-} >- >-static inline void freeBrew(void* p) >-{ >- return FREE(p); >-} >- >-static inline void* reallocBrew(void* p, size_t n) >-{ >- return REALLOC(p, n | ALLOC_NO_ZMEM); >-} >- >-// Use MALLOC macro instead of the standard malloc function. >-// Although RVCT provides malloc, we can't use it in BREW >-// because the loader does not initialize the base address properly. >-#define malloc(n) mallocBrew(n) >-#define calloc(n, s) callocBrew(n, s) >-#define realloc(p, n) reallocBrew(p, n) >-#define free(p) freeBrew(p) >- >-#endif // SystemMallocBrew_h >Index: Source/JavaScriptCore/wtf/unicode/brew/UnicodeBrew.cpp >=================================================================== >--- Source/JavaScriptCore/wtf/unicode/brew/UnicodeBrew.cpp (revision 95921) >+++ Source/JavaScriptCore/wtf/unicode/brew/UnicodeBrew.cpp (working copy) >@@ -1,181 +0,0 @@ >-/* >- * Copyright (C) 2006 George Staikos <staikos@kde.org> >- * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com> >- * Copyright (C) 2007-2009 Torch Mobile, Inc. >- * Copyright (C) 2010 Company 100, Inc. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- */ >- >-#include "config.h" >-#include "UnicodeBrew.h" >- >-#include <wchar.h> >-#include <wctype.h> >- >-namespace WTF { >-namespace Unicode { >- >-UChar toLower(UChar c) >-{ >- return towlower(c); >-} >- >-UChar toUpper(UChar c) >-{ >- return towupper(c); >-} >- >-UChar foldCase(UChar c) >-{ >- return towlower(c); >-} >- >-bool isPrintableChar(UChar c) >-{ >- return !!iswprint(c); >-} >- >-bool isUpper(UChar c) >-{ >- return !!iswupper(c); >-} >- >-bool isLower(UChar c) >-{ >- return !!iswlower(c); >-} >- >-bool isDigit(UChar c) >-{ >- return !!iswdigit(c); >-} >- >-bool isPunct(UChar c) >-{ >- return !!iswpunct(c); >-} >- >-bool isAlphanumeric(UChar c) >-{ >- return !!iswalnum(c); >-} >- >-int toLower(UChar* result, int resultLength, const UChar* source, int sourceLength, bool* isError) >-{ >- const UChar* sourceIterator = source; >- const UChar* sourceEnd = source + sourceLength; >- UChar* resultIterator = result; >- UChar* resultEnd = result + resultLength; >- >- if (sourceLength <= resultLength) { >- while (sourceIterator < sourceEnd) >- *resultIterator++ = towlower(*sourceIterator++); >- } else { >- while (resultIterator < resultEnd) >- *resultIterator++ = towlower(*sourceIterator++); >- } >- >- int remainingCharacters = sourceIterator < sourceEnd ? sourceEnd - sourceIterator : 0; >- *isError = !!remainingCharacters; >- if (resultIterator < resultEnd) >- *resultIterator = 0; >- >- return (resultIterator - result) + remainingCharacters; >-} >- >-int toUpper(UChar* result, int resultLength, const UChar* source, int sourceLength, bool* isError) >-{ >- const UChar* sourceIterator = source; >- const UChar* sourceEnd = source + sourceLength; >- UChar* resultIterator = result; >- UChar* resultEnd = result + resultLength; >- >- if (sourceLength <= resultLength) { >- while (sourceIterator < sourceEnd) >- *resultIterator++ = towupper(*sourceIterator++); >- } else { >- while (resultIterator < resultEnd) >- *resultIterator++ = towupper(*sourceIterator++); >- } >- >- int remainingCharacters = sourceIterator < sourceEnd ? sourceEnd - sourceIterator : 0; >- *isError = !!remainingCharacters; >- if (resultIterator < resultEnd) >- *resultIterator = 0; >- >- return (resultIterator - result) + remainingCharacters; >-} >- >-int foldCase(UChar* result, int resultLength, const UChar* source, int sourceLength, bool* isError) >-{ >- *isError = false; >- if (resultLength < sourceLength) { >- *isError = true; >- return sourceLength; >- } >- for (int i = 0; i < sourceLength; ++i) >- result[i] = foldCase(source[i]); >- return sourceLength; >-} >- >-UChar toTitleCase(UChar c) >-{ >- return towupper(c); >-} >- >-Direction direction(UChar32 c) >-{ >- return static_cast<Direction>(ICU::direction(c)); >-} >- >-CharCategory category(unsigned int c) >-{ >- return static_cast<CharCategory>(TO_MASK((int8_t) ICU::category(c))); >-} >- >-DecompositionType decompositionType(UChar32 c) >-{ >- return static_cast<DecompositionType>(ICU::decompositionType(c)); >-} >- >-unsigned char combiningClass(UChar32 c) >-{ >- return ICU::combiningClass(c); >-} >- >-UChar mirroredChar(UChar32 c) >-{ >- return ICU::mirroredChar(c); >-} >- >-int digitValue(UChar c) >-{ >- return ICU::digitValue(c); >-} >- >-bool isSpace(UChar c) >-{ >- return !!iswspace(c); >-} >- >-bool isLetter(UChar c) >-{ >- return !!iswalpha(c); >-} >- >-} // namespace Unicode >-} // namespace WTF >Index: Source/JavaScriptCore/wtf/unicode/brew/UnicodeBrew.h >=================================================================== >--- Source/JavaScriptCore/wtf/unicode/brew/UnicodeBrew.h (revision 95921) >+++ Source/JavaScriptCore/wtf/unicode/brew/UnicodeBrew.h (working copy) >@@ -1,195 +0,0 @@ >-/* >- * Copyright (C) 2006 George Staikos <staikos@kde.org> >- * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com> >- * Copyright (C) 2007 Apple Computer, Inc. All rights reserved. >- * Copyright (C) 2007-2009 Torch Mobile, Inc. >- * Copyright (C) 2010 Company 100, Inc. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >- >-#ifndef UnicodeBrew_h >-#define UnicodeBrew_h >- >-#include "ScriptCodesFromICU.h" >-#include "UnicodeFromICU.h" >-#include "UnicodeMacrosFromICU.h" >- >-namespace WTF { >-namespace Unicode { >- >-enum Direction { >- LeftToRight = ICU::U_LEFT_TO_RIGHT, >- RightToLeft = ICU::U_RIGHT_TO_LEFT, >- EuropeanNumber = ICU::U_EUROPEAN_NUMBER, >- EuropeanNumberSeparator = ICU::U_EUROPEAN_NUMBER_SEPARATOR, >- EuropeanNumberTerminator = ICU::U_EUROPEAN_NUMBER_TERMINATOR, >- ArabicNumber = ICU::U_ARABIC_NUMBER, >- CommonNumberSeparator = ICU::U_COMMON_NUMBER_SEPARATOR, >- BlockSeparator = ICU::U_BLOCK_SEPARATOR, >- SegmentSeparator = ICU::U_SEGMENT_SEPARATOR, >- WhiteSpaceNeutral = ICU::U_WHITE_SPACE_NEUTRAL, >- OtherNeutral = ICU::U_OTHER_NEUTRAL, >- LeftToRightEmbedding = ICU::U_LEFT_TO_RIGHT_EMBEDDING, >- LeftToRightOverride = ICU::U_LEFT_TO_RIGHT_OVERRIDE, >- RightToLeftArabic = ICU::U_RIGHT_TO_LEFT_ARABIC, >- RightToLeftEmbedding = ICU::U_RIGHT_TO_LEFT_EMBEDDING, >- RightToLeftOverride = ICU::U_RIGHT_TO_LEFT_OVERRIDE, >- PopDirectionalFormat = ICU::U_POP_DIRECTIONAL_FORMAT, >- NonSpacingMark = ICU::U_DIR_NON_SPACING_MARK, >- BoundaryNeutral = ICU::U_BOUNDARY_NEUTRAL >-}; >- >-enum DecompositionType { >- DecompositionNone = ICU::U_DT_NONE, >- DecompositionCanonical = ICU::U_DT_CANONICAL, >- DecompositionCompat = ICU::U_DT_COMPAT, >- DecompositionCircle = ICU::U_DT_CIRCLE, >- DecompositionFinal = ICU::U_DT_FINAL, >- DecompositionFont = ICU::U_DT_FONT, >- DecompositionFraction = ICU::U_DT_FRACTION, >- DecompositionInitial = ICU::U_DT_INITIAL, >- DecompositionIsolated = ICU::U_DT_ISOLATED, >- DecompositionMedial = ICU::U_DT_MEDIAL, >- DecompositionNarrow = ICU::U_DT_NARROW, >- DecompositionNoBreak = ICU::U_DT_NOBREAK, >- DecompositionSmall = ICU::U_DT_SMALL, >- DecompositionSquare = ICU::U_DT_SQUARE, >- DecompositionSub = ICU::U_DT_SUB, >- DecompositionSuper = ICU::U_DT_SUPER, >- DecompositionVertical = ICU::U_DT_VERTICAL, >- DecompositionWide = ICU::U_DT_WIDE, >-}; >- >-enum CharCategory { >- NoCategory = 0, >- Other_NotAssigned = TO_MASK(ICU::U_GENERAL_OTHER_TYPES), >- Letter_Uppercase = TO_MASK(ICU::U_UPPERCASE_LETTER), >- Letter_Lowercase = TO_MASK(ICU::U_LOWERCASE_LETTER), >- Letter_Titlecase = TO_MASK(ICU::U_TITLECASE_LETTER), >- Letter_Modifier = TO_MASK(ICU::U_MODIFIER_LETTER), >- Letter_Other = TO_MASK(ICU::U_OTHER_LETTER), >- >- Mark_NonSpacing = TO_MASK(ICU::U_NON_SPACING_MARK), >- Mark_Enclosing = TO_MASK(ICU::U_ENCLOSING_MARK), >- Mark_SpacingCombining = TO_MASK(ICU::U_COMBINING_SPACING_MARK), >- >- Number_DecimalDigit = TO_MASK(ICU::U_DECIMAL_DIGIT_NUMBER), >- Number_Letter = TO_MASK(ICU::U_LETTER_NUMBER), >- Number_Other = TO_MASK(ICU::U_OTHER_NUMBER), >- >- Separator_Space = TO_MASK(ICU::U_SPACE_SEPARATOR), >- Separator_Line = TO_MASK(ICU::U_LINE_SEPARATOR), >- Separator_Paragraph = TO_MASK(ICU::U_PARAGRAPH_SEPARATOR), >- >- Other_Control = TO_MASK(ICU::U_CONTROL_CHAR), >- Other_Format = TO_MASK(ICU::U_FORMAT_CHAR), >- Other_PrivateUse = TO_MASK(ICU::U_PRIVATE_USE_CHAR), >- Other_Surrogate = TO_MASK(ICU::U_SURROGATE), >- >- Punctuation_Dash = TO_MASK(ICU::U_DASH_PUNCTUATION), >- Punctuation_Open = TO_MASK(ICU::U_START_PUNCTUATION), >- Punctuation_Close = TO_MASK(ICU::U_END_PUNCTUATION), >- Punctuation_Connector = TO_MASK(ICU::U_CONNECTOR_PUNCTUATION), >- Punctuation_Other = TO_MASK(ICU::U_OTHER_PUNCTUATION), >- >- Symbol_Math = TO_MASK(ICU::U_MATH_SYMBOL), >- Symbol_Currency = TO_MASK(ICU::U_CURRENCY_SYMBOL), >- Symbol_Modifier = TO_MASK(ICU::U_MODIFIER_SYMBOL), >- Symbol_Other = TO_MASK(ICU::U_OTHER_SYMBOL), >- >- Punctuation_InitialQuote = TO_MASK(ICU::U_INITIAL_PUNCTUATION), >- Punctuation_FinalQuote = TO_MASK(ICU::U_FINAL_PUNCTUATION) >-}; >- >-UChar foldCase(UChar); >- >-int foldCase(UChar* result, int resultLength, const UChar* source, int sourceLength, bool* isError); >- >-int toLower(UChar* result, int resultLength, const UChar* source, int sourceLength, bool* isError); >- >-UChar toUpper(UChar); >-UChar toLower(UChar); >- >-bool isUpper(UChar); >- >-int toUpper(UChar* result, int resultLength, const UChar* source, int sourceLength, bool* isError); >- >-UChar toTitleCase(UChar); >- >-inline bool isArabicChar(UChar32 c) >-{ >- return c >= 0x0600 && c <= 0x06FF; >-} >- >-bool isAlphanumeric(UChar); >- >-CharCategory category(unsigned int); >- >-inline bool isSeparatorSpace(UChar c) >-{ >- return category(c) == Separator_Space; >-} >- >-bool isPrintableChar(UChar); >- >-bool isDigit(UChar); >- >-bool isPunct(UChar); >- >-inline bool hasLineBreakingPropertyComplexContext(UChar32) >-{ >- // FIXME: implement! >- return false; >-} >- >-inline bool hasLineBreakingPropertyComplexContextOrIdeographic(UChar32 c) >-{ >- // FIXME >- return false; >-} >- >-UChar mirroredChar(UChar32); >- >-Direction direction(UChar32); >- >-bool isLower(UChar); >- >-int digitValue(UChar); >- >-unsigned char combiningClass(UChar32); >- >-DecompositionType decompositionType(UChar32); >- >-inline int umemcasecmp(const UChar* a, const UChar* b, int len) >-{ >- for (int i = 0; i < len; ++i) { >- UChar c1 = foldCase(a[i]); >- UChar c2 = foldCase(b[i]); >- if (c1 != c2) >- return c1 - c2; >- } >- return 0; >-} >- >-bool isSpace(UChar); >-bool isLetter(UChar); >- >-} // namespace Unicode >-} // namespace WTF >- >-#endif >Index: Source/WebCore/ChangeLog >=================================================================== >--- Source/WebCore/ChangeLog (revision 95922) >+++ Source/WebCore/ChangeLog (working copy) >@@ -1,3 +1,76 @@ >+2011-09-25 Adam Barth <abarth@webkit.org> >+ >+ Finish removing PLATFORM(BREWMP) by removing associated code >+ https://bugs.webkit.org/show_bug.cgi?id=68779 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ When Geoffrey Garen removed PLATFORM(BREWMP) in >+ http://trac.webkit.org/changeset/95555, he did not remove all the >+ associated code. This completes the work started in r95555 by removing >+ all the code assoicated with PLATFORM(BREWMP). >+ >+ * WebCore.gyp/WebCore.gyp: >+ * WebCore.gypi: >+ * bindings/js/ScriptControllerBrew.cpp: Removed. >+ * editing/brew: Removed. >+ * editing/brew/EditorBrew.cpp: Removed. >+ * gyp/WebCore.gyp: >+ * page/brew: Removed. >+ * page/brew/ChromeClientBrew.h: Removed. >+ * page/brew/DragControllerBrew.cpp: Removed. >+ * page/brew/EventHandlerBrew.cpp: Removed. >+ * page/brew/FrameBrew.cpp: Removed. >+ * platform/brew: Removed. >+ * platform/brew/ClipboardBrew.cpp: Removed. >+ * platform/brew/ClipboardBrew.h: Removed. >+ * platform/brew/ContextMenuBrew.cpp: Removed. >+ * platform/brew/ContextMenuItemBrew.cpp: Removed. >+ * platform/brew/CursorBrew.cpp: Removed. >+ * platform/brew/DragDataBrew.cpp: Removed. >+ * platform/brew/EventLoopBrew.cpp: Removed. >+ * platform/brew/FileSystemBrew.cpp: Removed. >+ * platform/brew/KURLBrew.cpp: Removed. >+ * platform/brew/LanguageBrew.cpp: Removed. >+ * platform/brew/LocalizedStringsBrew.cpp: Removed. >+ * platform/brew/LoggingBrew.cpp: Removed. >+ * platform/brew/MIMETypeRegistryBrew.cpp: Removed. >+ * platform/brew/PasteboardBrew.cpp: Removed. >+ * platform/brew/PlatformKeyboardEventBrew.cpp: Removed. >+ * platform/brew/PlatformMouseEventBrew.cpp: Removed. >+ * platform/brew/PlatformTouchEventBrew.cpp: Removed. >+ * platform/brew/PlatformTouchPointBrew.cpp: Removed. >+ * platform/brew/PopupMenuBrew.cpp: Removed. >+ * platform/brew/PopupMenuBrew.h: Removed. >+ * platform/brew/SSLKeyGeneratorBrew.cpp: Removed. >+ * platform/brew/ScreenBrew.cpp: Removed. >+ * platform/brew/ScrollbarThemeBrew.cpp: Removed. >+ * platform/brew/ScrollbarThemeBrew.h: Removed. >+ * platform/brew/SearchPopupMenuBrew.cpp: Removed. >+ * platform/brew/SearchPopupMenuBrew.h: Removed. >+ * platform/brew/SharedBufferBrew.cpp: Removed. >+ * platform/brew/SharedTimerBrew.cpp: Removed. >+ * platform/brew/SoundBrew.cpp: Removed. >+ * platform/brew/SystemTimeBrew.cpp: Removed. >+ * platform/brew/TemporaryLinkStubs.cpp: Removed. >+ * platform/brew/WidgetBrew.cpp: Removed. >+ * platform/graphics/brew: Removed. >+ * platform/graphics/brew/IconBrew.cpp: Removed. >+ * platform/graphics/brew/ImageBrew.cpp: Removed. >+ * platform/graphics/brew/IntPointBrew.cpp: Removed. >+ * platform/graphics/brew/IntSizeBrew.cpp: Removed. >+ * platform/network/brew: Removed. >+ * platform/network/brew/DNSBrew.cpp: Removed. >+ * platform/network/brew/SocketStreamError.h: Removed. >+ * platform/network/brew/SocketStreamHandle.h: Removed. >+ * platform/network/brew/SocketStreamHandleBrew.cpp: Removed. >+ * platform/network/brew/SocketStreamHandlePrivate.h: Removed. >+ * platform/text/brew: Removed. >+ * platform/text/brew/TextBoundariesBrew.cpp: Removed. >+ * platform/text/brew/TextBreakIteratorBrew.cpp: Removed. >+ * platform/text/brew/TextCodecBrew.cpp: Removed. >+ * platform/text/brew/TextCodecBrew.h: Removed. >+ > 2011-09-25 Adam Barth <abarth@webkit.org> > > Remove PLATFORM(HAIKU) and associated code >Index: Source/WebCore/WebCore.gypi >=================================================================== >--- Source/WebCore/WebCore.gypi (revision 95922) >+++ Source/WebCore/WebCore.gypi (working copy) >@@ -1941,7 +1941,6 @@ > 'bindings/js/ScriptCallStackFactory.cpp', > 'bindings/js/ScriptCallStackFactory.h', > 'bindings/js/ScriptController.cpp', >- 'bindings/js/ScriptControllerBrew.cpp', > 'bindings/js/ScriptControllerEfl.cpp', > 'bindings/js/ScriptControllerGtk.cpp', > 'bindings/js/ScriptControllerMac.mm', >@@ -2525,7 +2524,6 @@ > 'editing/VisibleSelection.cpp', > 'editing/WrapContentsInDummySpanCommand.cpp', > 'editing/WrapContentsInDummySpanCommand.h', >- 'editing/brew/EditorBrew.cpp', > 'editing/chromium/EditorChromium.cpp', > 'editing/chromium/FrameSelectionChromium.cpp', > 'editing/gtk/FrameSelectionGtk.cpp', >@@ -2961,10 +2959,6 @@ > 'page/animation/ImplicitAnimation.h', > 'page/animation/KeyframeAnimation.cpp', > 'page/animation/KeyframeAnimation.h', >- 'page/brew/ChromeClientBrew.h', >- 'page/brew/DragControllerBrew.cpp', >- 'page/brew/EventHandlerBrew.cpp', >- 'page/brew/FrameBrew.cpp', > 'page/chromium/ChromeClientChromium.h', > 'page/chromium/DragControllerChromium.cpp', > 'page/chromium/EventHandlerChromium.cpp', >@@ -3145,38 +3139,6 @@ > 'platform/audio/ffmpeg/FFTFrameFFMPEG.cpp', > 'platform/audio/mac/FFTFrameMac.cpp', > 'platform/audio/mkl/FFTFrameMKL.cpp', >- 'platform/brew/ClipboardBrew.cpp', >- 'platform/brew/ClipboardBrew.h', >- 'platform/brew/ContextMenuBrew.cpp', >- 'platform/brew/ContextMenuItemBrew.cpp', >- 'platform/brew/CursorBrew.cpp', >- 'platform/brew/DragDataBrew.cpp', >- 'platform/brew/EventLoopBrew.cpp', >- 'platform/brew/FileSystemBrew.cpp', >- 'platform/brew/KURLBrew.cpp', >- 'platform/brew/LanguageBrew.cpp', >- 'platform/brew/LocalizedStringsBrew.cpp', >- 'platform/brew/LoggingBrew.cpp', >- 'platform/brew/MIMETypeRegistryBrew.cpp', >- 'platform/brew/PasteboardBrew.cpp', >- 'platform/brew/PlatformKeyboardEventBrew.cpp', >- 'platform/brew/PlatformMouseEventBrew.cpp', >- 'platform/brew/PlatformTouchEventBrew.cpp', >- 'platform/brew/PlatformTouchPointBrew.cpp', >- 'platform/brew/PopupMenuBrew.cpp', >- 'platform/brew/PopupMenuBrew.h', >- 'platform/brew/SSLKeyGeneratorBrew.cpp', >- 'platform/brew/ScreenBrew.cpp', >- 'platform/brew/ScrollbarThemeBrew.cpp', >- 'platform/brew/ScrollbarThemeBrew.h', >- 'platform/brew/SearchPopupMenuBrew.cpp', >- 'platform/brew/SearchPopupMenuBrew.h', >- 'platform/brew/SharedBufferBrew.cpp', >- 'platform/brew/SharedTimerBrew.cpp', >- 'platform/brew/SoundBrew.cpp', >- 'platform/brew/SystemTimeBrew.cpp', >- 'platform/brew/TemporaryLinkStubs.cpp', >- 'platform/brew/WidgetBrew.cpp', > 'platform/cf/BinaryPropertyList.cpp', > 'platform/cf/FileSystemCF.cpp', > 'platform/cf/KURLCFNet.cpp', >@@ -3369,10 +3331,6 @@ > 'platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h', > 'platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h', > 'platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm', >- 'platform/graphics/brew/IconBrew.cpp', >- 'platform/graphics/brew/ImageBrew.cpp', >- 'platform/graphics/brew/IntPointBrew.cpp', >- 'platform/graphics/brew/IntSizeBrew.cpp', > 'platform/graphics/ca/GraphicsLayerCA.cpp', > 'platform/graphics/ca/GraphicsLayerCA.h', > 'platform/graphics/ca/PlatformCAAnimation.h', >@@ -4112,11 +4070,6 @@ > 'platform/network/SocketStreamHandleBase.cpp', > 'platform/network/SocketStreamHandleBase.h', > 'platform/network/SocketStreamHandleClient.h', >- 'platform/network/brew/DNSBrew.cpp', >- 'platform/network/brew/SocketStreamError.h', >- 'platform/network/brew/SocketStreamHandle.h', >- 'platform/network/brew/SocketStreamHandleBrew.cpp', >- 'platform/network/brew/SocketStreamHandlePrivate.h', > 'platform/network/cf/AuthenticationCF.cpp', > 'platform/network/cf/AuthenticationCF.h', > 'platform/network/cf/CookieJarCFNet.cpp', >@@ -4314,10 +4267,6 @@ > 'platform/text/TextEncodingRegistry.cpp', > 'platform/text/TextStream.cpp', > 'platform/text/UnicodeRange.cpp', >- 'platform/text/brew/TextBoundariesBrew.cpp', >- 'platform/text/brew/TextBreakIteratorBrew.cpp', >- 'platform/text/brew/TextCodecBrew.cpp', >- 'platform/text/brew/TextCodecBrew.h', > 'platform/text/cf/HyphenationCF.cpp', > 'platform/text/cf/StringCF.cpp', > 'platform/text/cf/StringImplCF.cpp', >Index: Source/WebCore/WebCore.gyp/WebCore.gyp >=================================================================== >--- Source/WebCore/WebCore.gyp/WebCore.gyp (revision 95922) >+++ Source/WebCore/WebCore.gyp/WebCore.gyp (working copy) >@@ -1293,7 +1293,7 @@ > ], > 'sources/': [ > # FIXME: Figure out how to store these patterns in a variable. >- ['exclude', '(brew|cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'], >+ ['exclude', '(cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'], > ['exclude', '(?<!Chromium)(Cairo|CF|CG|Curl|Gtk|JSC|Linux|Mac|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|Win|WinCE|Wx)\\.(cpp|mm?)$'], > > ['exclude', 'AllInOne\\.cpp$'], >@@ -1348,7 +1348,7 @@ > ['include', 'platform/'], > > # FIXME: Figure out how to store these patterns in a variable. >- ['exclude', '(brew|cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'], >+ ['exclude', '(cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'], > ['exclude', '(?<!Chromium)(Cairo|CF|CG|Curl|Gtk|JSC|Linux|Mac|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|Win|WinCE|Wx)\\.(cpp|mm?)$'], > > ['exclude', 'platform/LinkHash\\.cpp$'], >@@ -1600,7 +1600,7 @@ > ['include', 'rendering/'], > > # FIXME: Figure out how to store these patterns in a variable. >- ['exclude', '(brew|cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'], >+ ['exclude', '(cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'], > ['exclude', '(?<!Chromium)(Cairo|CF|CG|Curl|Gtk|JSC|Linux|Mac|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|Win|WinCE|Wx)\\.(cpp|mm?)$'], > > ['exclude', 'AllInOne\\.cpp$'], >@@ -1669,7 +1669,7 @@ > ['exclude', 'bridge/jni/jsc/'], > > # FIXME: Figure out how to store these patterns in a variable. >- ['exclude', '(brew|cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'], >+ ['exclude', '(cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'], > ['exclude', '(?<!Chromium)(Cairo|CF|CG|Curl|Gtk|JSC|Linux|Mac|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|Win|WinCE|Wx)\\.(cpp|mm?)$'], > > ['exclude', 'AllInOne\\.cpp$'], >Index: Source/WebCore/bindings/js/ScriptControllerBrew.cpp >=================================================================== >--- Source/WebCore/bindings/js/ScriptControllerBrew.cpp (revision 95921) >+++ Source/WebCore/bindings/js/ScriptControllerBrew.cpp (working copy) >@@ -1,47 +0,0 @@ >-/* >- * Copyright (C) 2008 Apple Computer, Inc. >- * Copyright (C) 2009 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "ScriptController.h" >- >-#include "BridgeJSC.h" >-#include "PluginView.h" >-#include "runtime_root.h" >- >-namespace WebCore { >- >-PassRefPtr<JSC::Bindings::Instance> ScriptController::createScriptInstanceForWidget(WebCore::Widget* widget) >-{ >- if (!widget->isPluginView()) >- return 0; >- >- return static_cast<PluginView*>(widget)->bindingInstance(); >- >-} >- >-} // namespace WebCore >Index: Source/WebCore/editing/brew/EditorBrew.cpp >=================================================================== >--- Source/WebCore/editing/brew/EditorBrew.cpp (revision 95921) >+++ Source/WebCore/editing/brew/EditorBrew.cpp (working copy) >@@ -1,39 +0,0 @@ >-/* >- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. >- * Copyright (C) 2010 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "Editor.h" >- >-#include "ClipboardBrew.h" >- >-namespace WebCore { >- >-PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame*) >-{ >- return new ClipboardBrew(policy, Clipboard::CopyAndPaste); >-} >- >-} // namespace WebCore >Index: Source/WebCore/gyp/WebCore.gyp >=================================================================== >--- Source/WebCore/gyp/WebCore.gyp (revision 95922) >+++ Source/WebCore/gyp/WebCore.gyp (working copy) >@@ -74,8 +74,8 @@ > ['exclude', 'thirdparty/'], > > # FIXME: Figure out how to store these patterns in a variable. >- ['exclude', '(brew|cairo|chromium|curl|efl|freetype|fftw|gstreamer|gtk|linux|mkl|openvg|pango|qt|skia|soup|symbian|texmap|iphone|v8|win|wince|wx)/'], >- ['exclude', '(Brew|Cairo|Curl|Chromium|Efl|Gtk|Linux|OpenType|Qt|Safari|Soup|Symbian|V8|Win|WinCE|Wx)\\.(cpp|mm?)$'], >+ ['exclude', '(cairo|chromium|curl|efl|freetype|fftw|gstreamer|gtk|linux|mkl|openvg|pango|qt|skia|soup|symbian|texmap|iphone|v8|win|wince|wx)/'], >+ ['exclude', '(Cairo|Curl|Chromium|Efl|Gtk|Linux|OpenType|Qt|Safari|Soup|Symbian|V8|Win|WinCE|Wx)\\.(cpp|mm?)$'], > ['exclude', 'Chromium[^/]*\\.(cpp|mm?)$'], > > ['exclude', 'platform/image-decoders/'], >Index: Source/WebCore/page/brew/ChromeClientBrew.h >=================================================================== >--- Source/WebCore/page/brew/ChromeClientBrew.h (revision 95921) >+++ Source/WebCore/page/brew/ChromeClientBrew.h (working copy) >@@ -1,52 +0,0 @@ >-/* >- * Copyright (c) 2010, Company 100, 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 ChromeClientBrew_h >-#define ChromeClientBrew_h >- >-#include "ChromeClient.h" >-#include <wtf/Forward.h> >- >-namespace WebCore { >-class IntRect; >-class PopupMenuClient; >- >-// Contains Brew-specific extensions to the ChromeClient. Only put >-// things here that don't make sense for other ports. >-class ChromeClientBrew : public ChromeClient { >-public: >- virtual void* webView() const { return 0; } >- virtual void createSelectPopup(PopupMenuClient*, int selected, const IntRect& rect) = 0; >- virtual bool destroySelectPopup() = 0; >-}; >- >-} // namespace WebCore >- >-#endif >Index: Source/WebCore/page/brew/DragControllerBrew.cpp >=================================================================== >--- Source/WebCore/page/brew/DragControllerBrew.cpp (revision 95921) >+++ Source/WebCore/page/brew/DragControllerBrew.cpp (working copy) >@@ -1,70 +0,0 @@ >-/* >- * Copyright (C) 2007 Apple Inc. All rights reserved. >- * Copyright (C) 2009-2010 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "DragController.h" >- >-#include "DragData.h" >- >-namespace WebCore { >- >-// FIXME: These values are straight out of DragControllerMac, so probably have >-// little correlation with BREW standards... >-const int DragController::LinkDragBorderInset = 2; >-const int DragController::MaxOriginalImageArea = 1500 * 1500; >-const int DragController::DragIconRightInset = 7; >-const int DragController::DragIconBottomInset = 3; >- >-const float DragController::DragImageAlpha = 0.75f; >- >- >-bool DragController::isCopyKeyDown(DragData*) >-{ >- return false; >-} >- >-DragOperation DragController::dragOperation(DragData* dragData) >-{ >- // FIXME: This logic is incomplete >- if (dragData->containsURL()) >- return DragOperationCopy; >- >- return DragOperationNone; >-} >- >-const IntSize& DragController::maxDragImageSize() >-{ >- static const IntSize maxDragImageSize(400, 400); >- >- return maxDragImageSize; >-} >- >-void DragController::cleanupAfterSystemDrag() >-{ >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/page/brew/EventHandlerBrew.cpp >=================================================================== >--- Source/WebCore/page/brew/EventHandlerBrew.cpp (revision 95921) >+++ Source/WebCore/page/brew/EventHandlerBrew.cpp (working copy) >@@ -1,127 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, Inc. >- * Copyright 2009, The Android Open Source Project >- * Copyright (C) 2006 Zack Rusin <zack@kde.org> >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "EventHandler.h" >- >-#include "ClipboardBrew.h" >-#include "EventNames.h" >-#include "FocusController.h" >-#include "Frame.h" >-#include "FrameView.h" >-#include "HitTestResult.h" >-#include "KeyboardEvent.h" >-#include "MouseEventWithHitTestResults.h" >-#include "NotImplemented.h" >-#include "Page.h" >-#include "PlatformKeyboardEvent.h" >-#include "PlatformWheelEvent.h" >-#include "RenderWidget.h" >- >-namespace WebCore { >- >-bool EventHandler::tabsToAllFormControls(KeyboardEvent* event) const >-{ >- return true; >-} >- >-void EventHandler::focusDocumentView() >-{ >- Page* page = m_frame->page(); >- if (page) >- page->focusController()->setFocusedFrame(m_frame); >-} >- >-bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestResults& event) >-{ >- // Figure out which view to send the event to. >- RenderObject* target = targetNode(event) ? targetNode(event)->renderer() : 0; >- if (!target || !target->isWidget()) >- return false; >- return passMouseDownEventToWidget(toRenderWidget(target)->widget()); >-} >- >-bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget) >-{ >- return passMouseDownEventToWidget(renderWidget->widget()); >-} >- >-// This function is used to route the mouse down event to the native widgets, it seems like a >-// work around for the Mac platform which does not support double clicks, but browsers do. >-bool EventHandler::passMouseDownEventToWidget(Widget* widget) >-{ >- notImplemented(); >- return false; >-} >- >-bool EventHandler::eventActivatedView(const PlatformMouseEvent&) const >-{ >- notImplemented(); >- return false; >-} >- >-// This function is called for mouse events by FrameView::handleMousePressEvent(). >-// It is used to ensure that events are sync'ed correctly between frames. For example >-// if the user presses down in one frame and up in another frame, this function will >-// returns true, and pass the event to the correct frame. >-bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& event, Frame* subframe, HitTestResult*) >-{ >- notImplemented(); >- return false; >-} >- >-// This is called to route wheel events to child widgets when they are RenderWidget >-// as the parent usually gets wheel event. Don't have a mouse with a wheel to confirm >-// the operation of this function. >-bool EventHandler::passWheelEventToWidget(PlatformWheelEvent& event, Widget* widget) >-{ >- notImplemented(); >- return false; >-} >- >-bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) >-{ >- return passSubframeEventToSubframe(mev, subframe); >-} >- >-bool EventHandler::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe, HitTestResult* hoveredNode) >-{ >- return passSubframeEventToSubframe(mev, subframe, hoveredNode); >-} >- >-bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) >-{ >- return passSubframeEventToSubframe(mev, subframe); >-} >- >-unsigned EventHandler::accessKeyModifiers() >-{ >- return PlatformKeyboardEvent::AltKey; >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/page/brew/FrameBrew.cpp >=================================================================== >--- Source/WebCore/page/brew/FrameBrew.cpp (revision 95921) >+++ Source/WebCore/page/brew/FrameBrew.cpp (working copy) >@@ -1,44 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "Frame.h" >- >-#include "NotImplemented.h" >- >-namespace WebCore { >- >-DragImageRef Frame::nodeImage(Node*) >-{ >- notImplemented(); >- return 0; >-} >- >-DragImageRef Frame::dragImageForSelection() >-{ >- notImplemented(); >- return 0; >-} >- >-} >Index: Source/WebCore/platform/brew/ClipboardBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/ClipboardBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/ClipboardBrew.cpp (working copy) >@@ -1,122 +0,0 @@ >-/* >- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. >- * Copyright (C) 2010 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "ClipboardBrew.h" >- >-#include "CachedImage.h" >-#include "Element.h" >-#include "FileList.h" >-#include "Frame.h" >-#include "NotImplemented.h" >-#include "Range.h" >- >-namespace WebCore { >- >-PassRefPtr<Clipboard> Clipboard::create(ClipboardAccessPolicy, DragData*, Frame*) >-{ >- return 0; >-} >- >-ClipboardBrew::ClipboardBrew(ClipboardAccessPolicy policy, ClipboardType clipboardType) >- : Clipboard(policy, clipboardType) >-{ >-} >- >-ClipboardBrew::~ClipboardBrew() >-{ >-} >- >-void ClipboardBrew::clearData(const String&) >-{ >- ASSERT(isForDragAndDrop()); >-} >- >-void ClipboardBrew::clearAllData() >-{ >- ASSERT(isForDragAndDrop()); >-} >- >-String ClipboardBrew::getData(const String&, bool& success) const >-{ >- success = false; >- return ""; >-} >- >-bool ClipboardBrew::setData(const String&, const String&) >-{ >- ASSERT(isForDragAndDrop()); >- return false; >-} >- >-// extensions beyond IE's API >-HashSet<String> ClipboardBrew::types() const >-{ >- return HashSet<String>(); >-} >- >-PassRefPtr<FileList> ClipboardBrew::files() const >-{ >- notImplemented(); >- return 0; >-} >- >-void ClipboardBrew::setDragImage(CachedImage*, const IntPoint&) >-{ >-} >- >-void ClipboardBrew::setDragImageElement(Node*, const IntPoint&) >-{ >-} >- >-DragImageRef ClipboardBrew::createDragImage(IntPoint&) const >-{ >- return 0; >-} >- >-void ClipboardBrew::declareAndWriteDragImage(Element*, const KURL&, const String&, Frame*) >-{ >-} >- >-void ClipboardBrew::writeURL(const KURL&, const String&, Frame*) >-{ >-} >- >-void ClipboardBrew::writeRange(Range* selectedRange, Frame*) >-{ >- ASSERT(selectedRange); >-} >- >-void ClipboardBrew::writePlainText(const String&) >-{ >-} >- >-bool ClipboardBrew::hasData() >-{ >- return false; >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/ClipboardBrew.h >=================================================================== >--- Source/WebCore/platform/brew/ClipboardBrew.h (revision 95921) >+++ Source/WebCore/platform/brew/ClipboardBrew.h (working copy) >@@ -1,65 +0,0 @@ >-/* >- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. >- * Copyright (C) 2010 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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 ClipboardBrew_h >-#define ClipboardBrew_h >- >-#include "CachedResourceClient.h" >-#include "Clipboard.h" >- >-namespace WebCore { >- >-class CachedImage; >- >-class ClipboardBrew : public Clipboard, public CachedResourceClient { >-public: >- ClipboardBrew(ClipboardAccessPolicy policy, ClipboardType); >- ~ClipboardBrew(); >- >- void clearData(const String&); >- void clearAllData(); >- String getData(const String&, bool& success) const; >- bool setData(const String&, const String&); >- >- // extensions beyond IE's API >- HashSet<String> types() const; >- virtual PassRefPtr<FileList> files() const; >- >- void setDragImage(CachedImage*, const IntPoint&); >- void setDragImageElement(Node*, const IntPoint&); >- >- virtual DragImageRef createDragImage(IntPoint&) const; >- virtual void declareAndWriteDragImage(Element*, const KURL&, const String&, Frame*); >- virtual void writeURL(const KURL&, const String&, Frame*); >- virtual void writeRange(Range*, Frame*); >- virtual void writePlainText(const String&); >- >- virtual bool hasData(); >-}; >- >-} // namespace WebCore >- >-#endif // ClipboardBrew_h >Index: Source/WebCore/platform/brew/ContextMenuBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/ContextMenuBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/ContextMenuBrew.cpp (working copy) >@@ -1,105 +0,0 @@ >-/* >- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. >- * Copyright (C) 2010 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "ContextMenu.h" >- >-#include "NotImplemented.h" >-#include <wtf/text/CString.h> >- >-namespace WebCore { >- >-ContextMenu::ContextMenu() >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-ContextMenu::ContextMenu(const PlatformMenuDescription menu) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-ContextMenu::~ContextMenu() >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-unsigned ContextMenu::itemCount() const >-{ >- ASSERT_NOT_REACHED(); >- return 0; >-} >- >-void ContextMenu::insertItem(unsigned int position, ContextMenuItem& item) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-void ContextMenu::appendItem(ContextMenuItem& item) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-ContextMenuItem* ContextMenu::itemWithAction(unsigned action) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >- return 0; >-} >- >-ContextMenuItem* ContextMenu::itemAtIndex(unsigned index, const PlatformMenuDescription platformDescription) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >- return 0; >-} >- >-void ContextMenu::setPlatformDescription(PlatformMenuDescription menu) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-PlatformMenuDescription ContextMenu::platformDescription() const >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >- return 0; >-} >- >-PlatformMenuDescription ContextMenu::releasePlatformDescription() >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >- return 0; >-} >- >-} >Index: Source/WebCore/platform/brew/ContextMenuItemBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/ContextMenuItemBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/ContextMenuItemBrew.cpp (working copy) >@@ -1,139 +0,0 @@ >-/* >- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. >- * Copyright (C) 2010 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "ContextMenuItem.h" >- >-#include "ContextMenu.h" >-#include "NotImplemented.h" >- >-#include <wtf/text/CString.h> >- >-namespace WebCore { >- >-ContextMenuItem::ContextMenuItem(PlatformMenuDescription item) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-ContextMenuItem::ContextMenuItem(ContextMenu* subMenu) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction action, const String& title, ContextMenu* subMenu) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-ContextMenuItem::~ContextMenuItem() >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-PlatformMenuDescription ContextMenuItem::releasePlatformDescription() >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >- return 0; >-} >- >-ContextMenuItemType ContextMenuItem::type() const >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >- return ActionType; >-} >- >-ContextMenuAction ContextMenuItem::action() const >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >- return ContextMenuItemTagNoAction; >-} >- >-String ContextMenuItem::title() const >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >- return String(); >-} >- >-PlatformMenuDescription ContextMenuItem::platformSubMenu() const >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >- return 0; >-} >- >-void ContextMenuItem::setType(ContextMenuItemType type) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-void ContextMenuItem::setAction(ContextMenuAction action) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-void ContextMenuItem::setTitle(const String& title) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-void ContextMenuItem::setSubMenu(ContextMenu* subMenu) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-void ContextMenuItem::setChecked(bool checked) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-void ContextMenuItem::setEnabled(bool enabled) >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >-} >- >-bool ContextMenuItem::enabled() const >-{ >- ASSERT_NOT_REACHED(); >- notImplemented(); >- return false; >-} >- >-} >Index: Source/WebCore/platform/brew/CursorBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/CursorBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/CursorBrew.cpp (working copy) >@@ -1,320 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, Inc. >- * Copyright (C) 2004, 2006 Apple Computer, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#define LOG_TAG "WebCore" >- >-#include "config.h" >-#include "Cursor.h" >- >-#include "NotImplemented.h" >- >-#include <wtf/StdLibExtras.h> >- >-namespace WebCore { >- >-Cursor::Cursor(Image*, const IntPoint&) >-{ >- notImplemented(); >-} >- >-Cursor::Cursor(const Cursor&) >-{ >- notImplemented(); >-} >- >-Cursor::~Cursor() >-{ >- notImplemented(); >-} >- >-Cursor& Cursor::operator=(const Cursor&) >-{ >- notImplemented(); >- return *this; >-} >- >-static inline Cursor& dummyCursor() >-{ >- DEFINE_STATIC_LOCAL(Cursor, c, ()); >- return c; >-} >- >-const Cursor& pointerCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& crossCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& handCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& moveCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& iBeamCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& waitCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& helpCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& eastResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& northResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& northEastResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& northWestResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& southResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& southEastResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& southWestResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& westResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& northSouthResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& eastWestResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& northEastSouthWestResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& northWestSouthEastResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& columnResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& rowResizeCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& verticalTextCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& cellCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& contextMenuCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& noDropCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& copyCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& progressCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& aliasCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& noneCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& notAllowedCursor() >-{ >- return dummyCursor(); >-} >- >-const Cursor& zoomInCursor() >-{ >- return dummyCursor(); >-} >- >-const Cursor& zoomOutCursor() >-{ >- return dummyCursor(); >-} >- >-const Cursor& middlePanningCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& eastPanningCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& northPanningCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& northEastPanningCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& northWestPanningCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& southPanningCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& southEastPanningCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& southWestPanningCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& westPanningCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& grabCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-const Cursor& grabbingCursor() >-{ >- notImplemented(); >- return dummyCursor(); >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/DragDataBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/DragDataBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/DragDataBrew.cpp (working copy) >@@ -1,89 +0,0 @@ >-/* >- * Copyright (C) 2007 Apple Inc. All rights reserved. >- * Copyright (C) 2010 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "DragData.h" >- >-#include "Document.h" >-#include "DocumentFragment.h" >- >-namespace WebCore { >- >-bool DragData::canSmartReplace() const >-{ >- return false; >-} >- >-bool DragData::containsColor() const >-{ >- return false; >-} >- >-bool DragData::containsPlainText() const >-{ >- return false; >-} >- >-String DragData::asPlainText() const >-{ >- return String(); >-} >- >-Color DragData::asColor() const >-{ >- return Color(); >-} >- >-bool DragData::containsCompatibleContent() const >-{ >- return false; >-} >- >-bool DragData::containsURL(FilenameConversionPolicy filenamePolicy) const >-{ >- return false; >-} >- >-String DragData::asURL(FilenameConversionPolicy filenamePolicy, String*) const >-{ >- return String(); >-} >- >-PassRefPtr<DocumentFragment> DragData::asFragment(Document*) const >-{ >- return 0; >-} >- >-void DragData::asFilenames(Vector<String>&) const >-{ >-} >- >-bool DragData::containsFiles() const >-{ >- return false; >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/EventLoopBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/EventLoopBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/EventLoopBrew.cpp (working copy) >@@ -1,36 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "EventLoop.h" >- >-namespace WebCore { >- >-void EventLoop::cycle() >-{ >- // BREW MP does not have an explicit event loop. >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/FileSystemBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/FileSystemBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/FileSystemBrew.cpp (working copy) >@@ -1,259 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * 3. Neither the name of Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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. >- */ >- >-#include "config.h" >-#include "FileSystem.h" >- >-#include "NotImplemented.h" >- >-#include <AEEAppGen.h> >-#include <AEEFile.h> >-#include <AEEStdLib.h> >- >-#include <wtf/RandomNumber.h> >-#include <wtf/brew/RefPtrBrew.h> >-#include <wtf/brew/ShellBrew.h> >-#include <wtf/text/CString.h> >-#include <wtf/text/StringBuilder.h> >-#include <wtf/text/WTFString.h> >- >-namespace WebCore { >- >-bool getFileSize(const String& path, long long& result) >-{ >- RefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR); >- FileInfo info; >- >- if (IFILEMGR_GetInfo(fileMgr.get(), path.utf8().data(), &info) == SUCCESS) { >- result = info.dwSize; >- return true; >- } >- >- return false; >-} >- >-bool getFileModificationTime(const String& path, time_t& result) >-{ >- // There is no way to get file modification time in BREW. IFILEMGR_GetInfoEx() returns >- // only file creation time. >- return false; >-} >- >-bool fileExists(const String& path) >-{ >- RefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR); >- >- return (IFILEMGR_Test(fileMgr.get(), path.utf8().data()) == SUCCESS); >-} >- >-bool deleteFile(const String& path) >-{ >- RefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR); >- >- return (IFILEMGR_Remove(fileMgr.get(), path.utf8().data()) == SUCCESS); >-} >- >-bool deleteEmptyDirectory(const String& path) >-{ >- RefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR); >- >- return (IFILEMGR_RmDir(fileMgr.get(), path.utf8().data()) == SUCCESS); >-} >- >-String pathByAppendingComponent(const String& path, const String& component) >-{ >- if (component.isEmpty()) >- return path; >- >- Vector<UChar, 1024> buffer; >- >- buffer.append(path.characters(), path.length()); >- >- if (buffer.last() != L'/' && component[0] != L'/') >- buffer.append(L'/'); >- >- buffer.append(component.characters(), component.length()); >- >- return String(buffer.data(), buffer.size()); >-} >- >-CString fileSystemRepresentation(const String& path) >-{ >- return path.utf8(); >-} >- >-static String canonicalPath(const String& path) >-{ >- RefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR); >- >- // Get the buffer size required to resolve the path. >- int canonPathLen; >- IFILEMGR_ResolvePath(fileMgr.get(), path.utf8().data(), 0, &canonPathLen); >- >- // Resolve the path to the canonical path. >- Vector<char> canonPathBuffer(canonPathLen); >- IFILEMGR_ResolvePath(fileMgr.get(), path.utf8().data(), canonPathBuffer.data(), &canonPathLen); >- >- String canonPath(canonPathBuffer.data()); >- >- // Remove the trailing '/'. >- int lastDivPos = canonPath.reverseFind('/'); >- int endPos = canonPath.length(); >- if (lastDivPos == endPos - 1) >- canonPath = canonPath.substring(0, canonPath.length() - 1); >- >- return canonPath; >-} >- >-static bool makeAllDirectories(IFileMgr* fileManager, const String& path) >-{ >- if (path == canonicalPath(AEEFS_HOME_DIR)) >- return true; >- >- int lastDivPos = path.reverseFind('/'); >- int endPos = path.length(); >- if (lastDivPos == path.length() - 1) { >- endPos -= 1; >- lastDivPos = path.reverseFind('/', lastDivPos); >- } >- >- if (lastDivPos > 0) { >- if (!makeAllDirectories(fileManager, path.substring(0, lastDivPos))) >- return false; >- } >- >- String folder(path.substring(0, endPos)); >- >- // IFILEMGR_MkDir return SUCCESS when the file is successfully created or if file already exists. >- // So we need to check fileinfo.attrib. >- IFILEMGR_MkDir(fileManager, folder.utf8().data()); >- >- FileInfo fileInfo; >- if (IFILEMGR_GetInfo(fileManager, folder.utf8().data(), &fileInfo) != SUCCESS) >- return false; >- >- return fileInfo.attrib & _FA_DIR; >-} >- >-bool makeAllDirectories(const String& path) >-{ >- RefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR); >- >- return makeAllDirectories(fileMgr.get(), canonicalPath(path)); >-} >- >-String homeDirectoryPath() >-{ >- const int webViewClassId = 0x010aa04c; >- return String::format("fs:/~0X%08X/", webViewClassId); >-} >- >-String pathGetFileName(const String& path) >-{ >- return path.substring(path.reverseFind('/') + 1); >-} >- >-String directoryName(const String& path) >-{ >- String fileName = pathGetFileName(path); >- String dirName = String(path); >- dirName.truncate(dirName.length() - pathGetFileName(path).length()); >- return dirName; >-} >- >-String openTemporaryFile(const String& prefix, PlatformFileHandle& handle) >-{ >- // BREW does not have a system-wide temporary directory, >- // use "fs:/~/tmp" as our temporary directory. >- String tempPath("fs:/~/tmp"); >- >- RefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR); >- >- // Create the temporary directory if it does not exist. >- IFILEMGR_MkDir(fileMgr.get(), tempPath.utf8().data()); >- >- // Loop until we find a temporary filename that does not exist. >- int number = static_cast<int>(randomNumber() * 10000); >- String filename; >- do { >- StringBuilder builder; >- builder.append(tempPath); >- builder.append('/'); >- builder.append(prefix); >- builder.append(String::number(number)); >- filename = builder.toString(); >- number++; >- } while (IFILEMGR_Test(fileMgr.get(), filename.utf8().data()) == SUCCESS); >- >- IFile* tempFile = IFILEMGR_OpenFile(fileMgr.get(), filename.utf8().data(), _OFM_CREATE); >- if (tempFile) { >- handle = tempFile; >- return filename; >- } >- >- return String(); >-} >- >-void closeFile(PlatformFileHandle& handle) >-{ >- if (isHandleValid(handle)) { >- IFILE_Release(handle); >- handle = invalidPlatformFileHandle; >- } >-} >- >-int writeToFile(PlatformFileHandle handle, const char* data, int length) >-{ >- if (!isHandleValid(handle)) >- return -1; >- >- int bytesWritten = IFILE_Write(handle, data, length); >- if (!bytesWritten) >- return -1; >- return bytesWritten; >-} >- >-bool unloadModule(PlatformModule module) >-{ >- notImplemented(); >- >- return false; >-} >- >-Vector<String> listDirectory(const String& path, const String& filter) >-{ >- Vector<String> entries; >- >- // OK to not implement listDirectory, because it's only used for plug-ins and >- // Brew MP does not support the plug-in at the moment. >- notImplemented(); >- >- return entries; >-} >- >-} >Index: Source/WebCore/platform/brew/KURLBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/KURLBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/KURLBrew.cpp (working copy) >@@ -1,37 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, Inc. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >-#include "config.h" >-#include "KURL.h" >- >-#include <wtf/text/CString.h> >- >-#include <AEEFile.h> >- >-namespace WebCore { >- >-String KURL::fileSystemPath() const >-{ >- // Access files relative to the current module directory in a case-sensitive manner. >- // As IWeb "file:" engine opens files in BREW's application-relative file namespace, >- // we follow the same policy here. >- return String(AEEFS_HOME_DIR) + path(); >-} >- >-} >Index: Source/WebCore/platform/brew/LanguageBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/LanguageBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/LanguageBrew.cpp (working copy) >@@ -1,40 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "Language.h" >- >-#include "NotImplemented.h" >-#include "PlatformString.h" >- >-namespace WebCore { >- >-String platformDefaultLanguage() >-{ >- notImplemented(); >- return String(); >-} >- >-} >Index: Source/WebCore/platform/brew/LocalizedStringsBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/LocalizedStringsBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/LocalizedStringsBrew.cpp (working copy) >@@ -1,509 +0,0 @@ >-/* >- * Copyright (C) 2009 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "LocalizedStrings.h" >- >-#include "NotImplemented.h" >-#include "PlatformString.h" >- >-namespace WebCore { >- >-String submitButtonDefaultLabel() >-{ >- return "Submit"; >-} >- >-String inputElementAltText() >-{ >- return String(); >-} >- >-String resetButtonDefaultLabel() >-{ >- return "Reset"; >-} >- >-String defaultDetailsSummaryText() >-{ >- return "Details"; >-} >- >-String searchableIndexIntroduction() >-{ >- return "Searchable Index"; >-} >- >-String fileButtonChooseFileLabel() >-{ >- return "Choose File"; >-} >- >-String fileButtonChooseMultipleFilesLabel() >-{ >- return "Choose Files"; >-} >- >-String fileButtonNoFileSelectedLabel() >-{ >- return "No file selected"; >-} >- >-String contextMenuItemTagOpenLinkInNewWindow() >-{ >- return "Open in new tab"; >-} >- >-String contextMenuItemTagDownloadLinkToDisk() >-{ >- return "Download link to disk"; >-} >- >-String contextMenuItemTagCopyLinkToClipboard() >-{ >- return "Copy link to clipboard"; >-} >- >-String contextMenuItemTagOpenImageInNewWindow() >-{ >- return "Open image in new window"; >-} >- >-String contextMenuItemTagDownloadImageToDisk() >-{ >- return "Download image to disk"; >-} >- >-String contextMenuItemTagCopyImageToClipboard() >-{ >- return "Copy image to clipboard"; >-} >- >-String contextMenuItemTagOpenVideoInNewWindow() >-{ >- return "Open video in new window"; >-} >- >-String contextMenuItemTagOpenAudioInNewWindow() >-{ >- return "Open audio in new window"; >-} >- >-String contextMenuItemTagCopyVideoLinkToClipboard() >-{ >- return "Copy Video link location"; >-} >- >-String contextMenuItemTagCopyAudioLinkToClipboard() >-{ >- return "Copy audio link location"; >-} >- >-String contextMenuItemTagToggleMediaControls() >-{ >- return "Toggle media controls"; >-} >- >-String contextMenuItemTagToggleMediaLoop() >-{ >- return "Toggle media loop playback"; >-} >- >-String contextMenuItemTagEnterVideoFullscreen() >-{ >- return "Switch video to fullscreen"; >-} >- >-String contextMenuItemTagMediaPlay() >-{ >- return "Play"; >-} >- >-String contextMenuItemTagMediaPause() >-{ >- return "Pause"; >-} >- >-String contextMenuItemTagMediaMute() >-{ >- return "Mute"; >-} >- >-String contextMenuItemTagOpenFrameInNewWindow() >-{ >- return "Open frame in new window"; >-} >- >-String contextMenuItemTagCopy() >-{ >- return "Copy"; >-} >- >-String contextMenuItemTagGoBack() >-{ >- return "Go back"; >-} >- >-String contextMenuItemTagGoForward() >-{ >- return "Go forward"; >-} >- >-String contextMenuItemTagStop() >-{ >- return "Stop"; >-} >- >-String contextMenuItemTagReload() >-{ >- return "Reload"; >-} >- >-String contextMenuItemTagCut() >-{ >- return "Cut"; >-} >- >-String contextMenuItemTagPaste() >-{ >- return "Paste"; >-} >- >-String contextMenuItemTagNoGuessesFound() >-{ >- return "No guesses found"; >-} >- >-String contextMenuItemTagIgnoreSpelling() >-{ >- return "Ignore spelling"; >-} >- >-String contextMenuItemTagLearnSpelling() >-{ >- return "Learn spelling"; >-} >- >-String contextMenuItemTagSearchWeb() >-{ >- return "Search web"; >-} >- >-String contextMenuItemTagLookUpInDictionary(const String&) >-{ >- return "Lookup in dictionary"; >-} >- >-String contextMenuItemTagOpenLink() >-{ >- return "Open link"; >-} >- >-String contextMenuItemTagIgnoreGrammar() >-{ >- return "Ignore grammar"; >-} >- >-String contextMenuItemTagSpellingMenu() >-{ >- return "Spelling menu"; >-} >- >-String contextMenuItemTagShowSpellingPanel(bool show) >-{ >- return "Show spelling panel"; >-} >- >-String contextMenuItemTagCheckSpelling() >-{ >- return "Check spelling"; >-} >- >-String contextMenuItemTagCheckSpellingWhileTyping() >-{ >- return "Check spelling while typing"; >-} >- >-String contextMenuItemTagCheckGrammarWithSpelling() >-{ >- return "Check for grammar with spelling"; >-} >- >-String contextMenuItemTagFontMenu() >-{ >- return "Font menu"; >-} >- >-String contextMenuItemTagBold() >-{ >- return "Bold"; >-} >- >-String contextMenuItemTagItalic() >-{ >- return "Italic"; >-} >- >-String contextMenuItemTagUnderline() >-{ >- return "Underline"; >-} >- >-String contextMenuItemTagOutline() >-{ >- return "Outline"; >-} >- >-String contextMenuItemTagWritingDirectionMenu() >-{ >- return "Writing direction menu"; >-} >- >-String contextMenuItemTagDefaultDirection() >-{ >- return "Default direction"; >-} >- >-String contextMenuItemTagLeftToRight() >-{ >- return "Left to right"; >-} >- >-String contextMenuItemTagRightToLeft() >-{ >- return "Right to left"; >-} >- >-String contextMenuItemTagInspectElement() >-{ >- return "Inspect"; >-} >- >-String searchMenuNoRecentSearchesText() >-{ >- return "No recent text searches"; >-} >- >-String searchMenuRecentSearchesText() >-{ >- return "Recent text searches"; >-} >- >-String searchMenuClearRecentSearchesText() >-{ >- return "Clear recent text searches"; >-} >- >-String unknownFileSizeText() >-{ >- return "Unknown"; >-} >- >-String AXWebAreaText() >-{ >- return String(); >-} >- >-String AXLinkText() >-{ >- return String(); >-} >- >-String AXListMarkerText() >-{ >- return String(); >-} >- >-String AXImageMapText() >-{ >- return String(); >-} >- >-String AXHeadingText() >-{ >- return String(); >-} >- >-String imageTitle(const String& filename, const IntSize& size) >-{ >- return String(filename); >-} >- >-String contextMenuItemTagTextDirectionMenu() >-{ >- return String(); >-} >- >-String AXButtonActionVerb() >-{ >- return String(); >-} >- >-String AXTextFieldActionVerb() >-{ >- return String(); >-} >- >-String AXRadioButtonActionVerb() >-{ >- return String(); >-} >- >-String AXCheckedCheckBoxActionVerb() >-{ >- return String(); >-} >- >-String AXUncheckedCheckBoxActionVerb() >-{ >- return String(); >-} >- >-String AXLinkActionVerb() >-{ >- return String(); >-} >- >-String AXMenuListPopupActionVerb() >-{ >- return String(); >-} >- >-String AXMenuListActionVerb() >-{ >- return String(); >-} >- >-String AXDefinitionListTermText() >-{ >- return String(); >-} >- >-String AXDefinitionListDefinitionText() >-{ >- return String(); >-} >- >-String validationMessageValueMissingText() >-{ >- notImplemented(); >- return String(); >-} >- >-String validationMessageValueMissingForCheckboxText() >-{ >- notImplemented(); >- return validationMessageValueMissingText(); >-} >- >-String validationMessageValueMissingForFileText() >-{ >- notImplemented(); >- return validationMessageValueMissingText(); >-} >- >-String validationMessageValueMissingForMultipleFileText() >-{ >- notImplemented(); >- return validationMessageValueMissingText(); >-} >- >-String validationMessageValueMissingForRadioText() >-{ >- notImplemented(); >- return validationMessageValueMissingText(); >-} >- >-String validationMessageValueMissingForSelectText() >-{ >- notImplemented(); >- return validationMessageValueMissingText(); >-} >- >-String validationMessageTypeMismatchText() >-{ >- notImplemented(); >- return String(); >-} >- >-String validationMessageTypeMismatchForEmailText() >-{ >- notImplemented(); >- return validationMessageTypeMismatchText(); >-} >- >-String validationMessageTypeMismatchForMultipleEmailText() >-{ >- notImplemented(); >- return validationMessageTypeMismatchText(); >-} >- >-String validationMessageTypeMismatchForURLText() >-{ >- notImplemented(); >- return validationMessageTypeMismatchText(); >-} >- >-String validationMessagePatternMismatchText() >-{ >- notImplemented(); >- return String(); >-} >- >-String validationMessageTooLongText(int, int) >-{ >- notImplemented(); >- return String(); >-} >- >-String validationMessageRangeUnderflowText(const String&) >-{ >- notImplemented(); >- return String(); >-} >- >-String validationMessageRangeOverflowText(const String&) >-{ >- notImplemented(); >- return String(); >-} >- >-String validationMessageStepMismatchText(const String&, const String&) >-{ >- notImplemented(); >- return String(); >-} >- >-String missingPluginText() >-{ >- return "Missing Plug-in"; >-} >- >-String crashedPluginText() >-{ >- return "Plug-in Crashed"; >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/LoggingBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/LoggingBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/LoggingBrew.cpp (working copy) >@@ -1,45 +0,0 @@ >-/* >- * Copyright (C) 2009 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "Logging.h" >- >-namespace WebCore { >- >-void InitializeLoggingChannelsIfNecessary() >-{ >- // FIXME: Should read the logging channels from a file. >- static bool haveInitializedLoggingChannels = false; >- if (haveInitializedLoggingChannels) >- return; >- >- haveInitializedLoggingChannels = true; >- >- // By default we log calls to notImplemented(). >- LogNotYetImplemented.state = WTFLogChannelOn; >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/platform/brew/MIMETypeRegistryBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/MIMETypeRegistryBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/MIMETypeRegistryBrew.cpp (working copy) >@@ -1,89 +0,0 @@ >-/* >- * Copyright (C) 2006 Zack Rusin <zack@kde.org> >- * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. >- * Copyright (C) 2007 Trolltech ASA >- * Copyright (C) 2009 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "MIMETypeRegistry.h" >- >-#include "PlatformString.h" >-#include <wtf/Assertions.h> >-#include <wtf/MainThread.h> >- >-namespace WebCore { >- >-struct ExtensionMap { >- const char* extension; >- const char* mimeType; >-}; >- >-static const ExtensionMap extensionMap[] = { >- { "bmp", "image/bmp" }, >- { "css", "text/css" }, >- { "gif", "image/gif" }, >- { "html", "text/html" }, >- { "htm", "text/html" }, >- { "ico", "image/x-icon" }, >- { "jpeg", "image/jpeg" }, >- { "jpg", "image/jpeg" }, >- { "js", "application/x-javascript" }, >- { "pdf", "application/pdf" }, >- { "png", "image/png" }, >- { "rss", "application/rss+xml" }, >- { "svg", "image/svg+xml" }, >- { "text", "text/plain" }, >- { "txt", "text/plain" }, >- { "xbm", "image/x-xbitmap" }, >- { "xml", "text/xml" }, >- { "xsl", "text/xsl" }, >- { "xhtml", "application/xhtml+xml" }, >- { 0, 0 } >-}; >- >-String MIMETypeRegistry::getMIMETypeForExtension(const String &ext) >-{ >- ASSERT(isMainThread()); >- >- String str = ext.lower(); >- >- const ExtensionMap* e = extensionMap; >- while (e->extension) { >- if (str == e->extension) >- return e->mimeType; >- ++e; >- } >- >- // unknown, let's just assume plain text >- return "text/plain"; >-} >- >-bool MIMETypeRegistry::isApplicationPluginMIMEType(const String&) >-{ >- return false; >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/platform/brew/PasteboardBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/PasteboardBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/PasteboardBrew.cpp (working copy) >@@ -1,93 +0,0 @@ >-/* >- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. >- * Copyright (C) 2009 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >- >-#include "config.h" >-#include "Pasteboard.h" >- >-#include "DocumentFragment.h" >-#include "NotImplemented.h" >-#include "Range.h" >- >-#include <wtf/text/CString.h> >- >-namespace WebCore { >- >-Pasteboard* Pasteboard::generalPasteboard() >-{ >- static Pasteboard* pasteboard = new Pasteboard; >- return pasteboard; >-} >- >-Pasteboard::Pasteboard() >-{ >- notImplemented(); >-} >- >-void Pasteboard::clear() >-{ >- notImplemented(); >-} >- >-void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, Frame* frame) >-{ >- notImplemented(); >-} >- >-void Pasteboard::writePlainText(const String& text) >-{ >- notImplemented(); >-} >- >-void Pasteboard::writeURL(const KURL& url, const String& titleStr, Frame* frame) >-{ >- notImplemented(); >-} >- >-void Pasteboard::writeImage(Node* node, const KURL&, const String&) >-{ >- notImplemented(); >-} >- >-bool Pasteboard::canSmartReplace() >-{ >- notImplemented(); >- return false; >-} >- >-String Pasteboard::plainText(Frame* frame) >-{ >- notImplemented(); >- return String(); >-} >- >-PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefPtr<Range> context, bool allowPlainText, bool& chosePlainText) >-{ >- notImplemented(); >- return 0; >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/PlatformKeyboardEventBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/PlatformKeyboardEventBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/PlatformKeyboardEventBrew.cpp (working copy) >@@ -1,261 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "PlatformKeyboardEvent.h" >- >-#include "NotImplemented.h" >-#include "WindowsKeyboardCodes.h" >- >-#include <AEEEvent.h> >-#include <AEEIKeysMapping.h> >-#include <AEEKeysMapping.bid> >-#include <AEEStdDef.h> >-#include <AEEVCodes.h> >- >-#include <wtf/brew/RefPtrBrew.h> >-#include <wtf/brew/ShellBrew.h> >- >-namespace WebCore { >- >-static String keyIdentifierForBrewKeyCode(uint16 keyCode) >-{ >- switch (keyCode) { >- case AVK_LALT: >- case AVK_RALT: >- return "Alt"; >- case AVK_LCTRL: >- case AVK_RCTRL: >- return "Control"; >- case AVK_LSHIFT: >- case AVK_RSHIFT: >- return "Shift"; >- case AVK_CAPLK: >- return "CapsLock"; >- case AVK_FUNCTION1: >- return "F1"; >- case AVK_FUNCTION2: >- return "F2"; >- case AVK_FUNCTION3: >- return "F3"; >- case AVK_FUNCTION4: >- return "F4"; >- case AVK_FUNCTION5: >- return "F5"; >- case AVK_FUNCTION6: >- return "F6"; >- case AVK_FUNCTION7: >- return "F7"; >- case AVK_FUNCTION8: >- return "F8"; >- case AVK_FUNCTION9: >- return "F9"; >- case AVK_FUNCTION10: >- return "F10"; >- case AVK_FUNCTION11: >- return "F11"; >- case AVK_FUNCTION12: >- return "F12"; >- case AVK_PRSCRN: >- return "PrintScreen"; >- case AVK_LEFT: >- return "Left"; >- case AVK_RIGHT: >- return "Right"; >- case AVK_UP: >- return "Up"; >- case AVK_DOWN: >- return "Down"; >- case AVK_TXINSERT: >- return "Insert"; >- case AVK_ENTER: >- return "Enter"; >- case AVK_TXHOME: >- return "Home"; >- case AVK_TXDELETE: >- // Standard says that DEL becomes U+007F. >- return "U+007F"; >- case AVK_TXEND: >- return "End"; >- case AVK_TXPGUP: >- return "PageUp"; >- case AVK_TXPGDOWN: >- return "PageDown"; >- case AVK_FUNCTION: >- return "U+0009"; >- default: >- return String::format("U+%04X", toASCIIUpper(keyCode)); >- } >-} >- >-static int windowsKeyCodeForKeyEvent(uint16 code) >-{ >- switch (code) { >- case AVK_CLR: >- return VK_BACK; // (08) BACKSPACE key >- case AVK_ENTER: >- return VK_RETURN; // (0D) Return key >- case AVK_SPACE: >- return VK_SPACE; // (20) SPACEBAR >- case AVK_TXPGUP: >- return VK_PRIOR; // (21) PAGE UP key >- case AVK_TXPGDOWN: >- return VK_NEXT; // (22) PAGE DOWN key >- case AVK_TXEND: >- return VK_END; // (23) END key >- case AVK_TXHOME: >- return VK_HOME; // (24) HOME key >- case AVK_LEFT: >- return VK_LEFT; // (25) LEFT ARROW key >- case AVK_UP: >- return VK_UP; // (26) UP ARROW key >- case AVK_RIGHT: >- return VK_RIGHT; // (27) RIGHT ARROW key >- case AVK_DOWN: >- return VK_DOWN; // (28) DOWN ARROW key >- case AVK_TXINSERT: >- return VK_INSERT; // (2D) INS key >- case AVK_TXDELETE: >- return VK_DELETE; // (2E) DEL key >- case AVK_FUNCTION: >- return VK_TAB; // (09) TAB key >- default: >- return 0; >- } >-} >- >-static inline String singleCharacterString(UChar c) >-{ >- UChar text; >- >- // Some key codes are not mapped to Unicode characters. Convert them to Unicode characters here. >- switch (c) { >- case AVK_0: >- text = VK_0; >- break; >- case AVK_1: >- text = VK_1; >- break; >- case AVK_2: >- text = VK_2; >- break; >- case AVK_3: >- text = VK_3; >- break; >- case AVK_4: >- text = VK_4; >- break; >- case AVK_5: >- text = VK_5; >- break; >- case AVK_6: >- text = VK_6; >- break; >- case AVK_7: >- text = VK_7; >- break; >- case AVK_8: >- text = VK_8; >- break; >- case AVK_9: >- text = VK_9; >- break; >- case AVK_STAR: >- text = '*'; >- break; >- case AVK_POUND: >- text = '#'; >- break; >- case AVK_FUNCTION1: >- text = '='; >- break; >- case AVK_FUNCTION2: >- text = '/'; >- break; >- case AVK_FUNCTION3: >- text = '_'; >- break; >- case AVK_PUNC1: >- text = ','; >- break; >- case AVK_PUNC2: >- text = '.'; >- break; >- case AVK_SPACE: >- text = VK_SPACE; >- break; >- default: >- text = c; >- break; >- } >- >- return String(&text, 1); >-} >- >-PlatformKeyboardEvent::PlatformKeyboardEvent(AEEEvent event, uint16 code, uint32 modifiers, Type type) >- : m_type(type) >- , m_isKeypad(false) >- , m_metaKey(false) >- , m_windowsVirtualKeyCode((type == RawKeyDown || type == KeyUp) ? windowsKeyCodeForKeyEvent(code) : 0) >-{ >- if ((m_type == Char) && modifiers) { >- RefPtr<IKeysMapping> keysMapping = createRefPtrInstance<IKeysMapping>(AEECLSID_KeysMapping); >- int result = IKeysMapping_GetMapping(keysMapping.get(), code, modifiers, reinterpret_cast<AECHAR*>(&code)); >- if (result == AEE_SUCCESS) // Reset the modifier when key code is successfully mapped. >- modifiers = 0; >- } >- >- m_text = (type == Char) ? singleCharacterString(code) : String(); >- m_unmodifiedText = (type == Char) ? singleCharacterString(code) : String(); >- m_keyIdentifier = (type == Char) ? String() : keyIdentifierForBrewKeyCode(code); >- m_nativeVirtualKeyCode = code; >- m_autoRepeat = modifiers & KB_AUTOREPEAT; >- m_shiftKey = modifiers & (KB_LSHIFT | KB_RSHIFT); >- m_ctrlKey = modifiers & (KB_LCTRL | KB_RCTRL); >- m_altKey = modifiers & (KB_LALT | KB_RALT); >-} >- >-void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type, bool) >-{ >- // No KeyDown events on BREW to disambiguate. >- ASSERT_NOT_REACHED(); >-} >- >-bool PlatformKeyboardEvent::currentCapsLockState() >-{ >- notImplemented(); >- return false; >-} >- >-void PlatformKeyboardEvent::getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey) >-{ >- notImplemented(); >- shiftKey = false; >- ctrlKey = false; >- altKey = false; >- metaKey = false; >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/PlatformMouseEventBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/PlatformMouseEventBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/PlatformMouseEventBrew.cpp (working copy) >@@ -1,80 +0,0 @@ >-/* >- * Copyright (C) 2009 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "PlatformMouseEvent.h" >- >-#include <AEEEvent.h> >-#include <AEEPointerHelpers.h> >-#include <AEEStdDef.h> >-#include <AEEVCodes.h> >- >-namespace WebCore { >- >-PlatformMouseEvent::PlatformMouseEvent(AEEEvent event, uint16 wParam, uint32 dwParam) >-{ >- switch (event) { >- case EVT_POINTER_DOWN: >- m_eventType = MouseEventPressed; >- break; >- case EVT_POINTER_UP: >- m_eventType = MouseEventReleased; >- break; >- case EVT_POINTER_MOVE: >- case EVT_POINTER_STALE_MOVE: >- m_eventType = MouseEventMoved; >- break; >- default: >- m_eventType = MouseEventMoved; >- break; >- }; >- >- char* dwParamStr = reinterpret_cast<char*>(dwParam); >- >- int x, y; >- AEE_POINTER_GET_XY(dwParamStr, &x, &y); >- m_position = IntPoint(x, y); >- // Use IDisplay, so position and global position are the same. >- m_globalPosition = m_position; >- >- uint32 keyModifiers = AEE_POINTER_GET_KEY_MODIFIERS(dwParamStr); >- m_shiftKey = keyModifiers & (KB_LSHIFT | KB_RSHIFT); >- m_ctrlKey = keyModifiers & (KB_LCTRL | KB_RCTRL); >- m_altKey = keyModifiers & (KB_LALT | KB_RALT); >- m_metaKey = m_altKey; >- >- // AEE_POINTER_GET_MOUSE_MODIFIERS(dwParamStr) always returns 0, >- // so it is impossible to know which button is pressed or released. >- // Just use LeftButton because Brew MP usually runs on touch device. >- m_button = LeftButton; >- >- // AEE_POINTER_GET_TIME returns milliseconds >- m_timestamp = AEE_POINTER_GET_TIME(dwParamStr) * 0.001; >- >- m_clickCount = AEE_POINTER_GET_CLICKCOUNT(dwParamStr); >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/platform/brew/PlatformTouchEventBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/PlatformTouchEventBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/PlatformTouchEventBrew.cpp (working copy) >@@ -1,76 +0,0 @@ >-/* >- * Copyright 2010, Company 100, 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. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``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. >- */ >- >-#include "config.h" >-#include "PlatformTouchEvent.h" >- >-#include <AEEEvent.h> >-#include <AEEPointerHelpers.h> >-#include <AEEVCodes.h> >- >-#if ENABLE(TOUCH_EVENTS) >- >-namespace WebCore { >- >-PlatformTouchEvent::PlatformTouchEvent(AEEEvent event, uint16 wParam, uint32 dwParam) >- : m_metaKey(false) >-{ >- PlatformTouchPoint::State state; >- >- switch (event) { >- case EVT_POINTER_DOWN: >- m_type = TouchStart; >- state = PlatformTouchPoint::TouchPressed; >- break; >- case EVT_POINTER_UP: >- m_type = TouchEnd; >- state = PlatformTouchPoint::TouchReleased; >- break; >- case EVT_POINTER_MOVE: >- case EVT_POINTER_STALE_MOVE: >- m_type = TouchMove; >- state = PlatformTouchPoint::TouchMoved; >- break; >- default: >- ASSERT_NOT_REACHED(); >- } >- >- char* dwParamStr = reinterpret_cast<char*>(dwParam); >- int x, y; >- AEE_POINTER_GET_XY(dwParamStr, &x, &y); >- IntPoint windowPos = IntPoint(x, y); >- >- int id = AEE_POINTER_GET_PTRID(dwParamStr); >- m_touchPoints.append(PlatformTouchPoint(id, windowPos, state)); >- >- uint32 keyModifiers = AEE_POINTER_GET_KEY_MODIFIERS(dwParamStr); >- m_altKey = keyModifiers & (KB_LALT | KB_RALT); >- m_shiftKey = keyModifiers & (KB_LSHIFT | KB_RSHIFT); >- m_ctrlKey = keyModifiers & (KB_LCTRL | KB_RCTRL); >-} >- >-} >- >-#endif >Index: Source/WebCore/platform/brew/PlatformTouchPointBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/PlatformTouchPointBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/PlatformTouchPointBrew.cpp (working copy) >@@ -1,41 +0,0 @@ >-/* >- * Copyright 2010, Company 100, 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. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``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. >- */ >- >-#include "config.h" >-#include "PlatformTouchPoint.h" >- >-#if ENABLE(TOUCH_EVENTS) >- >-namespace WebCore { >- >-PlatformTouchPoint::PlatformTouchPoint(int id, const IntPoint& windowPos, State state) >- : m_id(id) >- , m_state(state) >- , m_screenPos(windowPos) >- , m_pos(windowPos) { } >- >-} >- >-#endif >Index: Source/WebCore/platform/brew/PopupMenuBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/PopupMenuBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/PopupMenuBrew.cpp (working copy) >@@ -1,87 +0,0 @@ >-/* >- * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. >- * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia >- * Copyright (C) 2009-2010 ProFUSION embedded systems >- * Copyright (C) 2009-2010 Samsung Electronics >- * Copyright (C) 2010 Company 100, Inc. >- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, >- * Boston, MA 02111-1307, USA. >- * >- */ >- >-#include "config.h" >-#include "PopupMenuBrew.h" >- >-#include "Chrome.h" >-#include "ChromeClientBrew.h" >-#include "FrameView.h" >-#include "NotImplemented.h" >- >-namespace WebCore { >- >-PopupMenuBrew::PopupMenuBrew(PopupMenuClient* menuList) >- : m_popupClient(menuList) >- , m_view(0) >-{ >-} >- >-PopupMenuBrew::~PopupMenuBrew() >-{ >- // Tell client to destroy data related to this popup since this object is >- // going away. >- hide(); >-} >- >-void PopupMenuBrew::disconnectClient() >-{ >- m_popupClient = 0; >-} >- >-void PopupMenuBrew::show(const IntRect& rect, FrameView* view, int index) >-{ >- ASSERT(m_popupClient); >- ChromeClientBrew* chromeClient = static_cast<ChromeClientBrew*>(view->frame()->page()->chrome()->client()); >- ASSERT(chromeClient); >- >- m_view = view; >- chromeClient->createSelectPopup(m_popupClient, index, rect); >-} >- >-void PopupMenuBrew::hide() >-{ >- ASSERT(m_view); >- ChromeClientBrew* chromeClient = static_cast<ChromeClientBrew*>(m_view->frame()->page()->chrome()->client()); >- ASSERT(chromeClient); >- >- chromeClient->destroySelectPopup(); >-} >- >-void PopupMenuBrew::updateFromElement() >-{ >- client()->setTextFromItem(client()->selectedIndex()); >-} >- >-// This code must be moved to the concrete brew ChromeClient that is not in repository. >-// I kept this code commented out here to prevent loosing the information of what >-// must be the return value for brew. >- >-// bool PopupMenuBrew::itemWritingDirectionIsNatural() >-// { >-// return true; >-// } >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/PopupMenuBrew.h >=================================================================== >--- Source/WebCore/platform/brew/PopupMenuBrew.h (revision 95921) >+++ Source/WebCore/platform/brew/PopupMenuBrew.h (working copy) >@@ -1,53 +0,0 @@ >-/* >- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- */ >- >-#ifndef PopupMenuBrew_h >-#define PopupMenuBrew_h >- >-#include "IntRect.h" >-#include "PopupMenu.h" >-#include "PopupMenuClient.h" >-#include <wtf/PassRefPtr.h> >-#include <wtf/RefCounted.h> >- >-namespace WebCore { >- >-class FrameView; >-class Scrollbar; >- >-class PopupMenuBrew : public PopupMenu { >-public: >- PopupMenuBrew(PopupMenuClient*); >- ~PopupMenuBrew(); >- >- virtual void show(const IntRect&, FrameView*, int index); >- virtual void hide(); >- virtual void updateFromElement(); >- virtual void disconnectClient(); >- >-private: >- PopupMenuClient* client() const { return m_popupClient; } >- >- PopupMenuClient* m_popupClient; >- FrameView* m_view; >-}; >- >-} >- >-#endif // PopupMenuBrew_h >Index: Source/WebCore/platform/brew/SSLKeyGeneratorBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/SSLKeyGeneratorBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/SSLKeyGeneratorBrew.cpp (working copy) >@@ -1,38 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, Inc. All Rights Reserved. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- */ >- >-#include "config.h" >-#include "SSLKeyGenerator.h" >- >-#include "NotImplemented.h" >- >-namespace WebCore { >- >-void getSupportedKeySizes(Vector<String>& v) >-{ >- notImplemented(); >-} >- >-String signedPublicKeyAndChallengeString(unsigned index, const String& challenge, const KURL& url) >-{ >- notImplemented(); >- return String(); >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/ScreenBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/ScreenBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/ScreenBrew.cpp (working copy) >@@ -1,94 +0,0 @@ >-/* >- * Copyright (C) 2009 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "Screen.h" >- >-#include "FloatRect.h" >-#include "Frame.h" >-#include "FrameView.h" >-#include "IntRect.h" >-#include "NotImplemented.h" >-#include "Page.h" >-#include "Widget.h" >- >-#include <AEEAppGen.h> >-#include <AEEStdLib.h> >-#include <wtf/brew/RefPtrBrew.h> >- >-namespace WebCore { >- >-struct DisplayInfo { >- int width; >- int height; >- int depth; >-}; >- >-static void getDisplayInfo(DisplayInfo& info) >-{ >- IDisplay* display = reinterpret_cast<AEEApplet*>(GETAPPINSTANCE())->m_pIDisplay; >- RefPtr<IBitmap> bitmap = adoptRef(IDisplay_GetDestination(display)); >- >- AEEBitmapInfo bitmapInfo; >- IBitmap_GetInfo(bitmap.get(), &bitmapInfo, sizeof(AEEBitmapInfo)); >- >- info.width = bitmapInfo.cx; >- info.height = bitmapInfo.cy; >- info.depth = bitmapInfo.nDepth; >-} >- >-FloatRect screenRect(Widget*) >-{ >- DisplayInfo info; >- getDisplayInfo(info); >- >- return FloatRect(0, 0, info.width, info.height); >-} >- >-FloatRect screenAvailableRect(Widget* widget) >-{ >- return screenRect(widget); >-} >- >-int screenDepth(Widget*) >-{ >- DisplayInfo info; >- getDisplayInfo(info); >- >- return info.depth; >-} >- >-int screenDepthPerComponent(Widget* widget) >-{ >- return screenDepth(widget); >-} >- >-bool screenIsMonochrome(Widget*) >-{ >- return false; >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/platform/brew/ScrollbarThemeBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/ScrollbarThemeBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/ScrollbarThemeBrew.cpp (working copy) >@@ -1,42 +0,0 @@ >-/* >- * Copyright (C) 2009-2010 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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. >- */ >- >-#include "config.h" >-#include "ScrollbarThemeBrew.h" >- >-namespace WebCore { >- >-ScrollbarTheme* ScrollbarTheme::nativeTheme() >-{ >- DEFINE_STATIC_LOCAL(ScrollbarThemeBrew, theme, ()); >- return &theme; >-} >- >-ScrollbarThemeBrew::~ScrollbarThemeBrew() >-{ >-} >- >-} >- >Index: Source/WebCore/platform/brew/ScrollbarThemeBrew.h >=================================================================== >--- Source/WebCore/platform/brew/ScrollbarThemeBrew.h (revision 95921) >+++ Source/WebCore/platform/brew/ScrollbarThemeBrew.h (working copy) >@@ -1,39 +0,0 @@ >-/* >- * Copyright (C) 2009-2010 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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 ScrollbarThemeBrew_h >-#define ScrollbarThemeBrew_h >- >-#include "ScrollbarTheme.h" >- >-namespace WebCore { >- >-class ScrollbarThemeBrew : public ScrollbarTheme { >-public: >- virtual ~ScrollbarThemeBrew(); >-}; >- >-} >-#endif >Index: Source/WebCore/platform/brew/SearchPopupMenuBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/SearchPopupMenuBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/SearchPopupMenuBrew.cpp (working copy) >@@ -1,58 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, Inc. All rights reserved. >- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). >- * >- * 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. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "SearchPopupMenuBrew.h" >- >-namespace WebCore { >- >-// Save the past searches stored in 'searchItems' to a database associated with 'name' >-void SearchPopupMenuBrew::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) >-{ >-} >- >-// Load past searches associated with 'name' from the database to 'searchItems' >-void SearchPopupMenuBrew::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) >-{ >-} >- >-// Create a search popup menu - not sure what else we have to do here >-SearchPopupMenuBrew::SearchPopupMenuBrew(PopupMenuClient* client) >- : m_popup(adoptRef(new PopupMenuBrew(client))) >-{ >-} >- >-bool SearchPopupMenuBrew::enabled() >-{ >- return false; >-} >- >-PopupMenu* SearchPopupMenuBrew::popupMenu() >-{ >- return m_popup.get(); >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/SearchPopupMenuBrew.h >=================================================================== >--- Source/WebCore/platform/brew/SearchPopupMenuBrew.h (revision 95921) >+++ Source/WebCore/platform/brew/SearchPopupMenuBrew.h (working copy) >@@ -1,44 +0,0 @@ >-/* >- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >- >-#ifndef SearchPopupMenuBrew_h >-#define SearchPopupMenuBrew_h >- >-#include "PopupMenuBrew.h" >-#include "SearchPopupMenu.h" >- >-namespace WebCore { >- >-class SearchPopupMenuBrew : public SearchPopupMenu { >-public: >- SearchPopupMenuBrew(PopupMenuClient*); >- >- virtual PopupMenu* popupMenu(); >- virtual void saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems); >- virtual void loadRecentSearches(const AtomicString& name, Vector<String>& searchItems); >- virtual bool enabled(); >- >-private: >- RefPtr<PopupMenuBrew> m_popup; >-}; >- >-} >- >-#endif // SearchPopupMenuBrew_h >Index: Source/WebCore/platform/brew/SharedBufferBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/SharedBufferBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/SharedBufferBrew.cpp (working copy) >@@ -1,77 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "SharedBuffer.h" >- >-#include "FileSystem.h" >-#include "ShellBrew.h" >- >-#include <AEEAppGen.h> >-#include <AEEFile.h> >-#include <AEEStdLib.h> >- >-#include <wtf/OwnPtr.h> >-#include <wtf/text/CString.h> >- >-namespace WebCore { >- >-PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& filePath) >-{ >- if (filePath.isEmpty()) >- return 0; >- >- long long fileSize; >- if (!fileExists(filePath) || !getFileSize(filePath, fileSize)) >- return 0; >- >- RefPtr<SharedBuffer> result = create(); >- result->m_buffer.grow(fileSize); >- >- OwnPtr<IFileMgr> fileMgr = createInstance<IFileMgr>(AEECLSID_FILEMGR); >- >- CString filename = fileSystemRepresentation(filePath); >- OwnPtr<IFile> file(IFILEMGR_OpenFile(fileMgr.get(), filename.data(), _OFM_READ)); >- >- if (!file) { >- LOG_ERROR("Failed to open file %s to create shared buffer, errno(%i)", filePath.ascii().data(), IFILEMGR_GetLastError(fileMgr.get())); >- return 0; >- } >- >- size_t totalBytesRead = 0; >- int32 bytesRead; >- while ((bytesRead = IFILE_Read(file.get(), result->m_buffer.data() + totalBytesRead, fileSize - totalBytesRead)) > 0) >- totalBytesRead += bytesRead; >- result->m_size = totalBytesRead; >- >- if (totalBytesRead != fileSize) { >- LOG_ERROR("Failed to fully read contents of file %s - errno(%i)", filePath.ascii().data(), IFILEMGR_GetLastError(fileMgr.get())); >- return 0; >- } >- >- return result.release(); >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/SharedTimerBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/SharedTimerBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/SharedTimerBrew.cpp (working copy) >@@ -1,72 +0,0 @@ >-/* >- * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. >- * Copyright (C) 2009 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "SharedTimer.h" >- >-#include <AEEAppGen.h> >-#include <AEEStdLib.h> >- >-#include <wtf/CurrentTime.h> >- >-namespace WebCore { >- >-static void (*sharedTimerFiredFunction)(); >- >-static AEECallback sharedTimerCallback; >- >-static void invokeCallback(void*) >-{ >- sharedTimerFiredFunction(); >-} >- >-void setSharedTimerFiredFunction(void (*f)()) >-{ >- sharedTimerFiredFunction = f; >-} >- >-void setSharedTimerFireInterval(double interval) >-{ >- ASSERT(sharedTimerFiredFunction); >- >- CALLBACK_Cancel(&sharedTimerCallback); >- >- int intervalInMS = statit_cast<int>(interval * 1000); >- >- sharedTimerCallback.pfnCancel = 0; >- sharedTimerCallback.pfnNotify = invokeCallback; >- sharedTimerCallback.pNotifyData = 0; >- >- IShell* shell = reinterpret_cast<AEEApplet*>(GETAPPINSTANCE())->m_pIShell; >- ISHELL_SetTimerEx(shell, intervalInMS, &sharedTimerCallback); >-} >- >-void stopSharedTimer() >-{ >- CALLBACK_Cancel(&sharedTimerCallback); >-} >- >-} >Index: Source/WebCore/platform/brew/SoundBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/SoundBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/SoundBrew.cpp (working copy) >@@ -1,44 +0,0 @@ >-/* >- * Copyright (C) 2009 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "Sound.h" >- >-#include <AEEAppGen.h> >-#include <AEEStdLib.h> >- >-namespace WebCore { >- >-void systemBeep() >-{ >- // systemBeep is used by Editor to notify errors when a user cuts or pastes >- // where these operations are not permitted. >- // Use BEEP_ERROR with loud volume. >- IShell* shell = reinterpret_cast<AEEApplet*>(GETAPPINSTANCE())->m_pIShell; >- ISHELL_Beep(shell, BEEP_ERROR, TRUE); >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/platform/brew/SystemTimeBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/SystemTimeBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/SystemTimeBrew.cpp (working copy) >@@ -1,41 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100. >- * >- * 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. >- * >- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "SystemTime.h" >- >-#include "NotImplemented.h" >-#include <limits> >- >-namespace WebCore { >- >-float userIdleTime() >-{ >- notImplemented(); >- // Return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed. >- return std::numeric_limits<float>::max(); >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/brew/TemporaryLinkStubs.cpp >=================================================================== >--- Source/WebCore/platform/brew/TemporaryLinkStubs.cpp (revision 95921) >+++ Source/WebCore/platform/brew/TemporaryLinkStubs.cpp (working copy) >@@ -1,50 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >- >-#include "NotImplemented.h" >- >-using namespace WebCore; >- >-namespace WebCore { >- >-void setCookieStoragePrivateBrowsingEnabled(bool) >-{ >- notImplemented(); >-} >- >-void startObservingCookieChanges() >-{ >- notImplemented(); >-} >- >-void stopObservingCookieChanges() >-{ >- notImplemented(); >-} >- >-} >- >Index: Source/WebCore/platform/brew/WidgetBrew.cpp >=================================================================== >--- Source/WebCore/platform/brew/WidgetBrew.cpp (revision 95921) >+++ Source/WebCore/platform/brew/WidgetBrew.cpp (working copy) >@@ -1,82 +0,0 @@ >-/* >- * Copyright (C) 2009 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "Widget.h" >- >-#include "Cursor.h" >-#include "GraphicsContext.h" >-#include "IntRect.h" >-#include "NotImplemented.h" >- >-namespace WebCore { >- >-Widget::Widget(PlatformWidget widget) >-{ >- init(widget); >-} >- >-Widget::~Widget() >-{ >-} >- >-IntRect Widget::frameRect() const >-{ >- return m_frame; >-} >- >-void Widget::setFrameRect(const IntRect& rect) >-{ >- m_frame = rect; >-} >- >-void Widget::setFocus(bool) >-{ >-} >- >-void Widget::setCursor(const Cursor& cursor) >-{ >-} >- >-void Widget::show() >-{ >-} >- >-void Widget::hide() >-{ >-} >- >-void Widget::paint(GraphicsContext* p, IntRect const& r) >-{ >- notImplemented(); >-} >- >-void Widget::setIsSelected(bool) >-{ >- notImplemented(); >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/platform/graphics/brew/IconBrew.cpp >=================================================================== >--- Source/WebCore/platform/graphics/brew/IconBrew.cpp (revision 95921) >+++ Source/WebCore/platform/graphics/brew/IconBrew.cpp (working copy) >@@ -1,51 +0,0 @@ >-/* >- * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com> >- * Copyright (C) 2009-2010 Company 100, Inc. >- * >- * All rights reserved. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, >- * Boston, MA 02111-1307, USA. >- * >- */ >- >-#include "config.h" >-#include "Icon.h" >- >-#include "GraphicsContext.h" >-#include "IntRect.h" >-#include "NotImplemented.h" >-#include "PlatformString.h" >- >-namespace WebCore { >- >-Icon::~Icon() >-{ >- notImplemented(); >-} >- >-PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>& filenames) >-{ >- notImplemented(); >- return 0; >-} >- >-void Icon::paint(GraphicsContext*, const IntRect&) >-{ >- notImplemented(); >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/platform/graphics/brew/ImageBrew.cpp >=================================================================== >--- Source/WebCore/platform/graphics/brew/ImageBrew.cpp (revision 95921) >+++ Source/WebCore/platform/graphics/brew/ImageBrew.cpp (working copy) >@@ -1,56 +0,0 @@ >-/* >- * Copyright (c) 2010, Company 100, 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. >- */ >- >-#include "config.h" >-#include "Image.h" >- >-#include "BitmapImage.h" >-#include "FileSystem.h" >-#include "SharedBuffer.h" >- >-#include <wtf/text/CString.h> >-#include <wtf/text/WTFString.h> >- >-namespace WebCore { >- >-PassRefPtr<Image> Image::loadPlatformResource(const char *name) >-{ >- String resourcePath = homeDirectoryPath() + "res/" + name + ".png"; >- >- RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(resourcePath.utf8().data()); >- if (!buffer) >- return Image::nullImage(); >- >- RefPtr<Image> image = BitmapImage::create(); >- image->setData(buffer, true); >- return image.release(); >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/graphics/brew/IntPointBrew.cpp >=================================================================== >--- Source/WebCore/platform/graphics/brew/IntPointBrew.cpp (revision 95921) >+++ Source/WebCore/platform/graphics/brew/IntPointBrew.cpp (working copy) >@@ -1,48 +0,0 @@ >-/* >- * Copyright (C) 2009 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "IntPoint.h" >- >-#include <AEEPoint.h> >- >-namespace WebCore { >- >-IntPoint::IntPoint(const AEEPoint& point) >- : m_x(point.x) >- , m_y(point.y) >-{ >-} >- >-IntPoint::operator AEEPoint() const >-{ >- AEEPoint point; >- point.x = static_cast<int16>(m_x); >- point.y = static_cast<int16>(m_y); >- return point; >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/platform/graphics/brew/IntSizeBrew.cpp >=================================================================== >--- Source/WebCore/platform/graphics/brew/IntSizeBrew.cpp (revision 95921) >+++ Source/WebCore/platform/graphics/brew/IntSizeBrew.cpp (working copy) >@@ -1,48 +0,0 @@ >-/* >- * Copyright (C) 2009 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "IntSize.h" >- >-#include <AEE.h> >- >-namespace WebCore { >- >-IntSize::IntSize(const AEESize& size) >- : m_width(size.cx) >- , m_height(size.cy) >-{ >-} >- >-IntSize::operator AEESize() const >-{ >- AEESize size; >- size.cx = width(); >- size.cy = height(); >- return size; >-} >- >-} // namespace WebCore >- >Index: Source/WebCore/platform/network/brew/DNSBrew.cpp >=================================================================== >--- Source/WebCore/platform/network/brew/DNSBrew.cpp (revision 95921) >+++ Source/WebCore/platform/network/brew/DNSBrew.cpp (working copy) >@@ -1,40 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, Inc. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "DNS.h" >- >-#include "NotImplemented.h" >- >-namespace WebCore { >- >-void prefetchDNS(const String& hostname) >-{ >- // DNS prefetching is not implemented because the maximum number of UDP >- // sockets is quite small in most BREW devices. >- notImplemented(); >-} >- >-} >Index: Source/WebCore/platform/network/brew/SocketStreamError.h >=================================================================== >--- Source/WebCore/platform/network/brew/SocketStreamError.h (revision 95921) >+++ Source/WebCore/platform/network/brew/SocketStreamError.h (working copy) >@@ -1,50 +0,0 @@ >-/* >- * Copyright (C) 2009 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 SocketStreamError_h >-#define SocketStreamError_h >- >-#include "SocketStreamErrorBase.h" >- >-namespace WebCore { >- >-class SocketStreamError : public SocketStreamErrorBase { >-public: >- SocketStreamError() { } >- explicit SocketStreamError(int errorCode) >- : SocketStreamErrorBase(errorCode) >- { >- } >- >-}; >- >-} // namespace WebCore >- >-#endif // SocketStreamError_h >Index: Source/WebCore/platform/network/brew/SocketStreamHandle.h >=================================================================== >--- Source/WebCore/platform/network/brew/SocketStreamHandle.h (revision 95921) >+++ Source/WebCore/platform/network/brew/SocketStreamHandle.h (working copy) >@@ -1,72 +0,0 @@ >-/* >- * Copyright (C) 2009 Apple Inc. All rights reserved. >- * Copyright (C) 2009 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 SocketStreamHandle_h >-#define SocketStreamHandle_h >- >-#include "SocketStreamHandleBase.h" >- >-#include <wtf/PassRefPtr.h> >-#include <wtf/RefCounted.h> >- >-namespace WebCore { >- >-class AuthenticationChallenge; >-class Credential; >-class SocketStreamHandleClient; >-class SocketStreamHandlePrivate; >- >-class SocketStreamHandle : public RefCounted<SocketStreamHandle>, public SocketStreamHandleBase { >-public: >- static PassRefPtr<SocketStreamHandle> create(const KURL& url, SocketStreamHandleClient* client) { return adoptRef(new SocketStreamHandle(url, client)); } >- >- virtual ~SocketStreamHandle(); >- >-protected: >- virtual int platformSend(const char* data, int length); >- virtual void platformClose(); >- >-private: >- SocketStreamHandle(const KURL&, SocketStreamHandleClient*); >- >- // No authentication for streams per se, but proxy may ask for credentials. >- void didReceiveAuthenticationChallenge(const AuthenticationChallenge&); >- void receivedCredential(const AuthenticationChallenge&, const Credential&); >- void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&); >- void receivedCancellation(const AuthenticationChallenge&); >- >- SocketStreamHandlePrivate* m_p; >- friend class SocketStreamHandlePrivate; >-}; >- >-} // namespace WebCore >- >-#endif // SocketStreamHandle_h >Index: Source/WebCore/platform/network/brew/SocketStreamHandleBrew.cpp >=================================================================== >--- Source/WebCore/platform/network/brew/SocketStreamHandleBrew.cpp (revision 95921) >+++ Source/WebCore/platform/network/brew/SocketStreamHandleBrew.cpp (working copy) >@@ -1,230 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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. >- */ >- >-#include "config.h" >-#include "SocketStreamHandle.h" >- >-#include "KURL.h" >-#include "Logging.h" >-#include "NotImplemented.h" >-#include "SocketStreamHandleClient.h" >-#include "SocketStreamHandlePrivate.h" >-#include <wtf/Vector.h> >-#include <wtf/brew/ShellBrew.h> >-#include <wtf/text/CString.h> >- >-namespace WebCore { >- >-static void socketStreamConnectCallback(void* user, int nError) >-{ >- SocketStreamHandlePrivate* p = reinterpret_cast<SocketStreamHandlePrivate*>(user); >- >- if (nError != AEE_NET_SUCCESS) { >- p->socketError(nError); >- return; >- } >- >- p->socketConnected(); >-} >- >-static void getHostByNameCallback(void* user) >-{ >- SocketStreamHandlePrivate* p = reinterpret_cast<SocketStreamHandlePrivate*>(user); >- >- if (p->m_dns.nResult < 1 || p->m_dns.nResult > AEEDNSMAXADDRS) { >- p->socketError(p->m_dns.nResult); >- return; >- } >- >- p->connect(); >-} >- >-static void socketReadableCallback(void* user) >-{ >- SocketStreamHandlePrivate* p = reinterpret_cast<SocketStreamHandlePrivate*>(user); >- p->socketReadyRead(); >-} >- >-static INetMgr* networkManager() >-{ >- static INetMgr* s_netMgr; >- >- if (!s_netMgr) { >- IShell* shell = reinterpret_cast<AEEApplet*>(GETAPPINSTANCE())->m_pIShell; >- ISHELL_CreateInstance(shell, AEECLSID_NET, reinterpret_cast<void**>(&s_netMgr)); >- ASSERT(s_netMgr); >- } >- >- return s_netMgr; >-} >- >-SocketStreamHandlePrivate::SocketStreamHandlePrivate(SocketStreamHandle* streamHandle, const KURL& url) >-{ >- m_streamHandle = streamHandle; >- m_isSecure = url.protocolIs("wss"); >- >- m_socket.set(INETMGR_OpenSocket(networkManager(), AEE_SOCK_STREAM)); >- if (!m_socket) >- return; >- >- if (m_isSecure) >- m_ssl = createInstance<ISSL>(AEECLSID_SSL); >- >- m_port = url.hasPort() ? url.port() : (m_isSecure ? 443 : 80); >- >- CALLBACK_Init(&m_dnsCallback, getHostByNameCallback, this); >- m_dnsCallback.pfnCancel = 0; >- >- INETMGR_GetHostByName(networkManager(), &m_dns, url.host().latin1().data(), &m_dnsCallback); >-} >- >-SocketStreamHandlePrivate::~SocketStreamHandlePrivate() >-{ >-} >- >-void SocketStreamHandlePrivate::socketConnected() >-{ >- if (m_streamHandle && m_streamHandle->client()) { >- m_streamHandle->m_state = SocketStreamHandleBase::Open; >- m_streamHandle->client()->didOpenSocketStream(m_streamHandle); >- } >- >- ISOCKET_Readable(m_socket.get(), socketReadableCallback, this); >-} >- >-void SocketStreamHandlePrivate::socketReadyRead() >-{ >- if (m_streamHandle && m_streamHandle->client()) { >- Vector<char> buffer(1024); >- >- int readSize = ISOCKET_Read(m_socket.get(), buffer.data(), buffer.size()); >- if (readSize == AEE_NET_ERROR) { >- socketError(ISOCKET_GetLastError(m_socket.get())); >- return; >- } >- >- m_streamHandle->client()->didReceiveSocketStreamData(m_streamHandle, buffer.data(), readSize); >- } >- >- ISOCKET_Readable(m_socket.get(), socketReadableCallback, this); >-} >- >-void SocketStreamHandlePrivate::connect() >-{ >- ISOCKET_Connect(m_socket.get(), m_dns.addrs[0], HTONS(m_port), socketStreamConnectCallback, this); >-} >- >-int SocketStreamHandlePrivate::send(const char* data, int len) >-{ >- if (!m_socket) >- return 0; >- >- int sentSize = ISOCKET_Write(m_socket.get(), reinterpret_cast<byte*>(const_cast<char*>(data)), len); >- if (sentSize == AEE_NET_ERROR) { >- socketError(ISOCKET_GetLastError(m_socket.get())); >- return 0; >- } >- >- return sentSize; >-} >- >-void SocketStreamHandlePrivate::close() >-{ >- m_socket.clear(); >-} >- >-void SocketStreamHandlePrivate::socketClosed() >-{ >- if (m_streamHandle && m_streamHandle->client()) { >- SocketStreamHandle* streamHandle = m_streamHandle; >- m_streamHandle = 0; >- // This following call deletes _this_. Nothing should be after it. >- streamHandle->client()->didCloseSocketStream(streamHandle); >- } >-} >- >-void SocketStreamHandlePrivate::socketError(int error) >-{ >- // FIXME - in the future, we might not want to treat all errors as fatal. >- if (m_streamHandle && m_streamHandle->client()) { >- SocketStreamHandle* streamHandle = m_streamHandle; >- m_streamHandle = 0; >- // This following call deletes _this_. Nothing should be after it. >- streamHandle->client()->didCloseSocketStream(streamHandle); >- } >-} >- >-SocketStreamHandle::SocketStreamHandle(const KURL& url, SocketStreamHandleClient* client) >- : SocketStreamHandleBase(url, client) >-{ >- LOG(Network, "SocketStreamHandle %p new client %p", this, m_client); >- m_p = new SocketStreamHandlePrivate(this, url); >-} >- >-SocketStreamHandle::~SocketStreamHandle() >-{ >- LOG(Network, "SocketStreamHandle %p delete", this); >- setClient(0); >- delete m_p; >-} >- >-int SocketStreamHandle::platformSend(const char* data, int len) >-{ >- LOG(Network, "SocketStreamHandle %p platformSend", this); >- return m_p->send(data, len); >-} >- >-void SocketStreamHandle::platformClose() >-{ >- LOG(Network, "SocketStreamHandle %p platformClose", this); >- m_p->close(); >-} >- >-void SocketStreamHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge&) >-{ >- notImplemented(); >-} >- >-void SocketStreamHandle::receivedCredential(const AuthenticationChallenge&, const Credential&) >-{ >- notImplemented(); >-} >- >-void SocketStreamHandle::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&) >-{ >- notImplemented(); >-} >- >-void SocketStreamHandle::receivedCancellation(const AuthenticationChallenge&) >-{ >- notImplemented(); >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/network/brew/SocketStreamHandlePrivate.h >=================================================================== >--- Source/WebCore/platform/network/brew/SocketStreamHandlePrivate.h (revision 95921) >+++ Source/WebCore/platform/network/brew/SocketStreamHandlePrivate.h (working copy) >@@ -1,70 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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 SocketStreamHandlePrivate_h >-#define SocketStreamHandlePrivate_h >- >-#include "SocketStreamHandleBase.h" >- >-#include <AEENet.h> >-#include <AEESSL.h> >-#include <wtf/OwnPtr.h> >- >-namespace WebCore { >- >-class SocketStreamHandleClient; >- >-class SocketStreamHandlePrivate { >-public: >- SocketStreamHandlePrivate(SocketStreamHandle*, const KURL&); >- ~SocketStreamHandlePrivate(); >- >- void socketConnected(); >- void socketReadyRead(); >- void socketClosed(); >- void socketError(int); >- >- void connect(); >- int send(const char* data, int len); >- void close(); >- >- AEEDNSResult m_dns; >- AEECallback m_dnsCallback; >- unsigned int m_port; >- bool m_isSecure; >- >- OwnPtr<ISocket> m_socket; >- OwnPtr<ISSL> m_ssl; >- SocketStreamHandle* m_streamHandle; >-}; >- >-} >- >-#endif // SocketStreamHandlePrivate_h >Index: Source/WebCore/platform/text/brew/TextBoundariesBrew.cpp >=================================================================== >--- Source/WebCore/platform/text/brew/TextBoundariesBrew.cpp (revision 95921) >+++ Source/WebCore/platform/text/brew/TextBoundariesBrew.cpp (working copy) >@@ -1,74 +0,0 @@ >-/* >- * Copyright (C) 2006 Zack Rusin <zack@kde.org> >- * Copyright (C) 2007-2009 Torch Mobile, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "TextBoundaries.h" >- >-#include "NotImplemented.h" >-#include "PlatformString.h" >- >-using namespace WTF::Unicode; >- >-namespace WebCore { >- >-int findNextWordFromIndex(const UChar* buffer, int len, int position, bool forward) >-{ >- notImplemented(); >- return 0; >-} >- >-void findWordBoundary(const UChar* buffer, int len, int position, int* start, int* end) >-{ >- if (position > len) { >- *start = 0; >- *end = 0; >- return; >- } >- >- String str(buffer, len); >- >- int currentPosition = position - 1; >- String foundWord; >- while (currentPosition >= 0 && isLetter(str[currentPosition])) { >- UChar c = str[currentPosition]; >- foundWord.insert(&c, 1, 0); >- --currentPosition; >- } >- >- // currentPosition == 0 means the first char is not letter >- // currentPosition == -1 means we reached the beginning >- int startPos = (currentPosition < 0) ? 0 : ++currentPosition; >- currentPosition = position; >- while (isLetter(str[currentPosition])) { >- foundWord.append(str[currentPosition]); >- ++currentPosition; >- } >- >- *start = startPos; >- *end = currentPosition; >-} >- >-} >Index: Source/WebCore/platform/text/brew/TextBreakIteratorBrew.cpp >=================================================================== >--- Source/WebCore/platform/text/brew/TextBreakIteratorBrew.cpp (revision 95921) >+++ Source/WebCore/platform/text/brew/TextBreakIteratorBrew.cpp (working copy) >@@ -1,334 +0,0 @@ >-/* >- * Copyright (C) 2006 Lars Knoll <lars@trolltech.com> >- * Copyright (C) 2007-2009 Torch Mobile, Inc. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, >- * Boston, MA 02111-1307, USA. >- * >- */ >- >-#include "config.h" >-#include "TextBreakIterator.h" >- >-#include "PlatformString.h" >-#include <wtf/StdLibExtras.h> >-#include <wtf/unicode/Unicode.h> >- >-using namespace std; >-using namespace WTF::Unicode; >- >-namespace WebCore { >- >-// Hack, not entirely correct >-static inline bool isCharStop(UChar c) >-{ >- CharCategory charCategory = category(c); >- return charCategory != Mark_NonSpacing && (charCategory != Other_Surrogate || (c < 0xd800 || c >= 0xdc00)); >-} >- >-static inline bool isLineStop(UChar c) >-{ >- return category(c) != Separator_Line; >-} >- >-static inline bool isSentenceStop(UChar c) >-{ >- return isPunct(c); >-} >- >-class TextBreakIterator { >-public: >- void reset(const UChar* str, int len) >- { >- string = str; >- length = len; >- currentPos = 0; >- } >- virtual int first() = 0; >- virtual int next() = 0; >- virtual int previous() = 0; >- int following(int position) >- { >- currentPos = position; >- return next(); >- } >- int preceding(int position) >- { >- currentPos = position; >- return previous(); >- } >- >- int currentPos; >- const UChar* string; >- int length; >-}; >- >-struct WordBreakIterator: TextBreakIterator { >- virtual int first(); >- virtual int next(); >- virtual int previous(); >-}; >- >-struct CharBreakIterator: TextBreakIterator { >- virtual int first(); >- virtual int next(); >- virtual int previous(); >-}; >- >-struct LineBreakIterator: TextBreakIterator { >- virtual int first(); >- virtual int next(); >- virtual int previous(); >-}; >- >-struct SentenceBreakIterator : TextBreakIterator { >- virtual int first(); >- virtual int next(); >- virtual int previous(); >-}; >- >-int WordBreakIterator::first() >-{ >- currentPos = 0; >- return currentPos; >-} >- >-int WordBreakIterator::next() >-{ >- if (currentPos == length) { >- currentPos = -1; >- return currentPos; >- } >- bool haveSpace = false; >- while (currentPos < length) { >- if (haveSpace && !isSpace(string[currentPos])) >- break; >- if (isSpace(string[currentPos])) >- haveSpace = true; >- ++currentPos; >- } >- return currentPos; >-} >- >-int WordBreakIterator::previous() >-{ >- if (!currentPos) { >- currentPos = -1; >- return currentPos; >- } >- bool haveSpace = false; >- while (currentPos > 0) { >- if (haveSpace && !isSpace(string[currentPos])) >- break; >- if (isSpace(string[currentPos])) >- haveSpace = true; >- --currentPos; >- } >- return currentPos; >-} >- >-int CharBreakIterator::first() >-{ >- currentPos = 0; >- return currentPos; >-} >- >-int CharBreakIterator::next() >-{ >- if (currentPos >= length) >- return -1; >- ++currentPos; >- while (currentPos < length && !isCharStop(string[currentPos])) >- ++currentPos; >- return currentPos; >-} >- >-int CharBreakIterator::previous() >-{ >- if (currentPos <= 0) >- return -1; >- if (currentPos > length) >- currentPos = length; >- --currentPos; >- while (currentPos > 0 && !isCharStop(string[currentPos])) >- --currentPos; >- return currentPos; >-} >- >-int LineBreakIterator::first() >-{ >- currentPos = 0; >- return currentPos; >-} >- >-int LineBreakIterator::next() >-{ >- if (currentPos == length) { >- currentPos = -1; >- return currentPos; >- } >- bool haveSpace = false; >- while (currentPos < length) { >- if (haveSpace && !isLineStop(string[currentPos])) >- break; >- if (isLineStop(string[currentPos])) >- haveSpace = true; >- ++currentPos; >- } >- return currentPos; >-} >- >-int LineBreakIterator::previous() >-{ >- if (!currentPos) { >- currentPos = -1; >- return currentPos; >- } >- bool haveSpace = false; >- while (currentPos > 0) { >- if (haveSpace && !isLineStop(string[currentPos])) >- break; >- if (isLineStop(string[currentPos])) >- haveSpace = true; >- --currentPos; >- } >- return currentPos; >-} >- >-int SentenceBreakIterator::first() >-{ >- currentPos = 0; >- return currentPos; >-} >- >-int SentenceBreakIterator::next() >-{ >- if (currentPos == length) { >- currentPos = -1; >- return currentPos; >- } >- bool haveSpace = false; >- while (currentPos < length) { >- if (haveSpace && !isSentenceStop(string[currentPos])) >- break; >- if (isSentenceStop(string[currentPos])) >- haveSpace = true; >- ++currentPos; >- } >- return currentPos; >-} >- >-int SentenceBreakIterator::previous() >-{ >- if (!currentPos) { >- currentPos = -1; >- return currentPos; >- } >- bool haveSpace = false; >- while (currentPos > 0) { >- if (haveSpace && !isSentenceStop(string[currentPos])) >- break; >- if (isSentenceStop(string[currentPos])) >- haveSpace = true; >- --currentPos; >- } >- return currentPos; >-} >- >-TextBreakIterator* wordBreakIterator(const UChar* string, int length) >-{ >- DEFINE_STATIC_LOCAL(WordBreakIterator, iterator, ()); >- iterator.reset(string, length); >- return &iterator; >-} >- >-TextBreakIterator* characterBreakIterator(const UChar* string, int length) >-{ >- DEFINE_STATIC_LOCAL(CharBreakIterator, iterator, ()); >- iterator.reset(string, length); >- return &iterator; >-} >- >-static TextBreakIterator* staticLineBreakIterator; >- >-TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&) >-{ >- TextBreakIterator* lineBreakIterator = 0; >- if (staticLineBreakIterator) { >- staticLineBreakIterator->reset(string, length); >- swap(staticLineBreakIterator, lineBreakIterator); >- } >- >- if (!lineBreakIterator && string && length) { >- lineBreakIterator = new LineBreakIterator; >- lineBreakIterator->reset(string, length); >- } >- >- return lineBreakIterator; >-} >- >-void releaseLineBreakIterator(TextBreakIterator* iterator) >-{ >- ASSERT(iterator); >- >- if (!staticLineBreakIterator) >- staticLineBreakIterator = iterator; >- else >- delete iterator; >-} >- >-TextBreakIterator* sentenceBreakIterator(const UChar* string, int length) >-{ >- DEFINE_STATIC_LOCAL(SentenceBreakIterator, iterator, ()); >- iterator.reset(string, length); >- return &iterator; >-} >- >-int textBreakFirst(TextBreakIterator* breakIterator) >-{ >- return breakIterator->first(); >-} >- >-int textBreakNext(TextBreakIterator* breakIterator) >-{ >- return breakIterator->next(); >-} >- >-int textBreakPreceding(TextBreakIterator* breakIterator, int position) >-{ >- return breakIterator->preceding(position); >-} >- >-int textBreakFollowing(TextBreakIterator* breakIterator, int position) >-{ >- return breakIterator->following(position); >-} >- >-int textBreakCurrent(TextBreakIterator* breakIterator) >-{ >- return breakIterator->currentPos; >-} >- >-bool isTextBreak(TextBreakIterator*, int) >-{ >- return true; >-} >- >-TextBreakIterator* cursorMovementIterator(const UChar* string, int length) >-{ >- return characterBreakIterator(string, length); >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/text/brew/TextCodecBrew.cpp >=================================================================== >--- Source/WebCore/platform/text/brew/TextCodecBrew.cpp (revision 95921) >+++ Source/WebCore/platform/text/brew/TextCodecBrew.cpp (working copy) >@@ -1,204 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. >- */ >- >-#include "config.h" >-#include "TextCodecBrew.h" >- >-#include "AEEAppGen.h" >-#include "AEEICharsetConv.h" >-#include "NotImplemented.h" >-#include "PlatformString.h" >-#include <wtf/Assertions.h> >-#include <wtf/text/CString.h> >- >-namespace WebCore { >- >-// FIXME: Not sure if there are Brew MP devices which use big endian. >-const char* WebCore::TextCodecBrew::m_internalEncodingName = "UTF-16LE"; >- >-static PassOwnPtr<TextCodec> newTextCodecBrew(const TextEncoding& encoding, const void*) >-{ >- return new TextCodecBrew(encoding); >-} >- >-void TextCodecBrew::registerExtendedEncodingNames(EncodingNameRegistrar registrar) >-{ >- // FIXME: Not sure how to enumerate all available encodings. >- notImplemented(); >-} >- >-void TextCodecBrew::registerExtendedCodecs(TextCodecRegistrar registrar) >-{ >- notImplemented(); >-} >- >-TextCodecBrew::TextCodecBrew(const TextEncoding& encoding) >- : m_charsetConverter(0) >- , m_encoding(encoding) >- , m_numBufferedBytes(0) >-{ >- String format = String::format("%s>%s", encoding.name(), m_internalEncodingName); >- >- IShell* shell = reinterpret_cast<AEEApplet*>(GETAPPINSTANCE())->m_pIShell; >- AEECLSID classID = ISHELL_GetHandler(shell, AEEIID_ICharsetConv, format.latin1().data()); >- ISHELL_CreateInstance(shell, classID, reinterpret_cast<void**>(&m_charsetConverter)); >- >- ASSERT(m_charsetConverter); >-} >- >-TextCodecBrew::~TextCodecBrew() >-{ >- if (m_charsetConverter) >- ICharsetConv_Release(m_charsetConverter); >-} >- >-String TextCodecBrew::decode(const char* bytes, size_t length, bool flush, bool stopOnError, bool& sawError) >-{ >- int code = ICharsetConv_Initialize(m_charsetConverter, m_encoding.name(), m_internalEncodingName, 0); >- ASSERT(code == AEE_SUCCESS); >- >- Vector<UChar> result; >- Vector<unsigned char> prefixedBytes(length); >- >- int srcSize; >- unsigned char* srcBegin; >- >- if (m_numBufferedBytes) { >- srcSize = length + m_numBufferedBytes; >- prefixedBytes.grow(srcSize); >- memcpy(prefixedBytes.data(), m_bufferedBytes, m_numBufferedBytes); >- memcpy(prefixedBytes.data() + m_numBufferedBytes, bytes, length); >- >- srcBegin = prefixedBytes.data(); >- >- // all buffered bytes are consumed now >- m_numBufferedBytes = 0; >- } else { >- srcSize = length; >- srcBegin = const_cast<unsigned char*>(reinterpret_cast<const unsigned char*>(bytes)); >- } >- >- unsigned char* src = srcBegin; >- unsigned char* srcEnd = srcBegin + srcSize; >- >- Vector<UChar> dstBuffer(srcSize); >- >- while (src < srcEnd) { >- int numCharsConverted; >- unsigned char* dstBegin = reinterpret_cast<unsigned char*>(dstBuffer.data()); >- unsigned char* dst = dstBegin; >- int dstSize = dstBuffer.size() * sizeof(UChar); >- >- code = ICharsetConv_CharsetConvert(m_charsetConverter, &src, &srcSize, &dst, &dstSize, &numCharsConverted); >- ASSERT(code != AEE_ENOSUCH); >- >- if (code == AEE_EBUFFERTOOSMALL) { >- // Increase the buffer and try it again. >- dstBuffer.grow(dstBuffer.size() * 2); >- continue; >- } >- >- if (code == AEE_EBADITEM) { >- sawError = true; >- if (stopOnError) { >- result.append(L'?'); >- break; >- } >- >- src++; >- } >- >- if (code == AEE_EINCOMPLETEITEM) { >- if (flush) { >- LOG_ERROR("Partial bytes at end of input while flush requested."); >- sawError = true; >- return String(); >- } >- >- m_numBufferedBytes = srcEnd - src; >- memcpy(m_bufferedBytes, src, m_numBufferedBytes); >- break; >- } >- >- int numChars = (dst - dstBegin) / sizeof(UChar); >- if (numChars > 0) >- result.append(dstBuffer.data(), numChars); >- } >- >- return String::adopt(result); >-} >- >-CString TextCodecBrew::encode(const UChar* characters, size_t length, UnencodableHandling handling) >-{ >- if (!length) >- return ""; >- >- unsigned int replacementCharacter = '?'; >- >- // FIXME: Impossible to handle EntitiesForUnencodables or URLEncodedEntitiesForUnencodables with ICharsetConv. >- int code = ICharsetConv_Initialize(m_charsetConverter, m_internalEncodingName, m_encoding.name(), replacementCharacter); >- ASSERT(code == AEE_SUCCESS); >- >- Vector<char> result; >- >- int srcSize = length * sizeof(UChar); >- unsigned char* srcBegin = const_cast<unsigned char*>(reinterpret_cast<const unsigned char*>(characters)); >- unsigned char* src = srcBegin; >- unsigned char* srcEnd = srcBegin + srcSize; >- >- Vector<unsigned char> dstBuffer(length * sizeof(UChar)); >- >- while (src < srcEnd) { >- int numCharsConverted; >- unsigned char* dstBegin = dstBuffer.data(); >- unsigned char* dst = dstBegin; >- int dstSize = dstBuffer.size(); >- >- code = ICharsetConv_CharsetConvert(m_charsetConverter, &src, &srcSize, &dst, &dstSize, &numCharsConverted); >- ASSERT(code != AEE_EINCOMPLETEITEM); >- >- if (code == AEE_ENOSUCH) { >- LOG_ERROR("Conversion error, Code=%d", code); >- return CString(); >- } >- >- if (code == AEE_EBUFFERTOOSMALL) { >- // Increase the buffer and try it again. >- dstBuffer.grow(dstBuffer.size() * 2); >- continue; >- } >- >- if (code == AEE_EBADITEM) >- src += sizeof(UChar); // Skip the invalid character >- >- int numBytes = dst - dstBegin; >- if (numBytes > 0) >- result.append(dstBuffer.data(), numBytes); >- } >- >- return CString(result.data(), result.size()); >-} >- >-} // namespace WebCore >Index: Source/WebCore/platform/text/brew/TextCodecBrew.h >=================================================================== >--- Source/WebCore/platform/text/brew/TextCodecBrew.h (revision 95921) >+++ Source/WebCore/platform/text/brew/TextCodecBrew.h (working copy) >@@ -1,58 +0,0 @@ >-/* >- * Copyright (C) 2010 Company 100, 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: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. 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. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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 TextCodecBrew_h >-#define TextCodecBrew_h >- >-#include "TextCodec.h" >-#include "TextEncoding.h" >- >-typedef struct ICharsetConv ICharsetConv; >- >-namespace WebCore { >- >-class TextCodecBrew : public TextCodec { >-public: >- static void registerExtendedEncodingNames(EncodingNameRegistrar); >- static void registerExtendedCodecs(TextCodecRegistrar); >- >- TextCodecBrew(const TextEncoding&); >- virtual ~TextCodecBrew(); >- >- virtual String decode(const char*, size_t length, bool flush, bool stopOnError, bool& sawError); >- virtual CString encode(const UChar*, size_t length, UnencodableHandling); >- >-private: >- TextEncoding m_encoding; >- size_t m_numBufferedBytes; >- unsigned char m_bufferedBytes[16]; // bigger than any single multi-byte character >- ICharsetConv* m_charsetConverter; >- >- static const char* m_internalEncodingName; >-}; >- >-} // namespace WebCore >- >-#endif // TextCodecBrew_h >Index: Source/WebKit2/ChangeLog >=================================================================== >--- Source/WebKit2/ChangeLog (revision 95922) >+++ Source/WebKit2/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2011-09-25 Adam Barth <abarth@webkit.org> >+ >+ Finish removing PLATFORM(BREWMP) by removing associated code >+ https://bugs.webkit.org/show_bug.cgi?id=68779 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Scripts/generate-forwarding-headers.pl: >+ > 2011-09-25 Adam Barth <abarth@webkit.org> > > Remove PLATFORM(HAIKU) and associated code >Index: Source/WebKit2/Scripts/generate-forwarding-headers.pl >=================================================================== >--- Source/WebKit2/Scripts/generate-forwarding-headers.pl (revision 95922) >+++ Source/WebKit2/Scripts/generate-forwarding-headers.pl (working copy) >@@ -35,7 +35,7 @@ use File::Spec::Functions; > > my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../..")); > my $incFromRoot = abs_path($ARGV[0]); >-my @platformPrefixes = ("brew", "cf", "chromium", "curl", "efl", "gtk", "mac", "qt", "soup", "v8", "win", "wx"); >+my @platformPrefixes = ("cf", "chromium", "curl", "efl", "gtk", "mac", "qt", "soup", "v8", "win", "wx"); > my @frameworks = ( "JavaScriptCore", "WebCore", "WebKit2"); > my @skippedPrefixes; > my @frameworkHeaders; >Index: Source/cmake/WebKitPackaging.cmake >=================================================================== >--- Source/cmake/WebKitPackaging.cmake (revision 95922) >+++ Source/cmake/WebKitPackaging.cmake (working copy) >@@ -108,7 +108,6 @@ IF(NOT DEFINED CPACK_SOURCE_IGNORE_FILES > > # File and Directory patterns that no CMake-ified port uses > SET(FILE_PATTERNS_UNKNOWN_PORTS >- "/brew/" "/Brew/" "brew\\\\." "Brew\\\\." > "/carbon/" "/Carbon/" "carbon\\\\." "Carbon\\\\." > "/cf/" "/Cf/" "cf\\\\." "Cf\\\\." > "/cg/" "/Cg/" "cg\\\\." "Cg\\\\." >Index: Tools/ChangeLog >=================================================================== >--- Tools/ChangeLog (revision 95922) >+++ Tools/ChangeLog (working copy) >@@ -1,3 +1,13 @@ >+2011-09-25 Adam Barth <abarth@webkit.org> >+ >+ Finish removing PLATFORM(BREWMP) by removing associated code >+ https://bugs.webkit.org/show_bug.cgi?id=68779 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Scripts/webkitpy/common/config/build.py: >+ * waf/build/settings.py: >+ > 2011-09-25 Adam Barth <abarth@webkit.org> > > Remove PLATFORM(HAIKU) and associated code >Index: Tools/Scripts/webkitpy/common/config/build.py >=================================================================== >--- Tools/Scripts/webkitpy/common/config/build.py (revision 95922) >+++ Tools/Scripts/webkitpy/common/config/build.py (working copy) >@@ -46,7 +46,6 @@ def _should_file_trigger_build(target_pl > ("Source/WebCore/manual-tests", []), > ("Tools/BuildSlaveSupport/build.webkit.org-config/public_html", []), > ("Websites", []), >- ("brew", []), > ("efl", []), > ("iphone", []), > ("opengl", []), >Index: Tools/waf/build/settings.py >=================================================================== >--- Tools/waf/build/settings.py (revision 95922) >+++ Tools/waf/build/settings.py (working copy) >@@ -61,7 +61,6 @@ common_libpaths = [] > common_frameworks = [] > > ports = [ >- 'Brew', > 'Chromium', > 'Gtk', > 'Mac',
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 68779
: 108610