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

weinig at apple.com weinig at apple.com
Wed Dec 22 18:33:54 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 906c12dd2b830e350c23073ea5256d279b8cea72
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 23:39:11 2010 +0000

    Fix windows build.
    
    * UIProcess/win/WebInspectorProxyWin.cpp:
    (WebKit::WebInspectorProxy::platformCreateInspectorPage):
    * UIProcess/win/WebView.h:
    (WebKit::WebView::create):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73977 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d18cc84..3e0a9cf 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,14 @@
 2010-12-13  Sam Weinig  <sam at webkit.org>
 
+        Fix windows build.
+
+        * UIProcess/win/WebInspectorProxyWin.cpp:
+        (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+        * UIProcess/win/WebView.h:
+        (WebKit::WebView::create):
+
+2010-12-13  Sam Weinig  <sam at webkit.org>
+
         Reviewed by Anders Carlsson.
 
         Remove associated page concept from WKView constructor
diff --git a/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp b/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
index ad19c53..7637429 100644
--- a/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
+++ b/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
@@ -151,8 +151,8 @@ WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
     ASSERT(!m_inspectorView);
     ASSERT(!m_inspectorWindow);
 
-    RECT emptyRect = {0};
-    m_inspectorView = WebView::createForAssociatedPage(emptyRect, m_page, inspectorPageGroup(), 0);
+    RECT emptyRect = { 0 };
+    m_inspectorView = WebView::create(emptyRect, m_page->context(), inspectorPageGroup(), 0);
 
     return m_inspectorView->page();
 }
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index cd8883b..a9651fa 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -43,7 +43,7 @@ class WebView : public APIObject, public PageClient, WebCore::WindowMessageListe
 public:
     static PassRefPtr<WebView> create(RECT rect, WebContext* context, WebPageGroup* pageGroup, HWND parentWindow)
     {
-        return adoptRef(new WebView(rect, context, pageGroup, parentWindow, false));
+        return adoptRef(new WebView(rect, context, pageGroup, parentWindow));
     }
     ~WebView();
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list