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

[hans at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit e02d0528307a862e0431d3bed37e3f6e9a7052b6
Author: hans at chromium.org <hans at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 11:05:04 2010 +0000

    2010-09-13  Hans Wennborg  <hans at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            Add WebDeviceOrientationClientMock::create() and use it from DRT.
            https://bugs.webkit.org/show_bug.cgi?id=45650
    
            Since the virtual member functions of WebDeviceOrientationClientMock
            are not exported from the DLL, construction of the object must be done inside
            the DLL, or else the linker will complain (because the vtable cannot
            be set up). Clients should use the create() member function, and the constructor
            will be made private in a subsequent patch.
    
            * public/WebDeviceOrientationClientMock.h:
            (WebKit::WebDeviceOrientationClientMock::WebDeviceOrientationClientMock):
            * src/WebDeviceOrientationClientMock.cpp:
            (WebKit::WebDeviceOrientationClientMock::create):
    2010-09-13  Hans Wennborg  <hans at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            Add WebDeviceOrientationClientMock::create() and use it from DRT.
            https://bugs.webkit.org/show_bug.cgi?id=45650
    
            Do not use the WebDeviceOrientationClientMock constructor directly,
            but use the create() member function.
    
            This should fix the linker errors for the multi-DLL Chromium DRT build.
    
            * DumpRenderTree/chromium/LayoutTestController.cpp:
            (LayoutTestController::setMockDeviceOrientation):
            (LayoutTestController::deviceOrientationClient):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67378 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 975916f..ade61ca 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-13  Hans Wennborg  <hans at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Add WebDeviceOrientationClientMock::create() and use it from DRT.
+        https://bugs.webkit.org/show_bug.cgi?id=45650
+
+        Since the virtual member functions of WebDeviceOrientationClientMock
+        are not exported from the DLL, construction of the object must be done inside
+        the DLL, or else the linker will complain (because the vtable cannot
+        be set up). Clients should use the create() member function, and the constructor
+        will be made private in a subsequent patch.
+
+        * public/WebDeviceOrientationClientMock.h:
+        (WebKit::WebDeviceOrientationClientMock::WebDeviceOrientationClientMock):
+        * src/WebDeviceOrientationClientMock.cpp:
+        (WebKit::WebDeviceOrientationClientMock::create):
+
 2010-09-12  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKit/chromium/public/WebDeviceOrientationClientMock.h b/WebKit/chromium/public/WebDeviceOrientationClientMock.h
index 9cbccf7..4b4ffe9 100644
--- a/WebKit/chromium/public/WebDeviceOrientationClientMock.h
+++ b/WebKit/chromium/public/WebDeviceOrientationClientMock.h
@@ -36,7 +36,8 @@ namespace WebKit {
 
 class WebDeviceOrientationClientMock : public WebDeviceOrientationClient {
 public:
-    WebDeviceOrientationClientMock() { initialize(); }
+    WEBKIT_API static WebDeviceOrientationClientMock* create();
+    WebDeviceOrientationClientMock() { initialize(); } // FIXME: Make constructor private once downstream has been fixed.
     ~WebDeviceOrientationClientMock() { reset(); }
 
     virtual void setController(WebDeviceOrientationController*);
diff --git a/WebKit/chromium/src/WebDeviceOrientationClientMock.cpp b/WebKit/chromium/src/WebDeviceOrientationClientMock.cpp
index 820c970..8a75ca1 100644
--- a/WebKit/chromium/src/WebDeviceOrientationClientMock.cpp
+++ b/WebKit/chromium/src/WebDeviceOrientationClientMock.cpp
@@ -32,6 +32,11 @@
 
 namespace WebKit {
 
+WebDeviceOrientationClientMock* WebDeviceOrientationClientMock::create()
+{
+    return new WebDeviceOrientationClientMock();
+}
+
 void WebDeviceOrientationClientMock::setController(WebDeviceOrientationController* controller)
 {
     m_clientMock->setController(controller->controller());
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9eb2140..6d2bc0e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-13  Hans Wennborg  <hans at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Add WebDeviceOrientationClientMock::create() and use it from DRT.
+        https://bugs.webkit.org/show_bug.cgi?id=45650
+
+        Do not use the WebDeviceOrientationClientMock constructor directly,
+        but use the create() member function.
+
+        This should fix the linker errors for the multi-DLL Chromium DRT build.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::setMockDeviceOrientation):
+        (LayoutTestController::deviceOrientationClient):
+
 2010-08-27  Kenneth Rohde Christiansen  <kenneth.christiansen at openbossa.org>
 
         Reviewed by Antti Koivisto.
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index 7194634..0bc12ce 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -1405,7 +1405,7 @@ void LayoutTestController::setMockDeviceOrientation(const CppArgumentList& argum
     if (arguments.size() < 6 || !arguments[0].isBool() || !arguments[1].isNumber() || !arguments[2].isBool() || !arguments[3].isNumber() || !arguments[4].isBool() || !arguments[5].isNumber())
         return;
 
-    WebKit::WebDeviceOrientation orientation(arguments[0].toBoolean(), arguments[1].toDouble(), arguments[2].toBoolean(), arguments[3].toDouble(), arguments[4].toBoolean(), arguments[5].toDouble());
+    WebDeviceOrientation orientation(arguments[0].toBoolean(), arguments[1].toDouble(), arguments[2].toBoolean(), arguments[3].toDouble(), arguments[4].toBoolean(), arguments[5].toDouble());
 
     ASSERT(m_deviceOrientationClientMock);
     m_deviceOrientationClientMock->setOrientation(orientation);
@@ -1465,9 +1465,9 @@ void LayoutTestController::markerTextForListItem(const CppArgumentList& args, Cp
         result->set(element.document().frame()->markerTextForListItem(element).utf8());
 }
 
-WebKit::WebDeviceOrientationClient* LayoutTestController::deviceOrientationClient()
+WebDeviceOrientationClient* LayoutTestController::deviceOrientationClient()
 {
     if (!m_deviceOrientationClientMock.get())
-        m_deviceOrientationClientMock.set(new WebKit::WebDeviceOrientationClientMock());
+        m_deviceOrientationClientMock.set(WebDeviceOrientationClientMock::create());
     return m_deviceOrientationClientMock.get();
 }

-- 
WebKit Debian packaging