[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
yurys at chromium.org
yurys at chromium.org
Wed Dec 22 18:31:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 898488858c44eddbeb3696dcfe71d4fc62229667
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 13 15:45:09 2010 +0000
2010-12-13 Yury Semikhatsky <yurys at chromium.org>
Unreviewed. Qt build fix.
* dom/Event.cpp:
(WebCore::Event::isErrorEvent):
* dom/Event.h: remove ENABLE(WORKERS) guard since ErrorEvent is now used not
only in workers.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73917 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d9c5b08..4a2c043 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-13 Yury Semikhatsky <yurys at chromium.org>
+
+ Unreviewed. Qt build fix.
+
+ * dom/Event.cpp:
+ (WebCore::Event::isErrorEvent):
+ * dom/Event.h: remove ENABLE(WORKERS) guard since ErrorEvent is now used not
+ only in workers.
+
2010-12-13 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/dom/Event.cpp b/WebCore/dom/Event.cpp
index a949fd5..fc6d282 100644
--- a/WebCore/dom/Event.cpp
+++ b/WebCore/dom/Event.cpp
@@ -203,12 +203,10 @@ bool Event::isIDBSuccessEvent() const
}
#endif
-#if ENABLE(WORKERS)
bool Event::isErrorEvent() const
{
return false;
}
-#endif
#if ENABLE(TOUCH_EVENTS)
bool Event::isTouchEvent() const
diff --git a/WebCore/dom/Event.h b/WebCore/dom/Event.h
index f05d36c..9aef233 100644
--- a/WebCore/dom/Event.h
+++ b/WebCore/dom/Event.h
@@ -132,9 +132,7 @@ namespace WebCore {
#if ENABLE(WEB_AUDIO)
virtual bool isAudioProcessingEvent() const;
#endif
-#if ENABLE(WORKERS)
virtual bool isErrorEvent() const;
-#endif
#if ENABLE(TOUCH_EVENTS)
virtual bool isTouchEvent() const;
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list