Merge commit 'origin/4.5'

Conflicts:
	src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp
	src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebCore/ChangeLog
	src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp
	src/3rdparty/webkit/WebCore/generated/CSSGrammar.h
	src/3rdparty/webkit/WebCore/generated/Grammar.cpp
	src/3rdparty/webkit/WebCore/generated/Grammar.h
	src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp
	src/3rdparty/webkit/WebCore/generated/XPathGrammar.h
	src/3rdparty/webkit/WebKit/qt/ChangeLog
	tools/linguist/lrelease/main.cpp
	tools/linguist/lupdate/main.cpp
	tools/linguist/shared/profileevaluator.cpp

7 files changed, 60 insertions, 8 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/libJavaScriptCore.la b/src/3rdparty/webkit/JavaScriptCore/libJavaScriptCore.la
new file mode 100644
index 0000000..10d3f1e
--- /dev/null
+++ b/src/3rdparty/webkit/JavaScriptCore/libJavaScriptCore.la
@@ -0,0 +1,28 @@
+# libJavaScriptCore.la - a libtool library file
+# Generated by qmake/libtool (2.01a) (Qt 4.6.0) on: Mon Jun 15 18:55:09 2009
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names='  '
+
+# The name of the static archive.
+old_library='libJavaScriptCore.a'
+
+# Libraries that this one depends upon.
+dependency_libs='-L/depot/obuddenh/qt/lib  -lQtGui -L/depot/obuddenh/qt/lib -L/usr/X11R6/lib -pthread -lpng -lfreetype -lgobject-2.0 -lSM -lICE -pthread -pthread -lXrender -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -lpthread -ldl '
+
+# Version information for libJavaScriptCore.la
+current=46
+age=0
+revision=0
+
+# Is this an already installed library.
+installed=yes
+
+# Files to dlopen/dlpreopen.
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/depot/obuddenh/qt/lib'
diff --git a/src/3rdparty/webkit/JavaScriptCore/pkgconfig/JavaScriptCore.pc b/src/3rdparty/webkit/JavaScriptCore/pkgconfig/JavaScriptCore.pc
new file mode 100644
index 0000000..fb90b0c
--- /dev/null
+++ b/src/3rdparty/webkit/JavaScriptCore/pkgconfig/JavaScriptCore.pc
@@ -0,0 +1,15 @@
+prefix=/depot/obuddenh/qt
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/JavaScriptCore
+qt_config=lex yacc debug uic resources qt incremental link_prl exceptions no_mocdepend debug stl qt_no_framework debug largefile stl precompile_header separate_debug_info mmx 3dnow sse sse2 dylib create_prl link_prl depend_includepath QTDIR_build use_libmysqlclient_r building-libs staticlib depend_includepath qt_install_headers qt depend_includepath qmake_cache target_qt hide_symbols create_libtool create_pc explicitlib moc thread static staticlib
+moc_location=${prefix}/bin/moc
+uic_location=${prefix}/bin/uic
+
+Name: Javascriptcore
+Description: Javascriptcore Library
+Version: 4.6.0
+Libs: -L${libdir} -lJavaScriptCore 
+Libs.private: -L/depot/obuddenh/qt/lib  -lQtGui -L/depot/obuddenh/qt/lib -L/usr/X11R6/lib -pthread -lpng -lfreetype -lgobject-2.0 -lSM -lICE -pthread -pthread -lXrender -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -lpthread -ldl  
+Cflags: -DQT_SHARED -I/depot/obuddenh/qt/include -I${includedir}
+
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp
index 7569031..fde6ea3 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp
@@ -298,7 +298,9 @@ void Path::clear()
 
 bool Path::isEmpty() const
 {
-    return m_path->isEmpty();
+    // Don't use QPainterPath::isEmpty(), as that also returns true if there's only
+    // one initial MoveTo element in the path.
+    return m_path->elementCount() == 0;
 }
 
 String Path::debugString() const
diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 2f980fa..898e5f4 100644
--- a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -225,9 +225,11 @@ void QNetworkReplyHandler::finish()
         resetState();
         start();
     } else if (m_reply->error() != QNetworkReply::NoError
-               // a web page that returns 403/404 can still have content
+               // a web page that returns 401/403/404 can still have content
                && m_reply->error() != QNetworkReply::ContentOperationNotPermittedError
-               && m_reply->error() != QNetworkReply::ContentNotFoundError) {
+               && m_reply->error() != QNetworkReply::ContentNotFoundError
+               && m_reply->error() != QNetworkReply::AuthenticationRequiredError
+               && m_reply->error() != QNetworkReply::ProxyAuthenticationRequiredError) {
         QUrl url = m_reply->url();
         ResourceError error(url.host(), m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(),
                             url.toString(), m_reply->errorString());
diff --git a/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp
index a17f3ab..bc9d2f4 100644
--- a/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp
@@ -96,7 +96,7 @@ String pathGetFileName(const String& path)
 
 String directoryName(const String& path)
 {
-    return String(QFileInfo(path).baseName());
+    return String(QFileInfo(path).absolutePath());
 }
 
 Vector<String> listDirectory(const String& path, const String& filter)
diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp
index c59a9bb..ce0f859 100644
--- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp
+++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp
@@ -373,10 +373,10 @@ void PluginView::setNPWindowIfNeeded()
     m_npWindow.height = m_windowRect.height();
 
     // TODO: (also clip against scrollbars, etc.)
-    m_npWindow.clipRect.left = 0;
-    m_npWindow.clipRect.top = 0;
-    m_npWindow.clipRect.right = m_windowRect.width();
-    m_npWindow.clipRect.bottom = m_windowRect.height();
+    m_npWindow.clipRect.left = max(0, m_windowRect.x());
+    m_npWindow.clipRect.top = max(0, m_windowRect.y());
+    m_npWindow.clipRect.right = m_windowRect.x() + m_windowRect.width();
+    m_npWindow.clipRect.bottom = m_windowRect.y() + m_windowRect.height();
 
     PluginView::setCurrentPluginView(this);
     JSC::JSLock::DropAllLocks dropAllLocks(false);
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index c6c4b9e..34d322f 100644
--- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -692,6 +692,11 @@ void FrameLoaderClientQt::committedLoad(WebCore::DocumentLoader* loader, const c
     if (m_pluginView) {
         if (!m_hasSentResponseToPlugin) {
             m_pluginView->didReceiveResponse(loader->response());
+            // didReceiveResponse sets up a new stream to the plug-in. on a full-page plug-in, a failure in
+            // setting up this stream can cause the main document load to be cancelled, setting m_pluginView
+            // to null
+            if (!m_pluginView)
+                return;
             m_hasSentResponseToPlugin = true;
         }
         m_pluginView->didReceiveData(data, length);