<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4ebb8c1e69c83f42cf4e1a1ffd2ba715f8746908">https://github.com/macports/macports-ports/commit/4ebb8c1e69c83f42cf4e1a1ffd2ba715f8746908</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4ebb8c1 qt4-mac: update patches to work with 10.[45] PPC and 10.5+ Intel.
</span>4ebb8c1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4ebb8c1e69c83f42cf4e1a1ffd2ba715f8746908
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Mar 1 08:31:21 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt4-mac: update patches to work with 10.[45] PPC and 10.5+ Intel.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Addresses PR #740.
</span>---
aqua/qt4-mac/Portfile | 66 +-
aqua/qt4-mac/files/patch-qsettings-null.diff | 60 +
aqua/qt4-mac/files/patch-qt-custom-threadpool.diff | 149 ++
.../patch-qt4-versions-without-underscores.diff | 12 +
aqua/qt4-mac/files/patch-qthread-stacksize.diff | 56 +
...orelib_io_qfilesystemengine_unix.cpp-tiger.diff | 41 +
...h-src_gui_dialogs_qfontdialog_mac.mm-tiger.diff | 34 +
...tch-src_gui_kernel_qt_cocoa_helpers_mac.mm.diff | 15 -
...rc_gui_painting_qpaintengine_mac.cpp-tiger.diff | 19 +
...src_gui_painting_qprintengine_mac.mm-tiger.diff | 14 +
...h-src_gui_text_qfontdatabase_mac.cpp-tiger.diff | 21 +
...network_kernel_qnetworkproxy_mac.cpp-tiger.diff | 18 +
aqua/qt4-mac/files/patch-webkit-tiger.diff | 2619 ++++++++++++++++++++
13 files changed, 3085 insertions(+), 39 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/Portfile b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f72549f..2e1f990 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name qt4-mac
version 4.8.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,22 +211,12 @@ patchfiles-append \
</span> patchfiles-append \
patch-tools_macdeployqt_macdeployqt_main.cpp.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (19) Under 10.4 only: patch QMake build files using just "-lQtHelp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to do "-lQtHelp -lQtCLucene -lQtNetwork -lQtWebKit" instead. For
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# some reason 10.5+ "knows" that how to do this correctly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${MINOR} == 4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-QtHelp_10.4_only.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (20) fix the Mac timer's use of "mach_timebase_info"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (19) fix the Mac timer's use of "mach_timebase_info"
</span>
patchfiles-append \
patch-src_corelib_tools_qelapsedtimer-mac.cpp.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (21) Under 10.8 and 10.9: Patch to fix corelib linking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (20) Under 10.8 and 10.9: Patch to fix corelib linking
</span>
platform darwin {
if {${MINOR} >= 8} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,12 +224,12 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (22) fix Framework directory in MacDeployQt tool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (21) fix Framework directory in MacDeployQt tool
</span>
patchfiles-append \
patch-tools_macdeployqt_shared_shared.cpp.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (23) remove ColorSync usage from qpaintengine.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (22) remove ColorSync usage from qpaintengine.
</span>
# This patch allows for building using the 10.11 SDK, and is also
# backward compatible with prior OS versions since it just removes API
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -250,7 +240,7 @@ patchfiles-append \
</span> patchfiles-append \
patch-src_gui_painting_qpaintengine_mac.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (24) fix qcursor_mac; already committed upstream; see also:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (23) fix qcursor_mac; already committed upstream; see also:
</span> # https://trac.macports.org/ticket/48516
# http://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa/qcocoacursor.mm?id=02ea0235216beef390e9868ff770c7a54d70db83
# https://developer.apple.com/library/prerelease/mac/documentation/Carbon/Reference/QuartzEventServicesRef/#//apple_ref/c/func/CGEventCreateMouseEvent
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -258,7 +248,7 @@ patchfiles-append \
</span> patchfiles-append \
patch-src_gui_kernel_qcursor_mac.mm.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (25) avoid zombie processes; see also:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (24) avoid zombie processes; see also:
</span> # https://trac.macports.org/ticket/46608
# https://codereview.qt-project.org/#/c/61294/
# approved but abandoned.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,13 +256,13 @@ patchfiles-append \
</span> patchfiles-append \
patch-src_corelib_io_qprocess_unix.cpp.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (26) fix build on Leopard; see also:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (25) fix build on Leopard; see also:
</span> # https://trac.macports.org/ticket/43746
patchfiles-append \
patch-src_gui_dialogs_qfiledialog_mac.mm.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (27) QTKit no longer exists as of macOS 10.12 (Sierra)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (26) QTKit no longer exists as of macOS 10.12 (Sierra)
</span> # https://trac.macports.org/ticket/52332
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,21 +271,49 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (28) Better invalid fonttable handling
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (27) Better invalid fonttable handling
</span> # Qt commit 0a2f2382 on July 10, 2015 at 7:22:32 AM EDT.
# not included in 4.8.7 release.
patchfiles-append patch-better-invalid-fonttable-handling.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (29) Fix pointer comparison with 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (28) Fix pointer comparison with 0
</span> # These error out on clang 4.0, whereas they didn't in 3.9.
patchfiles-append patch-fix_pointer_comparison_to_0.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# (30) Fix build on 10.13; comment out assertions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# won't hurt current builds, but allows building on 10.13 / Xcode 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (29) Backport of Qt5 patch to fix an issue with null bytes in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# QSetting strings (QTBUG-56124).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-qsettings-null.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (30) Various patches to fix compilation and runtime on 10.4 Tiger.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# These us # macros keyed on >= 10.5 or not, and so do not harm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compilation on non-Tiger Mac OS X.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_corelib_io_qfilesystemengine_unix.cpp-tiger.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_network_kernel_qnetworkproxy_mac.cpp-tiger.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_gui_painting_qprintengine_mac.mm-tiger.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_gui_dialogs_qfontdialog_mac.mm-tiger.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_gui_text_qfontdatabase_mac.cpp-tiger.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_gui_painting_qpaintengine_mac.cpp-tiger.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-webkit-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (31) Patch to fix build on macOS High Sierra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-qt4-versions-without-underscores.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (32) Fix default thread stack size on Mac OS X (QTBUG-49607)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugreports.qt.io/secure/attachment/52520/patch-qthread-stacksize.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note that Qt 5.10 and later implement QThreadPool:stackSize to set the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# stack size (QTBUG-2568).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-qthread-stacksize.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (33) Add possibility to set a custom global thread pool
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src_gui_kernel_qt_cocoa_helpers_mac.mm.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-qt-custom-threadpool.diff
</span>
# error out if trying to build on a new OSX version (> 10.12).
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-qsettings-null.diff b/aqua/qt4-mac/files/patch-qsettings-null.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9506bca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-qsettings-null.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/io/qsettings.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/io/qsettings.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -487,7 +487,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QVariant::Double:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QVariant::KeySequence: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = v.toString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (result.startsWith(QLatin1Char('@')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (result.contains(QChar::Null))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = QLatin1String("@String(") + result + QLatin1Char(')');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (result.startsWith(QLatin1Char('@')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result.prepend(QLatin1Char('@'));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -554,6 +556,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (s.endsWith(QLatin1Char(')'))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (s.startsWith(QLatin1String("@ByteArray("))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return QVariant(s.toLatin1().mid(11, s.size() - 12));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else if (s.startsWith(QLatin1String("@String("))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return QVariant(s.midRef(8, s.size() - 9).toString());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (s.startsWith(QLatin1String("@Variant("))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef QT_NO_DATASTREAM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QByteArray a(s.toLatin1().mid(9));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/io/qsettings_mac.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/io/qsettings_mac.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -218,7 +218,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QVariant::String:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string_case:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = QCFString::toCFStringRef(QSettingsPrivate::variantToString(value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString string = QSettingsPrivate::variantToString(value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (string.contains(QChar::Null)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QByteArray ba = string.toUtf8();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = CFDataCreate(kCFAllocatorDefault, reinterpret_cast<const UInt8 *>(ba.data()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFIndex(ba.size()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = QCFString::toCFStringRef(string);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -269,8 +276,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (bool)CFBooleanGetValue(static_cast<CFBooleanRef>(cfvalue));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (typeId == CFDataGetTypeID()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFDataRef cfdata = static_cast<CFDataRef>(cfvalue);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return QByteArray(reinterpret_cast<const char *>(CFDataGetBytePtr(cfdata)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFDataGetLength(cfdata));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QByteArray byteArray = QByteArray(reinterpret_cast<const char *>(CFDataGetBytePtr(cfdata)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFDataGetLength(cfdata));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Fast-path for QByteArray, so that we don't have to go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // though the expensive and lossy conversion via UTF-8.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!byteArray.startsWith('@'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return byteArray;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const QString str = QString::fromUtf8(byteArray.constData(), byteArray.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return QSettingsPrivate::stringToVariant(str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (typeId == CFDictionaryGetTypeID()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFDictionaryRef cfdict = static_cast<CFDictionaryRef>(cfvalue);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFTypeID arrayTypeId = CFArrayGetTypeID();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-qt-custom-threadpool.diff b/aqua/qt4-mac/files/patch-qt-custom-threadpool.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ddeba26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-qt-custom-threadpool.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,149 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/concurrent/qthreadpool.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/concurrent/qthreadpool.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef QT_NO_THREAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static QScopedPointer<QThreadPool> gThreadPool(new QThreadPool());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline bool operator<(int priority, const QPair<QRunnable *, int> &p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,23 +58,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return priority < p.second;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Q_GLOBAL_STATIC(QThreadPool, theInstance)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QThread wrapper, provides synchronization against a ThreadPool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class QThreadPoolThread : public QThread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QThreadPoolThread(QThreadPoolPrivate *manager);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void run();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void registerThreadInactive();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QWaitCondition runnableReady;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QThreadPoolPrivate *manager;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QRunnable *runnable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QThreadPool private class.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,8 +66,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*!\internal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QThreadPoolThread::QThreadPoolThread(QThreadPoolPrivate *manager)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- :manager(manager), runnable(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QThreadPoolThread::QThreadPoolThread()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ :manager(0), runnable(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* \internal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -240,13 +225,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return activeThreadCount > maxThreadCount && (activeThreadCount - reservedThreads) > 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QThreadPoolThread* QThreadPool::createThreadPoolThread() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QThreadPoolThread* ret = new QThreadPoolThread();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret->setObjectName(QLatin1String("Thread (pooled)"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*! \internal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void QThreadPoolPrivate::startThread(QRunnable *runnable)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QScopedPointer <QThreadPoolThread> thread(new QThreadPoolThread(this));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- thread->setObjectName(QLatin1String("Thread (pooled)"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QScopedPointer <QThreadPoolThread> thread(q_func()->createThreadPoolThread());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ thread->manager = this;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allThreads.insert(thread.data());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ++activeThreads;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -444,7 +436,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QThreadPool *QThreadPool::globalInstance()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return theInstance();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return gThreadPool.data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QThreadPool::setGlobalInstance(QThreadPool* instance)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gThreadPool.reset(instance);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/concurrent/qthreadpool.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/concurrent/qthreadpool.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,15 +46,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtCore/qthread.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtCore/qrunnable.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QtCore/qwaitcondition.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef QT_NO_THREAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define QT_CUSTOM_THREADPOOL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_BEGIN_HEADER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_MODULE(Core)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class QThreadPoolPrivate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class QThreadPool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QThread wrapper, provides synchronization against a ThreadPool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class Q_CORE_EXPORT QThreadPoolThread : public QThread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QThreadPoolThread();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void run();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ friend class QThreadPoolPrivate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ friend class QThreadPool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void registerThreadInactive();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QWaitCondition runnableReady;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QThreadPoolPrivate *manager;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QRunnable *runnable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class Q_CORE_EXPORT QThreadPool : public QObject
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_OBJECT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,6 +97,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~QThreadPool();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static QThreadPool *globalInstance();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static void setGlobalInstance(QThreadPool* instance);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void start(QRunnable *runnable, int priority = 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool tryStart(QRunnable *runnable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,6 +115,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void waitForDone();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool waitForDone(int msecs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ virtual QThreadPoolThread* createThreadPoolThread() const;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_END_NAMESPACE
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-qt4-versions-without-underscores.diff b/aqua/qt4-mac/files/patch-qt4-versions-without-underscores.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..26d9140
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-qt4-versions-without-underscores.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/kernel/qt_cocoa_helpers_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/kernel/qt_cocoa_helpers_mac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +73,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ **
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ****************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Workaround for macOS 10.13 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <private/qcore_mac_p.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <qaction.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <qwidget.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-qthread-stacksize.diff b/aqua/qt4-mac/files/patch-qthread-stacksize.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0eb64f9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-qthread-stacksize.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/thread/qthread_unix.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/thread/qthread_unix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,6 +79,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/resource.h> // getrlimit/setrlimit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef qDebug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define old_qDebug qDebug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # undef qDebug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -649,6 +650,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // QT_HAS_THREAD_PRIORITY_SCHEDULING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (d->stackSize == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Fix the default (too small) stack size for threads on OS X,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // which also affects the thread pool.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // See also:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // https://bugreports.qt.io/browse/QTBUG-2568
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // This fix can also be found in Chromium:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // https://chromium.googlesource.com/chromium/src.git/+/master/base/threading/platform_thread_mac.mm#186
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // The Mac OS X default for a pthread stack size is 512kB.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Libc-594.1.4/pthreads/pthread.c's pthread_attr_init uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // DEFAULT_STACK_SIZE for this purpose.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // 512kB isn't quite generous enough for some deeply recursive threads that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // otherwise request the default stack size by specifying 0. Here, adopt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // glibc's behavior as on Linux, which is to use the current stack size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // limit (ulimit -s) as the default stack size. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // glibc-2.11.1/nptl/nptl-init.c's __pthread_initialize_minimal_internal. To
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // avoid setting the limit below the Mac OS X default or the minimum usable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // stack size, these values are also considered. If any of these values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // can't be determined, or if stack size is unlimited (ulimit -s unlimited),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // stack_size is left at 0 to get the system default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Mac OS X normally only applies ulimit -s to the main thread stack. On
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // contemporary OS X and Linux systems alike, this value is generally 8MB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // or in that neighborhood.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t default_stack_size = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct rlimit stack_rlimit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (pthread_attr_getstacksize(&attr, &default_stack_size) == 0 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ getrlimit(RLIMIT_STACK, &stack_rlimit) == 0 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stack_rlimit.rlim_cur != RLIM_INFINITY) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default_stack_size =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::max(std::max(default_stack_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static_cast<size_t>(PTHREAD_STACK_MIN)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static_cast<size_t>(stack_rlimit.rlim_cur));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d->stackSize = default_stack_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (d->stackSize > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0 > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int code = pthread_attr_setstacksize(&attr, d->stackSize);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_corelib_io_qfilesystemengine_unix.cpp-tiger.diff b/aqua/qt4-mac/files/patch-src_corelib_io_qfilesystemengine_unix.cpp-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6b0b7bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_corelib_io_qfilesystemengine_unix.cpp-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/io/qfilesystemengine_unix.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/io/qfilesystemengine_unix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,6 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (fileInfo->finderFlags & kIsInvisible);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool isPackage(const QFileSystemMetaData &data, const QFileSystemEntry &entry)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!data.isDirectory())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,6 +139,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FolderInfo *folderInfo = reinterpret_cast<FolderInfo *>(catalogInfo.finderInfo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return folderInfo->finderFlags & kHasBundle;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline bool _q_isMacHidden(const char *nativePath)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -529,8 +531,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(QWS) && !defined(Q_WS_QPA) && defined(Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (what & QFileSystemMetaData::BundleType) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryExists && isPackage(data, entry))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data.entryFlags |= QFileSystemMetaData::BundleType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (entryExists && data.isDirectory()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QCFType<CFStringRef> path = CFStringCreateWithBytes(0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (const UInt8*)nativeFilePath, nativeFilePathLength,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kCFStringEncodingUTF8, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QCFType<CFURLRef> url = CFURLCreateWithFileSystemPath(0, path,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kCFURLPOSIXPathStyle, true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UInt32 type, creator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (CFBundleGetPackageInfoInDirectory(url, &type, &creator))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ data.entryFlags |= QFileSystemMetaData::BundleType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data.knownFlagsMask |= QFileSystemMetaData::BundleType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_gui_dialogs_qfontdialog_mac.mm-tiger.diff b/aqua/qt4-mac/files/patch-src_gui_dialogs_qfontdialog_mac.mm-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3b10b67
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_gui_dialogs_qfontdialog_mac.mm-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/dialogs/qfontdialog_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/dialogs/qfontdialog_mac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,6 +141,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QFont newFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cocoaFont) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int pSize = qRound([cocoaFont pointSize]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTFontDescriptorRef font = CTFontCopyFontDescriptor((CTFontRef)cocoaFont);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // QCoreTextFontDatabase::populateFontDatabase() is using localized names
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString family = QCFString::toQString((CFStringRef) CTFontDescriptorCopyLocalizedAttribute(font, kCTFontFamilyNameAttribute, NULL));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,6 +152,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ newFont.setStrikeOut(resolveFont.strikeOut());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFRelease(font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // This pre-Leopard version is buggy and was fixed in 717e36037cf246aa201c0aaf15a5dcbd7883f159
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // see QTBUG-27415 https://codereview.qt-project.org/#/c/42830/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString family(qt_mac_NSStringToQString([cocoaFont familyName]));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString typeface(qt_mac_NSStringToQString([cocoaFont fontName]));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int hyphenPos = typeface.indexOf(QLatin1Char('-'));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (hyphenPos != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typeface.remove(0, hyphenPos + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typeface = QLatin1String("Normal");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ newFont = QFontDatabase().font(family, typeface, pSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ newFont.setUnderline(resolveFont.underline());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ newFont.setStrikeOut(resolveFont.strikeOut());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return newFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac.mm.diff b/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac.mm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 780a1cb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac.mm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/kernel/qt_cocoa_helpers_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/kernel/qt_cocoa_helpers_mac.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -351,9 +351,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSStatus err = noErr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- require_action(inContext != NULL, InvalidContext, err = paramErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- require_action(inBounds != NULL, InvalidBounds, err = paramErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- require_action(inImage != NULL, InvalidImage, err = paramErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// require_action(inContext != NULL, InvalidContext, err = paramErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// require_action(inBounds != NULL, InvalidBounds, err = paramErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// require_action(inImage != NULL, InvalidImage, err = paramErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextSaveGState( inContext );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.cpp-tiger.diff b/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.cpp-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..17b84f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_gui_painting_qpaintengine_mac.cpp-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/painting/qpaintengine_mac.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/painting/qpaintengine_mac.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,7 +334,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((colorSpace = m_displayColorSpaceHash.value(displayID)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return colorSpace;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colorSpace = CGDisplayCopyColorSpace(displayID);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CMProfileRef displayProfile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CMError err = CMGetProfileByAVID((CMDisplayIDType)displayID, &displayProfile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (err == noErr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ colorSpace = CGColorSpaceCreateWithPlatformColorSpace(displayProfile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CMCloseProfile(displayProfile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (colorSpace == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colorSpace = CGColorSpaceCreateDeviceRGB();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_gui_painting_qprintengine_mac.mm-tiger.diff b/aqua/qt4-mac/files/patch-src_gui_painting_qprintengine_mac.mm-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7e5ce5c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_gui_painting_qprintengine_mac.mm-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/painting/qprintengine_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/painting/qprintengine_mac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -187,7 +187,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paperMargins.top = topMargin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paperMargins.right = rightMargin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paperMargins.bottom = bottomMargin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PMPaperCreateCustom(printer, paperId, QCFString("Custom size"), customSize.width(), customSize.height(), &paperMargins, &customPaper);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PMPaperCreate(printer, paperId, QCFString("Custom size"), customSize.width(), customSize.height(), &paperMargins, &customPaper);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PMPageFormat tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PMCreatePageFormatWithPMPaper(&tmp, customPaper);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PMCopyPageFormat(tmp, format);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_gui_text_qfontdatabase_mac.cpp-tiger.diff b/aqua/qt4-mac/files/patch-src_gui_text_qfontdatabase_mac.cpp-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f52c0e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_gui_text_qfontdatabase_mac.cpp-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/text/qfontdatabase_mac.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/text/qfontdatabase_mac.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -546,6 +546,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString QFontDatabase::resolveFontFamilyAlias(const QString &family)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(QT_MAC_USE_COCOA) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QCFString expectedFamily = QCFString(family);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QCFType<CFMutableDictionaryRef> attributes = CFDictionaryCreateMutable(NULL, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -563,6 +564,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QCFString familyName = (CFStringRef) CTFontDescriptorCopyLocalizedAttribute(matched, kCTFontFamilyNameAttribute, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return familyName;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // https://bugreports.qt.io/browse/QTBUG-25417?focusedCommentId=185393&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-185393
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return family;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_END_NAMESPACE
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_network_kernel_qnetworkproxy_mac.cpp-tiger.diff b/aqua/qt4-mac/files/patch-src_network_kernel_qnetworkproxy_mac.cpp-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..78b9839
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_network_kernel_qnetworkproxy_mac.cpp-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/network/kernel/qnetworkproxy_mac.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/network/kernel/qnetworkproxy_mac.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,6 +148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static QNetworkProxy proxyFromDictionary(CFDictionaryRef dict)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QNetworkProxy::ProxyType proxyType = QNetworkProxy::DefaultProxy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,6 +181,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return QNetworkProxy(proxyType, hostName, port, user, password);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char * cfurlErrorDescription(SInt32 errorCode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-webkit-tiger.diff b/aqua/qt4-mac/files/patch-webkit-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e1115ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-webkit-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,2619 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/API/JSContextRef.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/API/JSContextRef.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // When running on Tiger or Leopard, or if the application was linked before JSGlobalContextCreate was changed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // to use a unique JSGlobalData, we use a shared one for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NSVersionOfLinkTimeLibrary("JavaScriptCore") <= webkitFirstVersionWithConcurrentGlobalContexts) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1944,21 +1944,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Android.mk: Removed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Android.v8.wtf.mk: Removed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-2011-04-27 Mark Rowe <mrowe@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Fix 32-bit build after r85036.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * wtf/Platform.h: USE(PLUGIN_HOST_PROCESS) is only true for 64-bit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-2011-04-27 Csaba Osztrogonác <ossy@webkit.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Unreviewed buildfix after r85036.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Readd non-dead code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * wtf/OSAllocatorPosix.cpp:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (WTF::OSAllocator::reserveAndCommit):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2011-04-27 Adam Barth <abarth@webkit.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Reviewed by Kenneth Russell.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/FastMalloc.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/FastMalloc.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +97,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Use a background thread to periodically scavenge memory to release back to the system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// https://bugs.webkit.org/show_bug.cgi?id=27900: don't turn this on for Tiger until we have figured out why it caused a crash.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WTF {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4607,10 +4612,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ malloc_introspection_t jscore_fastmalloc_introspection = { &FastMallocZone::enumerate, &FastMallocZone::goodSize, &FastMallocZone::check, &FastMallocZone::print,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &FastMallocZone::log, &FastMallocZone::forceLock, &FastMallocZone::forceUnlock, &FastMallocZone::statistics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , 0, 0, 0, 0 // These members will not be used unless the zone advertises itself as version seven or higher.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags |= MAP_NORESERVE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OS(DARWIN) && !defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int fd = usage;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int fd = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -392,12 +392,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* FIXME: BUILDING_ON_.., and TARGETING... macros should be folded into the OS() system */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define BUILDING_ON_TIGER 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BUILDING_ON_LEOPARD 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BUILDING_ON_SNOW_LEOPARD 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define TARGETING_TIGER 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TARGETING_LEOPARD 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TARGETING_SNOW_LEOPARD 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -623,10 +627,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && CPU(X86_64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_TIGER) && CPU(X86_64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_PLUGIN_HOST_PROCESS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ENABLE_GESTURE_EVENTS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ENABLE_RUBBER_BANDING 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_WK_SCROLLBAR_PAINTER 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -661,7 +665,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_CF 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN) && !PLATFORM(GTK) && !PLATFORM(QT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OS(DARWIN) && !defined(BUILDING_ON_TIGER) && !PLATFORM(GTK) && !PLATFORM(QT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ENABLE_PURGEABLE_MEMORY 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -725,8 +729,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_CF 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_CORE_TEXT 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ENABLE_WEB_ARCHIVE 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define WTF_USE_ATSUI 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -791,7 +799,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_SYS_TIMEB_H 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_ACCELERATE 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef TARGETING_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(TARGETING_TIGER) && !defined(TARGETING_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_DISPATCH_H 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_HOSTED_CORE_ANIMATION 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1153,7 +1161,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PLATFORM(MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Complex text framework */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_ATSUI 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_CORE_TEXT 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1163,15 +1171,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Accelerated compositing */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) &&!defined(WIN_CAIRO))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) &&!defined(WIN_CAIRO))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_ACCELERATED_COMPOSITING 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)) || PLATFORM(IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)) || PLATFORM(IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_PROTECTION_SPACE_AUTH_CALLBACK 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_AVFOUNDATION 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/VMTags.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/VMTags.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach/vm_statistics.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(TARGETING_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(VM_MEMORY_TCMALLOC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VM_TAG_FOR_TCMALLOC_MEMORY VM_MAKE_TAG(VM_MEMORY_TCMALLOC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,6 +52,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VM_TAG_FOR_REGISTERFILE_MEMORY VM_MAKE_TAG(65)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // defined(VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else // !defined(TARGETING_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// mmap on Tiger fails with tags that work on Leopard, so fall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// back to Tiger-compatible tags (that also work on Leopard)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// when targeting Tiger.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define VM_TAG_FOR_TCMALLOC_MEMORY -1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY -1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define VM_TAG_FOR_REGISTERFILE_MEMORY -1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // !defined(TARGETING_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Tags for vm_map and vm_allocate work on both Tiger and Leopard.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(VM_MEMORY_JAVASCRIPT_CORE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VM_TAG_FOR_COLLECTOR_MEMORY VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_CORE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(DARWIN) && USE(CF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !OS(IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !OS(IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SDKROOT_1050_1040 = macosx10.4internal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SDKROOT_1060_1040 = macosx10.4internal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT_1060_1050 = macosx10.5internal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SDKROOT_1070_1040 = macosx10.4internal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT_1070_1050 = macosx10.5internal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT_1070_1060 = macosx10.6internal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +29,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // number. Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // XCODE_VERSION_ACTUAL for the full version number.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TARGET_GCC_VERSION_ = $(TARGET_GCC_VERSION_1040);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TARGET_GCC_VERSION_1040 = GCC_40;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Base.xcconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHS = $(ARCHS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ARCHS_ = $(ARCHS_1040);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ARCHS_1040 = $(NATIVE_ARCH);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHS_1050 = $(NATIVE_ARCH);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHS_1060 = $(ARCHS_STANDARD_32_64_BIT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHS_1070 = $(ARCHS_STANDARD_32_64_BIT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +10,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MACOSX_DEPLOYMENT_TARGET_ = 10.4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_DEPLOYMENT_TARGET_1060 = 10.6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_DEPLOYMENT_TARGET_1070 = 10.7;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/WebCore.exp.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/WebCore.exp.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1419,7 +1419,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __ZN7WebCore20LogNotYetImplementedE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _wkContentAreaDidHide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _wkContentAreaDidShow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _wkContentAreaResized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1785,6 +1785,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .objc_class_name_DOMSVGForeignObjectElement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkClearGlyphVector
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkConvertCharToGlyphs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkCopyFullFontName
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkGetATSStyleGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkGetCGFontFromNSFont
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkGetFontMetrics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkGetGlyphVectorFirstRecord
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkGetGlyphVectorNumGlyphs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkGetGlyphVectorRecordSize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkGetNSFontATSUFontId
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkInitializeGlyphVector
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkReleaseStyleGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_wkSupportsMultipartXMixedReplace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ENABLE(VIDEO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __ZN7WebCore16HTMLMediaElement12endScrubbingEv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1850,7 +1865,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __ZNK7WebCore23ApplicationCacheStorage11maximumSizeEv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __ZN7WebCore6Editor13lowercaseWordEv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __ZN7WebCore6Editor13uppercaseWordEv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __ZN7WebCore6Editor14capitalizeWordEv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/accessibility/AccessibilityList.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/accessibility/AccessibilityList.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef AccessibilityList_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define AccessibilityList_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && (defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ACCESSIBILITY_LISTS 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ACCESSIBILITY_LISTS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/accessibility/AccessibilityTable.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/accessibility/AccessibilityTable.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "AccessibilityRenderObject.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/Forward.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && (defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ACCESSIBILITY_TABLES 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ACCESSIBILITY_TABLES 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -205,7 +205,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This is a deprecated code path which should not be required on Android.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Remove this guard once Bug 39476 is fixed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(ANDROID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(ANDROID) || defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!handled)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = callJNIMethod(m_instance->m_instance, jMethod->returnType(), jMethod->name().utf8().data(), jMethod->signature(), jArgs.data());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/config.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,6 +239,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* USE(CG) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef ENABLE_FTPDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ENABLE_FTPDIR 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PLATFORM(WIN) && USE(CG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_SAFARI_THEME 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/css/CSSImportRule.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/css/CSSImportRule.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool enforceMIMEType = strict;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool needsSiteSpecificQuirks = parent && parent->document() && parent->document()->settings() && parent->document()->settings()->needsSiteSpecificQuirks();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (enforceMIMEType && needsSiteSpecificQuirks) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Covers both http and https, with or without "www."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (baseURL.string().contains("mcafee.com/japan/", false))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/dom/Document.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/dom/Document.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -326,9 +326,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool disableRangeMutation(Page* page)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // This check is made on super-hot code paths, so we only want this on Leopard.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef TARGETING_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Disable Range mutation on document modifications in Leopard Mail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // This check is made on super-hot code paths, so we only want this on Tiger and Leopard.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(TARGETING_TIGER) || defined(TARGETING_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Disable Range mutation on document modifications in Tiger and Leopard Mail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // See <rdar://problem/5865171>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return page && (page->settings()->needsLeopardMailQuirks() || page->settings()->needsTigerMailQuirks());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/editing/Editor.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/editing/Editor.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1908,10 +1908,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Post-Tiger, this menu item is a show/hide toggle, to match AppKit. Leave Tiger behavior alone
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // to match rest of OS X.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (client()->spellingUIIsShowing()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ client()->showSpellingUI(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ advanceToNextMisspelling(true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ client()->showSpellingUI(true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3151,9 +3155,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !PLATFORM(MAC) || (PLATFORM(MAC) && (defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !PLATFORM(MAC) || (PLATFORM(MAC) && (defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This only erases markers that are in the first unit (word or sentence) of the selection.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Perhaps peculiar, but it matches AppKit on these Mac OS X versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Perhaps peculiar, but it matches AppKit on these Mac OSX versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (RefPtr<Range> wordRange = newAdjacentWords.toNormalizedRange())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_frame->document()->markers()->removeMarkers(wordRange.get(), DocumentMarker::Spelling);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/editing/SpellingCorrectionController.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/editing/SpellingCorrectionController.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef SpellingCorrectionController_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SpellingCorrectionController_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Some platforms provide UI for suggesting autocorrection.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SUPPORT_AUTOCORRECTION_PANEL 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Some platforms use spelling and autocorrection markers to provide visual cue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SUPPORT_AUTOCORRECTION_PANEL 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define REMOVE_MARKERS_UPON_EDITING 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // #if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "DocumentMarker.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "EditCommand.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/editing/TypingCommand.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/editing/TypingCommand.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -321,7 +321,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void TypingCommand::markMisspellingsAfterTyping(ETypingCommand commandType)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!document()->frame()->editor()->isContinuousSpellCheckingEnabled()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !document()->frame()->editor()->isAutomaticQuoteSubstitutionEnabled()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !document()->frame()->editor()->isAutomaticLinkDetectionEnabled()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -356,7 +356,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ updatePreservesTypingStyle(commandTypeForAddedTyping);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ document()->frame()->editor()->appliedEditing(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Since the spellchecking code may also perform corrections and other replacements, it should happen after the typing changes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!m_shouldPreventSpellChecking)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/html/HTMLLinkElement.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/html/HTMLLinkElement.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -376,7 +376,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (enforceMIMEType && document()->page() && !document()->page()->settings()->enforceCSSMIMETypeInNoQuirksMode())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enforceMIMEType = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (enforceMIMEType && needsSiteSpecificQuirks) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Covers both http and https, with or without "www."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (baseURL.string().contains("mcafee.com/japan/", false))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/loader/EmptyClients.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/loader/EmptyClients.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -492,8 +492,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void setInsertionPasteboard(NSPasteboard*) { };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual NSURL* canonicalizeURL(NSURL*) { return 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual NSURL* canonicalizeURLString(NSString*) { return 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ virtual NSArray* pasteboardTypesForSelection(Frame*) { return 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void uppercaseWord() { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void lowercaseWord() { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void capitalizeWord() { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/loader/FrameLoader.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/loader/FrameLoader.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2126,8 +2126,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case FrameLoadTypeStandard:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ history()->updateForStandardLoad();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // This code was originally added for a Leopard performance imporvement. We decided to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // ifdef it to fix correctness issues on Tiger documented in <rdar://problem/5441823>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_frame->view())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_frame->view()->setScrollbarsSuppressed(true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_client->transitionToCommittedForNewPage();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/loader/MainResourceLoader.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/loader/MainResourceLoader.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,6 +42,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "HTMLFormElement.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "InspectorInstrumentation.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Page.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(QT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "PluginDatabase.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ResourceError.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ResourceHandle.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ResourceLoadScheduler.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,10 +53,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Settings.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/CurrentTime.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(QT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "PluginDatabase.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: More that is in common with SubresourceLoader should move up into ResourceLoader.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -435,7 +434,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(!m_response.isNull());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if USE(CFNETWORK) || PLATFORM(MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(CFNETWORK) || (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Workaround for <rdar://problem/6060782>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_response.isNull()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_response = ResourceResponse(KURL(), "text/html", 0, String(), String());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/page/ContextMenuController.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/page/ContextMenuController.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -361,9 +361,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagCheckSpellingWhileTyping:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->editor()->toggleContinuousSpellChecking();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagCheckGrammarWithSpelling:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->editor()->toggleGrammarChecking();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PLATFORM(MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagShowFonts:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->editor()->showFontPanel();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -375,7 +377,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->editor()->showColorPanel();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagMakeUpperCase:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->editor()->uppercaseWord();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -465,6 +467,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontMenuItem.setSubMenu(&fontMenu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !PLATFORM(GTK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -501,6 +504,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // !PLATFORM(GTK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void ContextMenuController::createAndAppendSpellingSubMenu(ContextMenuItem& spellingMenuItem)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ContextMenu spellingMenu;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ContextMenuItem showSpellingPanel(ActionType, ContextMenuItemTagShowSpellingPanel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ contextMenuItemTagShowSpellingPanel(true));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ContextMenuItem checkSpelling(ActionType, ContextMenuItemTagCheckSpelling,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ contextMenuItemTagCheckSpelling());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ContextMenuItem checkAsYouType(CheckableActionType, ContextMenuItemTagCheckSpellingWhileTyping,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ contextMenuItemTagCheckSpellingWhileTyping());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ appendItem(showSpellingPanel, &spellingMenu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ appendItem(checkSpelling, &spellingMenu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ appendItem(checkAsYouType, &spellingMenu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spellingMenuItem.setSubMenu(&spellingMenu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PLATFORM(MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -554,7 +578,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void ContextMenuController::createAndAppendSubstitutionsSubMenu(ContextMenuItem& substitutionsMenuItem)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -609,7 +633,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PLATFORM(MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCLUDE_SPOTLIGHT_CONTEXT_MENU_ITEM 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INCLUDE_SPOTLIGHT_CONTEXT_MENU_ITEM 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -839,7 +863,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appendItem(IgnoreGrammarItem, m_contextMenu.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appendItem(*separatorItem(), m_contextMenu.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // If the string was autocorrected, generate a contextual menu item allowing it to be changed back.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ String replacedString = m_hitTestResult.replacedString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -899,6 +923,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!inPasswordField) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !PLATFORM(GTK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appendItem(*separatorItem(), m_contextMenu.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ContextMenuItem SpellingAndGrammarMenuItem(SubmenuType, ContextMenuItemTagSpellingMenu,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -906,7 +931,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ createAndAppendSpellingAndGrammarSubMenu(SpellingAndGrammarMenuItem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appendItem(SpellingAndGrammarMenuItem, m_contextMenu.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ContextMenuItem SpellingMenuItem(SubmenuType, ContextMenuItemTagSpellingMenu,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ contextMenuItemTagSpellingMenu());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ createAndAppendSpellingSubMenu(SpellingMenuItem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ appendItem(SpellingMenuItem, m_contextMenu.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ContextMenuItem substitutionsMenuItem(SubmenuType, ContextMenuItemTagSubstitutionsMenu,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contextMenuItemTagSubstitutionsMenu());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ createAndAppendSubstitutionsSubMenu(substitutionsMenuItem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1059,9 +1090,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldEnable = frame->selection()->isRange();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagCheckGrammarWithSpelling:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (frame->editor()->isGrammarCheckingEnabled())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldCheck = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldEnable = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagItalic: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldCheck = frame->editor()->selectionHasStyle(CSSPropertyFontStyle, "italic") != FalseTriState;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1077,10 +1110,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldEnable = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagShowSpellingPanel:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (frame->editor()->spellingPanelIsShowing())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item.setTitle(contextMenuItemTagShowSpellingPanel(false));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item.setTitle(contextMenuItemTagShowSpellingPanel(true));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldEnable = frame->editor()->canEdit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagNoGuessesFound:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1094,7 +1129,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagTransformationsMenu:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagShowSubstitutions:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (frame->editor()->substitutionsPanelIsShowing())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item.setTitle(contextMenuItemTagShowSubstitutions(false));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1109,32 +1144,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldEnable = frame->editor()->canEdit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagCorrectSpellingAutomatically:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldCheck = frame->editor()->isAutomaticSpellingCorrectionEnabled();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagSmartCopyPaste:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldCheck = frame->editor()->smartInsertDeleteEnabled();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagSmartQuotes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldCheck = frame->editor()->isAutomaticQuoteSubstitutionEnabled();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagSmartDashes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldCheck = frame->editor()->isAutomaticDashSubstitutionEnabled();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagSmartLinks:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldCheck = frame->editor()->isAutomaticLinkDetectionEnabled();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ContextMenuItemTagTextReplacement:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shouldCheck = frame->editor()->isAutomaticTextReplacementEnabled();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/page/EditorClient.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/page/EditorClient.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,9 +132,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void setInsertionPasteboard(NSPasteboard*) = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual NSURL* canonicalizeURL(NSURL*) = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual NSURL* canonicalizeURLString(NSString*) = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ virtual NSArray* pasteboardTypesForSelection(Frame*) = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void uppercaseWord() = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void lowercaseWord() = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void capitalizeWord() = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/DefaultLocalizationStrategy.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/DefaultLocalizationStrategy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,7 +316,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ String DefaultLocalizationStrategy::contextMenuItemTagLookUpInDictionary(const String& selectedString)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNUSED_PARAM(selectedString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return WEB_UI_STRING("Look Up in Dictionary", "Look Up in Dictionary context menu item");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/SuddenTermination.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/SuddenTermination.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void disableSuddenTermination();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void enableSuddenTermination();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (!PLATFORM(MAC) || defined(BUILDING_ON_LEOPARD)) && !PLATFORM(CHROMIUM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (!PLATFORM(MAC) || defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)) && !PLATFORM(CHROMIUM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void disableSuddenTermination() { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void enableSuddenTermination() { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/FontPlatformData.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/FontPlatformData.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct CGFont* CGFontRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef const struct __CTFont* CTFontRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CFBase.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <objc/objc-auto.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,18 +87,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(CG) || USE(SKIA_ON_MAC_CHROME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct CGFont* CGFontRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef const struct __CTFont* CTFontRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef UInt32 FMFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef FMFont ATSUFontID;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef UInt32 ATSFontRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class FontDescription;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OS(DARWIN) && !defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline CTFontRef toCTFontRef(NSFont *nsFont) { return reinterpret_cast<CTFontRef>(nsFont); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,7 +118,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_font(hashTableDeletedFontValue())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if USE(CG) && PLATFORM(WIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_cgFont(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif USE(CAIRO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_scaledFont(hashTableDeletedFontValue())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,7 +140,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_font(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if USE(CG) && PLATFORM(WIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_cgFont(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif USE(CAIRO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_scaledFont(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,7 +165,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_font(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if USE(CG) && PLATFORM(WIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(CG) && (defined(BUILDING_ON_TIGER) || PLATFORM(WIN))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_cgFont(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif USE(CAIRO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_scaledFont(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -214,7 +218,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(CG) || USE(SKIA_ON_MAC_CHROME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGFontRef cgFont() const { return m_cgFont.get(); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGFontRef cgFont() const { return m_cgFont; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTFontRef ctFont() const;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool roundsGlyphAdvances() const;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -325,7 +333,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PLATFORM(WIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<CGFontRef> m_cgFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<CGFontRef> m_cgFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGFontRef m_cgFont; // It is not necessary to refcount this, since either an NSFont owns it or some CachedFont has it referenced.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mutable RetainPtr<CTFontRef> m_CTFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/Gradient.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/Gradient.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct CGContext* CGContextRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define USE_CG_SHADING defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define USE_CG_SHADING defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE_CG_SHADING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct CGShading* CGShadingRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/SimpleFontData.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/SimpleFontData.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -256,6 +256,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float m_syntheticBoldOffset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void* m_styleGroup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(ATSUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace std;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1263,7 +1263,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: maybe only do trilinear if the image is being scaled down,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // but then what if the layer size changes?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_contentsLayer->setMinificationFilter(PlatformCALayer::Trilinear);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_contentsLayer->setContents(m_pendingContentsImage.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <QuartzCore/QuartzCore.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <wtf/UnusedParam.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace WebCore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <wtf/CurrentTime.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <wtf/UnusedParam.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace WebCore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,7 +91,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface CALayer(Private)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)setContentsChanged;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)setAcceleratesDrawing:(BOOL)flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (BOOL)acceleratesDrawing;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -557,7 +557,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool PlatformCALayer::acceleratesDrawing() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [m_layer.get() acceleratesDrawing];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -566,7 +566,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void PlatformCALayer::setAcceleratesDrawing(bool acceleratesDrawing)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_layer.get() setAcceleratesDrawing:acceleratesDrawing];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ END_BLOCK_OBJC_EXCEPTIONS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,12 +53,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Building on 10.6 or later: kCGInterpolationMedium is defined in the CGInterpolationQuality enum.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_CG_INTERPOLATION_MEDIUM 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef TARGETING_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(TARGETING_TIGER) && !defined(TARGETING_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Targeting 10.6 or later: use kCGInterpolationMedium.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_CG_INTERPOLATION_MEDIUM 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGColorSpaceRef sRGBColorSpaceRef()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: Windows should be able to use kCGColorSpaceSRGB, this is tracked by http://webkit.org/b/31363.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(WIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(WIN) || defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return deviceRGBColorSpaceRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,7 +104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGColorSpaceRef linearRGBColorSpaceRef()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: Windows should be able to use kCGColorSpaceGenericRGBLinear, this is tracked by http://webkit.org/b/31363.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(WIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(WIN) || defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return deviceRGBColorSpaceRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static CGColorSpaceRef linearRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGBLinear);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1353,7 +1353,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void GraphicsContext::setAllowsFontSmoothing(bool allowsFontSmoothing)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNUSED_PARAM(allowsFontSmoothing);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextRef context = platformContext();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextSetAllowsFontSmoothing(context, allowsFontSmoothing);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1457,6 +1457,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextSetShouldSmoothFonts(platformContext(), enable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER // Tiger's setPlatformCompositeOperation() is defined in GraphicsContextMac.mm.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void GraphicsContext::setPlatformCompositeOperation(CompositeOperator mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (paintingDisabled())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1509,5 +1510,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextSetBlendMode(platformContext(), target);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/RefPtr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/RetainPtr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/cg/ImageCG.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/cg/ImageCG.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,9 +313,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Adjust the color space.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subImage = imageWithColorSpace(subImage.get(), styleColorSpace);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Leopard has an optimized call for the tiling of image patterns, but we can only use it if the image has been decoded enough that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // its buffer is the same size as the overall image. Because a partially decoded CGImageRef with a smaller width or height than the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // overall image buffer needs to tile with "gaps", we can't use the optimized tiling call in that case.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // FIXME: Could create WebKitSystemInterface SPI for CGCreatePatternWithImage2 and probably make Tiger tile faster as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: We cannot use CGContextDrawTiledImage with scaled tiles on Leopard, because it suffers from rounding errors. Snow Leopard is ok.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float scaledTileWidth = tileRect.width() * narrowPrecisionToFloat(patternTransform.a());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float w = CGImageGetWidth(tileImage);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -326,8 +328,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextDrawTiledImage(context, FloatRect(adjustedX, adjustedY, scaledTileWidth, scaledTileHeight), subImage.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // On Leopard and newer, this code now only runs for partially decoded images whose buffers do not yet match the overall size of the image.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // On Leopard, this code now only runs for partially decoded images whose buffers do not yet match the overall size of the image.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // On Tiger this code runs all the time. This code is suboptimal because the pattern does not reference the image directly, and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // pattern is destroyed before exiting the function. This means any decoding the pattern does doesn't end up cached anywhere, so we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // redecode every time we paint.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const CGPatternCallbacks patternCallbacks = { 0, drawPatternCallback, NULL };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGAffineTransform matrix = CGAffineTransformMake(narrowPrecisionToCGFloat(patternTransform.a()), 0, 0, narrowPrecisionToCGFloat(patternTransform.d()), adjustedX, adjustedY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ matrix = CGAffineTransformConcat(matrix, CGContextGetCTM(context));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -352,7 +358,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextSetFillColorWithColor(context, color.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextFillRect(context, CGContextGetClipBoundingBox(context));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stateSaver.restore();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void ImageSource::clear(bool destroyAllFrames, size_t, SharedBuffer* data, bool allDataReceived)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Recent versions of ImageIO discard previously decoded image frames if the client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // application no longer holds references to them, so there's no need to throw away
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // the decoder unless we're explicitly asked to destroy all of the frames.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void FontPlatformData::loadFont(NSFont* nsFont, float, NSFont*& outNSFont, CGFontRef& cgFont)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outNSFont = nsFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cgFont = CTFontCopyGraphicsFont(toCTFontRef(nsFont), 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cgFont = wkGetCGFontFromNSFont(nsFont);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // PLATFORM(MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +54,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_size(size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_widthVariant(widthVariant)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_font(nsFont)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: Chromium: The following code isn't correct for the Chromium port since the sandbox might
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // have blocked font loading, in which case we'll only have the real loaded font file after the call to loadFont().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , m_isColorBitmapFont(CTFontGetSymbolicTraits(toCTFontRef(nsFont)) & kCTFontColorGlyphsTrait)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +70,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_font)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFRetain(m_font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_cgFont.adoptCF(cgFont);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_cgFont = cgFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FontPlatformData:: ~FontPlatformData()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,8 +146,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_cgFont.adoptCF(cgFont);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_cgFont = cgFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_isColorBitmapFont = CTFontGetSymbolicTraits(toCTFontRef(m_font)) & kCTFontColorGlyphsTrait;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_CTFont = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1611,7 +1611,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool MediaPlayerPrivateGStreamer::supportsFullscreen() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // See <rdar://problem/7389945>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/ComplexTextController.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/ComplexTextController.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,6 +122,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ComplexTextRun(const SimpleFontData*, const UChar* characters, unsigned stringLocation, size_t stringLength, bool ltr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(ATSUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef UInt32 URefCon;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static OSStatus overrideLayoutOperation(ATSULayoutOperationSelector, ATSULineRef, URefCon, void*, ATSULayoutOperationCallbackStatus*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,7 +144,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ProviderInfo info = { cp, length, fontData->getCFStringAttributes(m_font.typesettingFeatures(), fontData->platformData().orientation()) };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<CTTypesetterRef> typesetter(AdoptCF, wkCreateCTTypesetterWithUniCharProviderAndOptions(&provideStringAndAttributes, 0, &info, m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/FontCacheMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <wtf/MainThread.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <wtf/StdLibExtras.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef int NSInteger;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontCache()->invalidate();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void fontCacheRegisteredFontsChangedNotificationCallback(CFNotificationCenterRef, void* observer, CFStringRef name, const void *, CFDictionaryRef)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT_UNUSED(observer, observer == fontCache());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,7 +72,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void FontCache::platformInit()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wkSetUpFontCache();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), this, fontCacheRegisteredFontsChangedNotificationCallback, kCTFontManagerRegisteredFontsChangedNotification, 0, CFNotificationSuspensionBehaviorDeliverImmediately);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // kCTFontManagerRegisteredFontsChangedNotification does not exist on Leopard and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FontCustomPlatformData::~FontCustomPlatformData()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_atsContainer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ATSFontDeactivate(m_atsContainer, NULL, kATSOptionFlagsDefault);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,7 +69,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<CGFontRef> cgFontRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<CFDataRef> bufferData(AdoptCF, buffer->createCFData());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithCFData(bufferData.get()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,14 +100,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cgFontRef.adoptCF(CGFontCreateWithPlatformFont(&fontRef));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Workaround for <rdar://problem/5675504>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cgFontRef && !CGFontGetNumberOfGlyphs(cgFontRef.get()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cgFontRef = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!cgFontRef) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ATSFontDeactivate(containerRef, NULL, kATSOptionFlagsDefault);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return new FontCustomPlatformData(containerRef, cgFontRef.releaseRef());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/FontMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/FontMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,7 +119,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextShowGlyphsWithAdvances(context, glyphs, advances, count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!count)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool shouldUseCoreText(UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fontData->platformData().widthVariant() != RegularWidth || fontData->hasVerticalGlyphs()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,11 +49,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool haveGlyphs = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!shouldUseCoreText(buffer, bufferLength, fontData)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Vector<CGGlyph, 512> glyphs(bufferLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wkGetGlyphsForCharacters(fontData->platformData().cgFont(), buffer, glyphs.data(), bufferLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,6 +127,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Use an array of long so we get good enough alignment.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ long glyphVector[(GLYPH_VECTOR_SIZE + sizeof(long) - 1) / sizeof(long)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OSStatus status = wkInitializeGlyphVector(GlyphPage::size, &glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (status != noErr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // This should never happen, perhaps indicates a bad font! If it does the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // font substitution code will find an alternate font.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wkConvertCharToGlyphs(fontData->m_styleGroup, buffer, bufferLength, &glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned numGlyphs = wkGetGlyphVectorNumGlyphs(&glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (numGlyphs != length) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // This should never happen, perhaps indicates a bad font?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // If it does happen, the font substitution code will find an alternate font.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wkClearGlyphVector(&glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSLayoutRecord* glyphRecord = (ATSLayoutRecord*)wkGetGlyphVectorFirstRecord(glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (unsigned i = 0; i < length; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Glyph glyph = glyphRecord->glyphID;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!glyph)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ setGlyphDataForIndex(offset + i, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ setGlyphDataForIndex(offset + i, glyph, fontData);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ haveGlyphs = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glyphRecord = (ATSLayoutRecord *)((char *)glyphRecord + wkGetGlyphVectorRecordSize(glyphVector));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wkClearGlyphVector(&glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return haveGlyphs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,9 +46,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void drawFocusRingToContext(CGContextRef context, CGPathRef focusRingPath, CGColorRef color, int radius)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGContextBeginTransparencyLayer(context, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextBeginPath(context);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextAddPath(context, focusRingPath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wkDrawFocusRing(context, color, radius);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGContextEndTransparencyLayer(context);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void GraphicsContext::drawFocusRing(const Path& path, int width, int /*offset*/, const Color& color)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,6 +87,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ drawFocusRingToContext(platformContext(), focusRingPath.get(), colorRef, radius);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER // Post-Tiger's setPlatformCompositeOperation() is defined in GraphicsContextCG.cpp.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void GraphicsContext::setPlatformCompositeOperation(CompositeOperator op)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (paintingDisabled())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[NSGraphicsContext graphicsContextWithGraphicsPort:platformContext() flipped:YES]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ setCompositingOperation:(NSCompositingOperation)op];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [pool drain];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSColor* createPatternColor(NSString* name, NSColor* defaultColor, bool& usingDot)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,7 +142,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patternColor = grammarPatternColor.get();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // To support correction panel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case TextCheckingReplacementLineStyle:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/IconMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/IconMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +46,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool useIconFromFirstFile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // FIXME: find a better image for multiple files to use on Tiger.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ useIconFromFirstFile = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ useIconFromFirstFile = filenames.size() == 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (useIconFromFirstFile) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Don't pass relative filenames -- we don't want a result that depends on the current directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Need 0U here to disambiguate String::operator[] from operator(NSString*, int)[]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,11 +64,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return adoptRef(new Icon(image));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSImage* image = [NSImage imageNamed:NSImageNameMultipleDocuments];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!image)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return adoptRef(new Icon(image));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void Icon::paint(GraphicsContext* context, const IntRect& rect)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "DocumentLoader.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import "AutodrainedPool.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "BlockExceptions.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "DocumentLoader.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,6 +64,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <wtf/UnusedParam.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(ACCELERATED_COMPOSITING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static IMP method_setImplementation(Method m, IMP imp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IMP result = m->method_imp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m->method_imp = imp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "GraphicsLayer.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,8 +122,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOFT_LINK_POINTER(QTKit, QTSecurityPolicyNoLocalToRemoteSiteAttribute, NSString *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOFT_LINK_POINTER(QTKit, QTSecurityPolicyNoRemoteToLocalSiteAttribute, NSString *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOFT_LINK_POINTER(QTKit, QTVideoRendererWebKitOnlyNewImageAvailableNotification, NSString *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOFT_LINK_POINTER(QTKit, QTMovieApertureModeClean, NSString *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOFT_LINK_POINTER(QTKit, QTMovieApertureModeAttribute, NSString *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define QTMovie getQTMovieClass()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define QTMovieView getQTMovieViewClass()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,8 +162,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define QTSecurityPolicyNoLocalToRemoteSiteAttribute getQTSecurityPolicyNoLocalToRemoteSiteAttribute()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define QTSecurityPolicyNoRemoteToLocalSiteAttribute getQTSecurityPolicyNoRemoteToLocalSiteAttribute()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define QTVideoRendererWebKitOnlyNewImageAvailableNotification getQTVideoRendererWebKitOnlyNewImageAvailableNotification()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define QTMovieApertureModeClean getQTMovieApertureModeClean()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define QTMovieApertureModeAttribute getQTMovieApertureModeAttribute()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Older versions of the QTKit header don't have these constants.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined QTKIT_VERSION_MAX_ALLOWED || QTKIT_VERSION_MAX_ALLOWED <= QTKIT_VERSION_7_0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,6 +210,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const long minimumQuickTimeVersion = 0x07300000; // 7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PassOwnPtr<MediaPlayerPrivateInterface> MediaPlayerPrivateQTKit::create(MediaPlayer* player)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -256,7 +274,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSNumber numberWithBool:NO], QTMovieAskUnresolvedDataRefsAttribute,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSNumber numberWithBool:NO], QTMovieLoopsAttribute,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSNumber numberWithBool:!m_privateBrowsing], @"QTMovieAllowPersistentCacheAttribute",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTMovieApertureModeClean, QTMovieApertureModeAttribute,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_preload < MediaPlayer::Auto)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -478,7 +498,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parentView = m_player->frameView()->documentView();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [parentView addSubview:m_qtMovieView.get()];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // setDelegate: isn't a public call in Tiger, so use performSelector to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [m_qtMovieView.get() performSelector:@selector(setDelegate:) withObject:m_objcObserver.get()];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_qtMovieView.get() setDelegate:m_objcObserver.get()];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_objcObserver.get() setView:m_qtMovieView.get()];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_qtMovieView.get() setMovie:m_qtMovie.get()];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_qtMovieView.get() setControllerVisible:NO];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -499,7 +524,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_qtMovieView) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_objcObserver.get() setView:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // setDelegate: isn't a public call in Tiger, so use performSelector to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [m_qtMovieView.get() performSelector:@selector(setDelegate:) withObject:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_qtMovieView.get() setDelegate:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_qtMovieView.get() removeFromSuperview];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_qtMovieView = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -900,7 +930,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool MediaPlayerPrivateQTKit::supportsFullscreen() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // See <rdar://problem/7389945>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -926,7 +956,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (metaDataAvailable()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wkQTMovieSetShowClosedCaptions(m_qtMovie.get(), closedCaptionsVisible);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if USE(ACCELERATED_COMPOSITING) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(ACCELERATED_COMPOSITING) && (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (closedCaptionsVisible && m_qtVideoLayer) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Captions will be rendered upside down unless we flag the movie as flipped (again). See <rdar://7408440>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_qtVideoLayer.get() setGeometryFlipped:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1019,7 +1049,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSSize initialSize = NSZeroSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSSize naturalSize = [[m_qtMovie.get() attributeForKey:QTMovieNaturalSizeAttribute] sizeValue];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // QTMovieCurrentSizeAttribute is not allowed with instances of QTMovie that have been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // opened with QTMovieOpenForPlaybackAttribute, so ask for the display transform attribute instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSAffineTransform *displayTransform = [m_qtMovie.get() attributeForKey:@"QTMoviePreferredTransformAttribute"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1318,6 +1348,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (1==m_frameCountWhilePlaying)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_timeStartedPlaying = [NSDate timeIntervalSinceReferenceDate];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AutodrainedPool pool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_videoFrameHasDrawn = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_player->repaint();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1513,8 +1546,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool MediaPlayerPrivateQTKit::isAvailable()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SInt32 version;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OSErr result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = Gestalt(gestaltQuickTime, &version);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (result != noErr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LOG_ERROR("No QuickTime available. Disabling <video> and <audio> support.");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (version < minimumQuickTimeVersion) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LOG_ERROR("QuickTime version %x detected, at least %x required. Disabling <video> and <audio> support.", version, minimumQuickTimeVersion);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // On 10.5 and higher, QuickTime will always be new enough for <video> and <audio> support, so we just check that the framework can be loaded.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return QTKitLibrary();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void MediaPlayerPrivateQTKit::getSitesInMediaCache(Vector<String>& sites)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,6 +67,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!fontData->platformData().cgFont())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSUStyle fontStyle;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ATSUCreateStyle(&fontStyle) != noErr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSUFontID fontId = fontData->platformData().m_atsuFontID;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!fontId) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSUDisposeStyle(fontStyle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSUAttributeTag tag = kATSUFontTag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ByteCount size = sizeof(ATSUFontID);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSUFontID *valueArray[1] = {&fontId};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OSStatus status = ATSUSetAttributes(fontStyle, 1, &tag, &size, (void* const*)valueArray);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (status != noErr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSUDisposeStyle(fontStyle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (wkGetATSStyleGroup(fontStyle, &fontData->m_styleGroup) != noErr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSUDisposeStyle(fontStyle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSUDisposeStyle(fontStyle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +105,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !ERROR_DISABLED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__LP64__) || (!defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__LP64__) || (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSString* pathFromFont(NSFont*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FMGetATSFontRefFromFont is not available. As pathFromFont is only used for debugging purposes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,12 +115,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSString* pathFromFont(NSFont *font)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ATSFontRef atsFont = FMGetATSFontRefFromFont(CTFontGetPlatformFont(toCTFontRef(font), 0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSFontRef atsFont = FMGetATSFontRefFromFont(wkGetNSFontATSUFontId(font));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FSRef fileRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSStatus status = ATSFontGetFileReference(atsFont, &fileRef);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (status != noErr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FSSpec oFile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OSStatus status = ATSFontGetFileSpecification(atsFont, &oFile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (status != noErr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status = FSpMakeFSRef(&oFile, &fileRef);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (status != noErr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UInt8 filePathBuffer[PATH_MAX];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = FSRefMakePath(&fileRef, filePathBuffer, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,6 +149,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void SimpleFontData::platformInit()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_styleGroup = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(ATSUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_ATSUMirrors = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_checkedShapesArabic = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -178,10 +223,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int iDescent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int iLineGap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned unitsPerEm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wkGetFontMetrics(m_platformData.cgFont(), &iAscent, &iDescent, &iLineGap, &unitsPerEm);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iAscent = CGFontGetAscent(m_platformData.cgFont());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iDescent = CGFontGetDescent(m_platformData.cgFont());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iLineGap = CGFontGetLeading(m_platformData.cgFont());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unitsPerEm = CGFontGetUnitsPerEm(m_platformData.cgFont());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float pointSize = m_platformData.m_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float ascent = scaleEmToUnits(iAscent, unitsPerEm) * pointSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -252,7 +301,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static CFDataRef copyFontTableForTag(FontPlatformData& platformData, FourCharCode tableName)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATSFontRef atsFont = FMGetATSFontRefFromFont(platformData.m_atsuFontID);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ByteCount tableSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ATSFontGetTable(atsFont, tableName, 0, 0, NULL, &tableSize) != noErr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFMutableDataRef data = CFDataCreateMutable(kCFAllocatorDefault, tableSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFDataIncreaseLength(data, tableSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ATSFontGetTable(atsFont, tableName, 0, tableSize, CFDataGetMutableBytePtr(data), &tableSize) != noErr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFRelease(data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CGFontCopyTableForTag(platformData.cgFont(), tableName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void SimpleFontData::platformCharWidthInit()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -293,6 +362,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontCache()->releaseFontData(m_derivedFontData->emphasisMark.leakPtr());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (m_styleGroup)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wkReleaseStyleGroup(m_styleGroup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(ATSUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HashMap<unsigned, ATSUStyle>::iterator end = m_ATSUStyleMap.end();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (HashMap<unsigned, ATSUStyle>::iterator it = m_ATSUStyleMap.begin(); it != end; ++it)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/image-decoders/cg/ImageDecoderCG.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/image-decoders/cg/ImageDecoderCG.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CGColorSpaceCreateDeviceRGB();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<CFDataRef> data(AdoptCF, CFDataCreate(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(colorProfile.data()), colorProfile.size()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef TARGETING_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(TARGETING_TIGER) && !defined(TARGETING_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CGColorSpaceCreateWithICCProfile(data.get());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<CGDataProviderRef> profileDataProvider(AdoptCF, CGDataProviderCreateWithCFData(data.get()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/ClipboardMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/ClipboardMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +41,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "SecurityOrigin.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "WebCoreSystemInterface.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned NSUInteger;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/CookieJar.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/CookieJar.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "WebCoreSystemInterface.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <wtf/RetainPtr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned NSUInteger;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface NSHTTPCookie (WebCoreHTTPOnlyCookies)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (BOOL)isHTTPOnly;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/DragDataMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/DragDataMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,7 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSArray *types = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!types) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ types = [[NSArray alloc] initWithObjects:WebArchivePboardType, NSHTMLPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPDFPboardType,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSPICTPboardType,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSURLPboardType, NSRTFDPboardType, NSRTFPboardType, NSStringPboardType, NSColorPboardType, kUTTypePNG, nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/EmptyProtocolDefinitions.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/EmptyProtocolDefinitions.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @protocol NAME <NSObject> \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EMPTY_PROTOCOL(NSTableViewDataSource)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EMPTY_PROTOCOL(NSTableViewDelegate)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EMPTY_PROTOCOL(NSURLConnectionDelegate)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EMPTY_PROTOCOL(NSURLDownloadDelegate)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/FileSystemMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/FileSystemMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,14 +68,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool canExcludeFromBackup()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool excludeFromBackup(const String& path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNUSED_PARAM(path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // It is critical to pass FALSE for excludeByPath because excluding by path requires root privileges.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CSBackupSetItemExcluded(pathAsURL(path).get(), TRUE, FALSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // namespace WebCore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/HTMLConverter.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/HTMLConverter.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,7 +79,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } _flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (id)init;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (id)initWithDOMRange:(DOMRange *)domRange;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/HTMLConverter.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/HTMLConverter.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSFileWrapper *fileWrapperForURL(DocumentLoader *, NSURL *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSFileWrapper *fileWrapperForElement(Element*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Additional control Unicode characters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const unichar WebNextLineCharacter = 0x0085;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,7 +100,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @implementation WebHTMLConverter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSFont *_fontForNameAndSize(NSString *fontName, CGFloat size, NSMutableDictionary *cache)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1657,7 +1657,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (0 == _errorCode) ? [[_attrStr retain] autorelease] : nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This function uses TextIterator, which makes offsets in its result compatible with HTML editing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + (NSAttributedString *)editingAttributedStringFromRange:(Range*)range
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/PasteboardMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/PasteboardMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,6 +69,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *WebURLPboardType = @"public.url";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *WebURLsWithTitlesPboardType = @"WebURLsWithTitlesPboardType";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSArray* selectionPasteboardTypes(bool canSmartCopyOrDelete, bool selectionContainsAttachments)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (selectionContainsAttachments) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,6 +84,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [NSArray arrayWithObjects:WebArchivePboardType, NSRTFPboardType, NSStringPboardType, nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSArray* writableTypesForURL()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,7 +149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSAttributedString *attributedString = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (frame->view()->platformWidget())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ attributedString = [[[NSAttributedString alloc] _initWithDOMRange:kit(selectedRange)] autorelease];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // In WebKit2 we are using a different way to create the NSAttributedString from the DOMrange that doesn't require access to the WebView.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<WebHTMLConverter> converter = [[WebHTMLConverter alloc] initWithDOMRange:kit(selectedRange)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -156,9 +158,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // 4930197: Mail overrides [WebHTMLView pasteboardTypesForSelection] in order to add another type to the pasteboard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // after WebKit does. On Tiger we must call this function so that Mail code will be executed, meaning that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // we can't call WebCore::Pasteboard's method for setting types.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNUSED_PARAM(canSmartCopyOrDelete);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSArray *types = pasteboardTypes ? pasteboardTypes : frame->editor()->client()->pasteboardTypesForSelection(frame);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Don't write RTFD to the pasteboard when the copied attributed string has no attachments.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSMutableArray *mutableTypes = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (![attributedString containsAttachments]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mutableTypes = [[types mutableCopy] autorelease];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [mutableTypes removeObject:NSRTFDPboardType];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ types = mutableTypes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [pasteboard declareTypes:types owner:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *types = pasteboardTypes ? pasteboardTypes : selectionPasteboardTypes(canSmartCopyOrDelete, [attributedString containsAttachments]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [pasteboard declareTypes:types owner:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->editor()->client()->didSetSelectionTypesForPasteboard();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Put HTML on the pasteboard.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([types containsObject:WebArchivePboardType]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -552,7 +571,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (fragment = documentFragmentWithImageResource(frame, ArchiveResource::create(SharedBuffer::wrapNSData([[[m_pasteboard.get() dataForType:NSPDFPboardType] copy] autorelease]), uniqueURLWithRelativePart(@"application.pdf"), "application/pdf", "", ""))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return fragment.release();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([types containsObject:NSPICTPboardType] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (fragment = documentFragmentWithImageResource(frame, ArchiveResource::create(SharedBuffer::wrapNSData([[[m_pasteboard.get() dataForType:NSPICTPboardType] copy] autorelease]), uniqueURLWithRelativePart(@"image.pict"), "image/pict", "", ""))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return fragment.release();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/PopupMenuMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/PopupMenuMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,10 +75,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!client()->shouldPopOver())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_popup.get() addItemWithTitle:@""];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TextDirection menuTextDirection = client()->menuStyle().textDirection();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [m_popup.get() setUserInterfaceLayoutDirection:menuTextDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(client());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int size = client()->listSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,7 +98,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [attributes setObject:font forKey:NSFontAttributeName];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RetainPtr<NSMutableParagraphStyle> paragraphStyle(AdoptNS, [[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [paragraphStyle.get() setAlignment:menuTextDirection == LTR ? NSLeftTextAlignment : NSRightTextAlignment];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSWritingDirection writingDirection = style.textDirection() == LTR ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,7 +109,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [attributes setObject:writingDirectionArray.get() forKey:NSWritingDirectionAttributeName];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [attributes setObject:paragraphStyle.get() forKey:NSParagraphStyleAttributeName];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: Add support for styling the foreground and background colors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: Find a way to customize text color when an item is highlighted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/PurgeableBufferMac.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/PurgeableBufferMac.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,4 +153,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/SharedBufferMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/SharedBufferMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/PassRefPtr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned NSUInteger;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace WebCore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +55,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WTF::initializeMainThreadToProcessMainThread();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WebCoreObjCFinalizeOnMainThread(self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)dealloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/SharedTimerMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/SharedTimerMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // On Snow Leopard and newer we'll ask IOKit to deliver notifications on a queue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define IOKIT_WITHOUT_LIBDISPATCH 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/SuddenTermination.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/SuddenTermination.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "SuddenTermination.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreObjCExtras.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreObjCExtras.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,13 +46,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This method relies on threading being initialized by the caller, otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // WebCoreObjCScheduleDeallocateOnMainThread will crash.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef DONT_FINALIZE_ON_MAIN_THREAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(DONT_FINALIZE_ON_MAIN_THREAD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objc_finalizeOnMainThread(cls);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNUSED_PARAM(cls);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline IMP method_getImplementation(Method method)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return method->method_imp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef std::pair<Class, id> ClassAndIdPair;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +54,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef FMFont ATSUFontID;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef UInt16 ATSGlyphRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct __IOSurface *IOSurfaceRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -209,11 +209,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void (*wkGetGlyphsForCharacters)(CGFontRef, const UniChar[], CGGlyph[], size_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GLYPH_VECTOR_SIZE (50 * 32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void (*wkClearGlyphVector)(void* glyphs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern CFStringRef (*wkCopyFullFontName)(CGFontRef font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern OSStatus (*wkGetATSStyleGroup)(ATSUStyle, void** styleGroup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern CGFontRef (*wkGetCGFontFromNSFont)(NSFont*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void (*wkGetFontMetrics)(CGFontRef, int* ascent, int* descent, int* lineGap, unsigned* unitsPerEm);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern ATSLayoutRecord* (*wkGetGlyphVectorFirstRecord)(void* glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void* wkGetGlyphsForCharacters;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int (*wkGetGlyphVectorNumGlyphs)(void* glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern size_t (*wkGetGlyphVectorRecordSize)(void* glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern OSStatus (*wkInitializeGlyphVector)(int count, void* glyphs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void (*wkReleaseStyleGroup)(void* group);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern BOOL (*wkUseSharedMediaUI)();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void* wkGetHyphenationLocationBeforeIndex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern CFIndex (*wkGetHyphenationLocationBeforeIndex)(CFStringRef string, CFIndex index);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -229,7 +247,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,9 +107,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void (*wkGetGlyphsForCharacters)(CGFontRef, const UniChar[], CGGlyph[], size_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void (*wkClearGlyphVector)(void* glyphs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFStringRef (*wkCopyFullFontName)(CGFontRef font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OSStatus (*wkGetATSStyleGroup)(ATSUStyle, void** styleGroup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CGFontRef (*wkGetCGFontFromNSFont)(NSFont*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void (*wkGetFontMetrics)(CGFontRef, int* ascent, int* descent, int* lineGap, unsigned* unitsPerEm);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ATSLayoutRecord* (*wkGetGlyphVectorFirstRecord)(void* glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void* wkGetGlyphsForCharacters;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int (*wkGetGlyphVectorNumGlyphs)(void* glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++size_t (*wkGetGlyphVectorRecordSize)(void* glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OSStatus (*wkInitializeGlyphVector)(int count, void* glyphs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void (*wkReleaseStyleGroup)(void* group);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ATSUFontID (*wkGetNSFontATSUFontId)(NSFont*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void* wkGetHyphenationLocationBeforeIndex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFIndex (*wkGetHyphenationLocationBeforeIndex)(CFStringRef string, CFIndex index);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,7 +134,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/WebFontCache.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/WebFontCache.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace WebCore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef int NSInteger;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SYNTHESIZED_FONT_TRAITS (NSBoldFontMask | NSItalicFontMask)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Workaround for <rdar://problem/5781372>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline void fixUpWeight(NSInteger& weight, NSString *fontName)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNUSED_PARAM(weight);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNUSED_PARAM(fontName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,6 +293,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)desiredTraits weight:(int)desiredWeight size:(float)size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSFont *font = [self internalFontWithFamily:desiredFamily traits:desiredTraits weight:desiredWeight size:size];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (font)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return font;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -297,6 +301,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Auto activate the font before looking for it a second time.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Ignore the result because we want to use our own algorithm to actually find the font.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSFont fontWithName:desiredFamily size:size];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [self internalFontWithFamily:desiredFamily traits:desiredTraits weight:desiredWeight size:size];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/mac/WidgetMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/mac/WidgetMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "Widget.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import "AutodrainedPool.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "BlockExceptions.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "Chrome.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -302,6 +305,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AutodrainedPool pool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSGraphicsContext *nsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [view displayRectIgnoringOpacity:dirtyRect inContext:nsContext];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/network/Credential.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/network/Credential.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "PlatformString.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define CERTIFICATE_CREDENTIALS_SUPPORTED ((PLATFORM(MAC) || PLATFORM(IOS)) && !defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CERTIFICATE_CREDENTIALS_SUPPORTED ((PLATFORM(MAC) || PLATFORM(IOS)) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if CERTIFICATE_CREDENTIALS_SUPPORTED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Security/SecBase.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/text/TextBreakIteratorICU.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/text/TextBreakIteratorICU.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,6 +148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static TextBreakIterator* setUpIteratorWithRules(bool& createdIterator, TextBreakIterator*& iterator,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* breakRules, const UChar* string, int length)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,9 +173,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return iterator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TextBreakIterator* cursorMovementIterator(const UChar* string, int length)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // ICU 3.2 cannot compile the below rules.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return characterBreakIterator(string, length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This rule set is based on character-break iterator rules of ICU 4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // <http://source.icu-project.org/repos/icu/icu/tags/release-4-0/source/data/brkitr/char.txt>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The major differences from the original ones are listed below:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -254,6 +260,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool createdCursorMovementIterator = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static TextBreakIterator* staticCursorMovementIterator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return setUpIteratorWithRules(createdCursorMovementIterator, staticCursorMovementIterator, kRules, string, length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/text/TextChecking.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/text/TextChecking.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,9 +33,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_GRAMMAR_CHECKING 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_UNIFIED_TEXT_CHECKING 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_USE_AUTOMATIC_TEXT_REPLACEMENT 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/text/TextEncodingDetectorICU.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/text/TextEncodingDetectorICU.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,8 +34,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "TextEncoding.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/UnusedParam.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "unicode/ucnv.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "unicode/ucsdet.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,6 +46,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TextEncoding* detectedEncoding)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *detectedEncoding = TextEncoding();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Tiger came with ICU 3.2 and does not have the encoding detector.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNUSED_PARAM(data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNUSED_PARAM(len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNUSED_PARAM(hintEncodingName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int matchesCount = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UErrorCode status = U_ZERO_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UCharsetDetector* detector = ucsdet_open(&status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,6 +123,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ucsdet_close(detector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/text/cf/HyphenationCF.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/text/cf/HyphenationCF.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Hyphenation.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "AtomicStringKeyedMRUCache.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "TextBreakIteratorInternalICU.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,4 +93,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // namespace WebCore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/text/cf/StringImplCF.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/text/cf/StringImplCF.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/PassRefPtr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/Threading.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <objc/objc-auto.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,7 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static CFAllocatorRef create()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Since garbage collection isn't compatible with custom allocators, don't use this at all when garbage collection is active.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (objc_collectingEnabled())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/platform/text/mac/HyphenationMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/platform/text/mac/HyphenationMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "Hyphenation.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "AtomicStringKeyedMRUCache.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import "TextBreakIteratorInternalICU.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,4 +67,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // namespace WebCore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/rendering/RenderLayerBacking.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/rendering/RenderLayerBacking.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -900,7 +900,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (renderer()->isVideo() && toRenderVideo(renderer())->shouldDisplayVideo())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return hasBoxDecorationsOrBackground(renderer());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isAcceleratedCanvas(renderer()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return hasBoxDecorationsOrBackground(renderer());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/rendering/RenderText.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/rendering/RenderText.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1506,6 +1506,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result == TextBreakDone)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = current - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // ICU 3.2 allows character breaks before a half-width Katakana voiced mark.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (static_cast<unsigned>(result) < si->length()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UChar character = (*si)[result];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (character == 0xFF9E || character == 0xFF9F)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1633,6 +1641,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result == TextBreakDone)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = current + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // ICU 3.2 allows character breaks before a half-width Katakana voiced mark.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (static_cast<unsigned>(result) < si->length()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UChar character = (*si)[result];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (character == 0xFF9E || character == 0xFF9F)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ++result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/rendering/break_lines.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/rendering/break_lines.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,6 +145,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ch > asciiLineBreakTableLastChar && ch != noBreakSpace;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline TextBreakLocatorRef lineBreakLocator()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TextBreakLocatorRef locator = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UCCreateTextBreakLocator(0, 0, kUCTextBreakLineMask, &locator);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return locator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nextBreakablePosition(LazyLineBreakIterator& lazyBreakIterator, int pos, bool treatNoBreakSpaceAsBreak)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const UChar* str = lazyBreakIterator.string();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,9 +169,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (needsLineBreakIterator(ch) || needsLineBreakIterator(lastCh)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nextBreak < i && i) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !PLATFORM(MAC) || !defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TextBreakIterator* breakIterator = lazyBreakIterator.get();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (breakIterator)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nextBreak = textBreakFollowing(breakIterator, i - 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static TextBreakLocatorRef breakLocator = lineBreakLocator();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (breakLocator) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UniCharArrayOffset nextUCBreak;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (UCFindTextBreak(breakLocator, kUCTextBreakLineMask, 0, str, len, i, &nextUCBreak) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nextBreak = nextUCBreak;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (i == nextBreak && !isBreakableSpace(lastCh, treatNoBreakSpaceAsBreak))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebKit/mac/Configurations/Version.xcconfig.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebKit/mac/Configurations/Version.xcconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_VERSION_PREFIX_iphoneos = 6; // iPhone OS is most like SnowLeopard currently.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_VERSION_PREFIX_iphonesimulator = $(SYSTEM_VERSION_PREFIX_iphoneos);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_VERSION_PREFIX_macosx = $(SYSTEM_VERSION_PREFIX_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYSTEM_VERSION_PREFIX_macosx_ = 4; // Some Tiger versions of Xcode don't set MAC_OS_X_VERSION_MAJOR.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYSTEM_VERSION_PREFIX_macosx_1040 = 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_VERSION_PREFIX_macosx_1050 = 5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_VERSION_PREFIX_macosx_1060 = 6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_VERSION_PREFIX_macosx_1070 = 7;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebKit2/Configurations/Base.xcconfig.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebKit2/Configurations/Base.xcconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,6 +93,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SDKROOT_1050_1040 = macosx10.4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SDKROOT_1060_1040 = macosx10.4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT_1060_1050 = macosx10.5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SDKROOT_1070_1040 = macosx10.4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT_1070_1050 = macosx10.5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT_1070_1060 = macosx10.6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebKit2/Configurations/CompilerVersion.xcconfig.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebKit2/Configurations/CompilerVersion.xcconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +29,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // number. Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // XCODE_VERSION_ACTUAL for the full version number.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TARGET_GCC_VERSION_ = $(TARGET_GCC_VERSION_1040);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TARGET_GCC_VERSION_1040 = GCC_40;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebKit2/Configurations/DebugRelease.xcconfig.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebKit2/Configurations/DebugRelease.xcconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Base.xcconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHS = $(ARCHS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ARCHS_ = $(ARCHS_1040);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ARCHS_1040 = $(NATIVE_ARCH);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHS_1050 = $(NATIVE_ARCH);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHS_1060 = $(ARCHS_STANDARD_32_64_BIT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCHS_1070 = $(ARCHS_STANDARD_32_64_BIT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +33,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ONLY_ACTIVE_ARCH = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MACOSX_DEPLOYMENT_TARGET_ = 10.4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_DEPLOYMENT_TARGET_1060 = 10.6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_DEPLOYMENT_TARGET_1070 = 10.7;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +44,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SECTORDER_FLAGS = ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++WEBKIT_SYSTEM_INTERFACE_LIBRARY_ = WebKitSystemInterfaceTiger;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++WEBKIT_SYSTEM_INTERFACE_LIBRARY_1040 = WebKitSystemInterfaceTiger;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WEBKIT_SYSTEM_INTERFACE_LIBRARY_1050 = WebKitSystemInterfaceLeopard;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WEBKIT_SYSTEM_INTERFACE_LIBRARY_1060 = WebKitSystemInterfaceSnowLeopard;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WEBKIT_SYSTEM_INTERFACE_LIBRARY_1070 = WebKitSystemInterfaceSnowLeopard;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebKit2/Configurations/Version.xcconfig.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebKit2/Configurations/Version.xcconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The system version prefix is based on the current system version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYSTEM_VERSION_PREFIX_ = 4; // Some Tiger versions of Xcode don't set MAC_OS_X_VERSION_MAJOR.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SYSTEM_VERSION_PREFIX_1040 = 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_VERSION_PREFIX_1050 = 5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_VERSION_PREFIX_1060 = 6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSTEM_VERSION_PREFIX_1070 = 7;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebKit2/Shared/mac/PasteboardTypes.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebKit2/Shared/mac/PasteboardTypes.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray* PasteboardTypes::forEditing()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSArray *types = retain([NSArray arrayWithObjects:WebArchivePboardType, NSHTMLPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPDFPboardType,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSPICTPboardType,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSURLPboardType, NSRTFDPboardType, NSRTFPboardType, NSStringPboardType, NSColorPboardType, kUTTypePNG, nil]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,7 +397,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)_updateMenuAndDockForFullScreen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // NSApplicationPresentationOptions is available on > 10.6 only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSScreen* fullScreenScreen = [[self window] screen];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -421,6 +421,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SetSystemUIMode(_isFullScreen ? kUIModeNormal : kUIModeAllHidden, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) // IOPMAssertionCreateWithName not defined on < 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)_disableIdleDisplaySleep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (_idleDisplaySleepAssertion == kIOPMNullAssertionID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -475,9 +476,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UpdateSystemActivity(OverallAct);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)_updatePowerAssertions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (_isPlaying && _isFullScreen) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self _disableIdleSystemSleep];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self _disableIdleDisplaySleep];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -487,6 +490,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self _enableIdleDisplaySleep];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self _disableTickleTimer];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (WebFullScreenManagerProxy*)_manager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -531,7 +535,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const CFTimeInterval defaultDuration = 0.5;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFTimeInterval duration = defaultDuration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSUInteger modifierFlags = [NSEvent modifierFlags];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSUInteger modifierFlags = [[NSApp currentEvent] modifierFlags];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -564,7 +568,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setAcceptsMouseMovedEvents:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setReleasedWhenClosed:NO];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setHasShadow:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setMovable:NO];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setMovableByWindowBackground:NO];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebKit2/UIProcess/mac/WebContextMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebKit2/UIProcess/mac/WebContextMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,11 +56,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *cacheDir = [defaults objectForKey:WebKitLocalCacheDefaultsKey];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!cacheDir || ![cacheDir isKindOfClass:[NSString class]]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char cacheDirectory[MAXPATHLEN];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cacheDirectoryLen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [cacheDir stringByAppendingPathComponent:appName];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,9 +99,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void setInsertionPasteboard(NSPasteboard *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual NSURL* canonicalizeURL(NSURL*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual NSURL* canonicalizeURLString(NSString*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ virtual NSArray *pasteboardTypesForSelection(WebCore::Frame*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void uppercaseWord();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void lowercaseWord();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void capitalizeWord();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual String getAutoCorrectSuggestionForMisspelledWord(const String& misspelledWord);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void checkGrammarOfString(const UChar*, int length, Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, Vector<WebCore::TextCheckingResult>& results);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void updateSpellingUIWithGrammarString(const String&, const WebCore::GrammarDetail& detail);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,6 +131,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notImplemented();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++NSArray *WebEditorClient::pasteboardTypesForSelection(Frame*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ notImplemented();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void changeWordCase(WebPage* page, SEL selector)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/WebKitLibraries/WebKitSystemInterface.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/WebKitLibraries/WebKitSystemInterface.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *WKCopyNSURLResponseStatusLine(NSURLResponse *response);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFArrayRef WKCopyNSURLResponseCertificateChain(NSURLResponse *response);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,10 +147,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKSetPatternPhaseInUserSpace(CGContextRef, CGPoint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGAffineTransform WKGetUserToBaseCTM(CGContextRef);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef void *WKGlyphVectorRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar* characters, unsigned numCharacters, WKGlyphVectorRef glyphs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OSStatus WKGetATSStyleGroup(ATSUStyle fontStyle, void **styleGroup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void WKReleaseStyleGroup(void *group);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OSStatus WKInitializeGlyphVector(int count, WKGlyphVectorRef glyphs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void WKClearGlyphVector(WKGlyphVectorRef glyphs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int WKGetGlyphVectorNumGlyphs(WKGlyphVectorRef glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ATSLayoutRecord *WKGetGlyphVectorFirstRecord(WKGlyphVectorRef glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++size_t WKGetGlyphVectorRecordSize(WKGlyphVectorRef glyphVector);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTLineRef WKCreateCTLineWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTTypesetterRef WKCreateCTTypesetterWithUniCharProviderAndOptions(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextRef WKIOSurfaceContextCreate(IOSurfaceRef, unsigned width, unsigned height, CGColorSpaceRef);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,6 +192,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSStatus WKThemeDrawTrack(const HIThemeTrackDrawInfo* inDrawInfo, CGContextRef inContext, int inArrowStyle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// CGFontGetAscent, CGFontGetDescent, CGFontGetLeading and CGFontGetUnitsPerEm were not available until Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void WKGetFontMetrics(CGFontRef font, int *ascent, int *descent, int *lineGap, unsigned *unitsPerEm);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// CTFontCopyGraphicsFont was not available until Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CGFontRef WKGetCGFontFromNSFont(NSFont *font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// CTFontGetPlatformFont was not available until Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ATSUFontID WKGetNSFontATSUFontId(NSFont *font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// CGFontCopyFullName was not available until Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFStringRef WKCopyFullFontName(CGFontRef font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// WKSupportsMultipartXMixedReplace is not required on Leopard as multipart/x-mixed-replace is always handled by NSURLRequest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BOOL WKSupportsMultipartXMixedReplace(NSMutableURLRequest *request);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOL WKCGContextIsBitmapContext(CGContextRef context);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -285,7 +312,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKQTClearMediaDownloadCacheForSite(NSString *site);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKQTClearMediaDownloadCache();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mach_port_t WKInitializeRenderServer(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @class CALayer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,7 +351,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSUInteger WKGetInputPanelWindowStyle(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UInt8 WKGetNSEventKeyChar(NSEvent *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @class CAPropertyAnimation;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -339,7 +366,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFHTTPMessageRef WKCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WKEventPhaseNone = 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WKEventPhaseBegan = 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -350,10 +377,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int WKGetNSEventMomentumPhase(NSEvent *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BUILDING_ON_TIGER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKWindowSetAlpha(NSWindow *window, float alphaValue);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScaledFrame);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef BUILDING_ON_LEOPARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKSyncSurfaceToView(NSView *view);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKEnableSettingCursorWhenInBackground(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -370,7 +399,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -383,7 +412,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFStringRef WKCopyCFURLResponseSuggestedFilename(CFURLResponseRef);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void WKSetCFURLResponseMIMEType(CFURLResponseRef, CFStringRef mimeType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WKSandboxExtensionTypeReadOnly,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WKSandboxExtensionTypeWriteOnly,
</span></pre><pre style='margin:0'>
</pre>