[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

andersca at apple.com andersca at apple.com
Wed Dec 22 14:35:25 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 7ac620e83d096102a6b6d684bf12dfe3fab6c7b7
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 20:04:26 2010 +0000

    Add BackingStoreQt.cpp file with stubbed out BackingStore member functions
    https://bugs.webkit.org/show_bug.cgi?id=47614
    
    Reviewed by Sam Weinig.
    
    * Shared/BackingStore.h:
    Remove unused include.
    
    * Shared/qt/BackingStoreQt.cpp: Added.
    (WebKit::BackingStore::createGraphicsContext):
    (WebKit::BackingStore::paint):
    
    * WebKit2.pro:
    Add BackingStore.cpp, BackingStore.h and BackingStoreQt.cpp
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69687 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index bc99b3d..c6db7bf 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-13  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Add BackingStoreQt.cpp file with stubbed out BackingStore member functions
+        https://bugs.webkit.org/show_bug.cgi?id=47614
+
+        * Shared/BackingStore.h:
+        Remove unused include.
+
+        * Shared/qt/BackingStoreQt.cpp: Added.
+        (WebKit::BackingStore::createGraphicsContext):
+        (WebKit::BackingStore::paint):
+
+        * WebKit2.pro:
+        Add BackingStore.cpp, BackingStore.h and BackingStoreQt.cpp
+
 2010-10-13  Brent Fulgham  <bfulgham at webkit.org>
 
         Unreviewed build fixes after r69538.
diff --git a/WebKit2/Shared/BackingStore.h b/WebKit2/Shared/BackingStore.h
index e2570d4..414de13 100644
--- a/WebKit2/Shared/BackingStore.h
+++ b/WebKit2/Shared/BackingStore.h
@@ -32,7 +32,6 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
-#include <wtf/RetainPtr.h>
 
 namespace WebCore {
     class GraphicsContext;
diff --git a/WebKit2/Shared/qt/BackingStoreQt.cpp b/WebKit2/Shared/qt/BackingStoreQt.cpp
new file mode 100644
index 0000000..c493449
--- /dev/null
+++ b/WebKit2/Shared/qt/BackingStoreQt.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2010 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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 "BackingStore.h"
+
+#include "NotImplemented.h"
+#include <WebCore/GraphicsContext.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+PassOwnPtr<GraphicsContext> BackingStore::createGraphicsContext()
+{
+    notImplemented();
+    return 0;
+}
+
+void BackingStore::paint(WebCore::GraphicsContext* context, const WebCore::IntRect& clipRect)
+{
+    notImplemented();
+}
+        
+} // namespace WebKit
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index a8ea6d1..74c71fd 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -192,6 +192,7 @@ HEADERS += \
     Shared/API/c/WKURLResponse.h \
     Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
     Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \
+    Shared/BackingStore.h \
     Shared/CacheModel.h \
     Shared/DrawingAreaBase.h \
     Shared/ImmutableArray.h \
@@ -339,10 +340,12 @@ SOURCES += \
     Shared/API/c/WKURL.cpp \
     Shared/API/c/WKURLRequest.cpp \
     Shared/API/c/WKURLResponse.cpp \
+    Shared/BackingStore.cpp \
     Shared/ImmutableArray.cpp \
     Shared/ImmutableDictionary.cpp \
     Shared/MutableArray.cpp \
     Shared/MutableDictionary.cpp \
+    Shared/qt/BackingStoreQt.cpp \
     Shared/qt/MappedMemoryPool.cpp \
     Shared/qt/NativeWebKeyboardEventQt.cpp \
     Shared/qt/UpdateChunk.cpp \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list