diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
| commit | 88a04ac016f57c2d78e714682445dff2e7db4ade (patch) | |
| tree | a48ca81ee3b29953121308168db22532d5b57fe2 /Source/WebKit2/WebProcess/Plugins/Netscape | |
| parent | 284837daa07b29d6a63a748544a90b1f5842ac5c (diff) | |
| download | qtwebkit-88a04ac016f57c2d78e714682445dff2e7db4ade.tar.gz | |
Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)
This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/Netscape')
| -rw-r--r-- | Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp index 15e7648da..e37d75269 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp @@ -565,7 +565,7 @@ bool NetscapePlugin::allowPopups() const static bool isTransparentSilverlightBackgroundValue(const String& lowercaseBackgroundValue) { // This checks if the background color value is transparent, according to - // the forumat documented at http://msdn.microsoft.com/en-us/library/cc838148(VS.95).aspx + // the format documented at http://msdn.microsoft.com/en-us/library/cc838148(VS.95).aspx if (lowercaseBackgroundValue.startsWith('#')) { if (lowercaseBackgroundValue.length() == 5 && lowercaseBackgroundValue[1] != 'f') { // An 8-bit RGB value with alpha transparency, in the form #ARGB. diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h index 5f93c5747..f0d948b0e 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h @@ -55,7 +55,6 @@ public: static PassRefPtr<NetscapePlugin> fromNPP(NPP); // In-process NetscapePlugins don't support asynchronous initialization. - virtual void waitForAsynchronousInitialization() { } virtual bool isBeingAsynchronouslyInitialized() const { return false; } #if PLATFORM(MAC) |