[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:02 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit d9e7cfb3607c63c7d3b37f467103665bcd9f1898
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 15:33:58 2010 +0000

    2010-12-13  Yury Semikhatsky  <yurys at chromium.org>
    
            Unreviewed. Qt build fix.
    
            * dom/ErrorEvent.cpp:
            * dom/ErrorEvent.h: remove ENABLE(WORKERS) guard since ErrorEvent is now used not
            only in workers.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73915 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d8aea82..9c6dda5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-12-13  Yury Semikhatsky  <yurys at chromium.org>
 
+        Unreviewed. Qt build fix. 
+
+        * dom/ErrorEvent.cpp:
+        * dom/ErrorEvent.h: remove ENABLE(WORKERS) guard since ErrorEvent is now used not
+        only in workers.
+
+2010-12-13  Yury Semikhatsky  <yurys at chromium.org>
+
         Reviewed by Adam Barth.
 
         WebCore doesn't fire window.onerror event when uncaught JavaScript exceptions are thrown
diff --git a/WebCore/dom/ErrorEvent.cpp b/WebCore/dom/ErrorEvent.cpp
index 2627d01..c598836 100644
--- a/WebCore/dom/ErrorEvent.cpp
+++ b/WebCore/dom/ErrorEvent.cpp
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "ErrorEvent.h"
 
 #include "EventNames.h"
@@ -72,5 +70,3 @@ bool ErrorEvent::isErrorEvent() const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
diff --git a/WebCore/dom/ErrorEvent.h b/WebCore/dom/ErrorEvent.h
index f81530a..719ca2d 100644
--- a/WebCore/dom/ErrorEvent.h
+++ b/WebCore/dom/ErrorEvent.h
@@ -31,8 +31,6 @@
 #ifndef ErrorEvent_h
 #define ErrorEvent_h
 
-#if ENABLE(WORKERS)
-
 #include "Event.h"
 #include "PlatformString.h"
 
@@ -69,6 +67,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // ErrorEvent_h

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list