diff options
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/webkit/.tag | 2 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/ChangeLog | 21 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/loader/ResourceLoader.cpp | 5 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/plugins/win/PluginDatabaseWin.cpp | 11 | ||||
-rw-r--r-- | src/3rdparty/webkit/VERSION | 2 |
5 files changed, 38 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index fca0351..4e1d23c 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -994432629cb04ffd8e1985dce9e9ed3a89236dd1 +5fc7dcbe084a8ee8beda11b92dc2111be1285434 diff --git a/src/3rdparty/webkit/Source/WebCore/ChangeLog b/src/3rdparty/webkit/Source/WebCore/ChangeLog index 4c6a7c1..266023f 100644 --- a/src/3rdparty/webkit/Source/WebCore/ChangeLog +++ b/src/3rdparty/webkit/Source/WebCore/ChangeLog @@ -1,3 +1,24 @@ +2012-11-28 Zeno Albisser <zeno@webkit.org> + + [Qt][Win] Enable usage of QTWEBKIT_PLUGIN_PATH. + https://bugs.webkit.org/show_bug.cgi?id=103529 + + This patch enables the same behavior for Windows + as it is currently implemented for all other operating + systems supported by Qt. + Directories listed in the environment variable + QTWEBKIT_PLUGIN_PATH are being searched for additional + plugins. + The only difference is that directories on Windows + need to be separated by a semicolon instead of a colon. + + Reviewed by Kenneth Rohde Christiansen. + + * plugins/win/PluginDatabaseWin.cpp: + (WebCore): + (WebCore::addQtWebKitPluginPath): + (WebCore::PluginDatabase::defaultPluginDirectories): + 2011-06-10 Konstantin Tokarev <ktokarev@smartlabs.tv> Reviewed by Joseph Pecoraro. diff --git a/src/3rdparty/webkit/Source/WebCore/loader/ResourceLoader.cpp b/src/3rdparty/webkit/Source/WebCore/loader/ResourceLoader.cpp index c59acba..09eb190 100644 --- a/src/3rdparty/webkit/Source/WebCore/loader/ResourceLoader.cpp +++ b/src/3rdparty/webkit/Source/WebCore/loader/ResourceLoader.cpp @@ -339,8 +339,11 @@ void ResourceLoader::didFail(const ResourceError& error) void ResourceLoader::didCancel(const ResourceError& error) { + // If the load has already completed - succeeded, failed, or previously cancelled - do nothing. + if (m_reachedTerminalState) + return; + ASSERT(!m_cancelled); - ASSERT(!m_reachedTerminalState); if (FormData* data = m_request.httpBody()) data->removeGeneratedFilesIfNeeded(); diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/win/PluginDatabaseWin.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/win/PluginDatabaseWin.cpp index 27121c6..29fb163 100644 --- a/src/3rdparty/webkit/Source/WebCore/plugins/win/PluginDatabaseWin.cpp +++ b/src/3rdparty/webkit/Source/WebCore/plugins/win/PluginDatabaseWin.cpp @@ -419,6 +419,16 @@ static inline void addMacromediaPluginDirectories(Vector<String>& directories) #endif } +#if PLATFORM(QT) +static inline void addQtWebKitPluginPath(Vector<String>& directories) +{ + Vector<String> qtPaths; + String qtPath(qgetenv("QTWEBKIT_PLUGIN_PATH").constData()); + qtPath.split(UChar(';'), false, qtPaths); + directories.append(qtPaths); +} +#endif + Vector<String> PluginDatabase::defaultPluginDirectories() { Vector<String> directories; @@ -433,6 +443,7 @@ Vector<String> PluginDatabase::defaultPluginDirectories() addMacromediaPluginDirectories(directories); #if PLATFORM(QT) addJavaPluginDirectory(directories); + addQtWebKitPluginPath(directories); #endif return directories; diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 38a69ce..4e91abff0 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 994432629cb04ffd8e1985dce9e9ed3a89236dd1 + 5fc7dcbe084a8ee8beda11b92dc2111be1285434 |