[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

darin at chromium.org darin at chromium.org
Thu Feb 4 21:29:38 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 9be18db136641c922566b7238c10798c998cef94
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 17:55:50 2010 +0000

    2010-01-27  Darin Fisher  <darin at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Adding missing WebMutationEvent.cpp file to fix build bustage.
            https://bugs.webkit.org/show_bug.cgi?id=33882
    
            * public/WebMutationEvent.h: Remove unnecessary constructor.
            * src/WebEvent.cpp: Remove unnecessary include of WebMutationEvent.h.
            * src/WebMutationEvent.cpp: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53939 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a692255..b1ae94c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-27  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Adding missing WebMutationEvent.cpp file to fix build bustage. 
+        https://bugs.webkit.org/show_bug.cgi?id=33882
+
+        * public/WebMutationEvent.h: Remove unnecessary constructor.
+        * src/WebEvent.cpp: Remove unnecessary include of WebMutationEvent.h.
+        * src/WebMutationEvent.cpp: Added.
+
 2010-01-27  Jay Campan  <jcampan at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebMutationEvent.h b/WebKit/chromium/public/WebMutationEvent.h
index bc378f0..75eb9c4 100644
--- a/WebKit/chromium/public/WebMutationEvent.h
+++ b/WebKit/chromium/public/WebMutationEvent.h
@@ -51,10 +51,6 @@ public:
     WEBKIT_API WebString newValue() const;
     WEBKIT_API WebString attrName() const;
     WEBKIT_API AttrChangeType attrChange() const;
-
-#if WEBKIT_IMPLEMENTATION
-    WebMutationEvent(const WTF::PassRefPtr<WebCore::Event>&);
-#endif
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/src/WebEvent.cpp b/WebKit/chromium/src/WebEvent.cpp
index 62ae65f..8c68959 100644
--- a/WebKit/chromium/src/WebEvent.cpp
+++ b/WebKit/chromium/src/WebEvent.cpp
@@ -33,7 +33,6 @@
 
 #include "Event.h"
 #include "Node.h"
-#include "WebMutationEvent.h"
 #include <wtf/PassRefPtr.h>
 
 namespace WebKit {
@@ -217,4 +216,4 @@ bool WebEvent::isBeforeLoadEvent() const
     return m_private->isBeforeLoadEvent();
 }
 
-}
+} // namespace WebKit
diff --git a/WebKit/chromium/src/WebMutationEvent.cpp b/WebKit/chromium/src/WebMutationEvent.cpp
new file mode 100644
index 0000000..511b615
--- /dev/null
+++ b/WebKit/chromium/src/WebMutationEvent.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebMutationEvent.h"
+
+#include "MutationEvent.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+WebNode WebMutationEvent::relatedNode() const
+{
+    return WebNode(constUnwrap<MutationEvent>()->relatedNode());
+}
+
+WebString WebMutationEvent::prevValue() const
+{
+    return WebString(constUnwrap<MutationEvent>()->prevValue());
+}
+
+WebString WebMutationEvent::newValue() const
+{
+    return WebString(constUnwrap<MutationEvent>()->newValue());
+}
+
+WebString WebMutationEvent::attrName() const
+{
+    return WebString(constUnwrap<MutationEvent>()->attrName());
+}
+
+WebMutationEvent::AttrChangeType WebMutationEvent::attrChange() const
+{
+    return static_cast<AttrChangeType>(constUnwrap<MutationEvent>()->attrChange());
+}
+
+} // namespace WebKit

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list