Changeset 83010 in webkit

Timestamp:

Apr 5, 2011 8:05:04 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-05 Chang Shu <​cshu@webkit.org>

Reviewed by Darin Adler.

WebKitTestRunner needs layoutTestController.numberOfPages
​https://bugs.webkit.org/show_bug.cgi?id=42694

Unskip passed tests.

• platform/mac-wk2/Skipped:
• platform/qt-wk2/Skipped:

2011-04-05 Chang Shu <​cshu@webkit.org>

Reviewed by Darin Adler.

WebKitTestRunner needs layoutTestController.numberOfPages
​https://bugs.webkit.org/show_bug.cgi?id=42694

• WebProcess/InjectedBundle/API/c/WKBundle.cpp: (WKBundleNumberOfPages):
• WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
• WebProcess/InjectedBundle/InjectedBundle.cpp: (WebKit::InjectedBundle::numberOfPages):
• WebProcess/InjectedBundle/InjectedBundle.h:

2011-04-05 Chang Shu <​cshu@webkit.org>

Reviewed by Darin Adler.

WebKitTestRunner needs layoutTestController.numberOfPages
​https://bugs.webkit.org/show_bug.cgi?id=42694

• WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
• WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: (WTR::LayoutTestController::numberOfPages):
• WebKitTestRunner/InjectedBundle/LayoutTestController.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/Skipped (modified) (1 diff)
• LayoutTests/platform/qt-wk2/Skipped (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (3 diffs)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp (modified) (2 diffs)
• Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-05  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        WebKitTestRunner needs layoutTestController.numberOfPages
+        https://bugs.webkit.org/show_bug.cgi?id=42694
+
+        Unskip passed tests.
+
+        * platform/mac-wk2/Skipped:
+        * platform/qt-wk2/Skipped:
+
 2011-04-05  Adrienne Walker  <enne@google.com>
 

trunk/LayoutTests/platform/mac-wk2/Skipped

@@ -1448 +1448 @@
 printing/simultaneous-position-float-change.html
 
-# WebKitTestRunner needs layoutTestController.numberOfPages
-# <https://bugs.webkit.org/show_bug.cgi?id=42694>
-printing/numberOfPages.html
-printing/stretch-to-view-height.html
-
 # WebKitTestRunner needs layoutTestController.isPageBoxVisible
 # <https://bugs.webkit.org/show_bug.cgi?id=42695>

trunk/LayoutTests/platform/qt-wk2/Skipped

@@ -1835 +1835 @@
 printing/setPrinting.html
 
-# WebKitTestRunner needs layoutTestController.numberOfPages
-# <https://bugs.webkit.org/show_bug.cgi?id=42694>
-printing/numberOfPages.html
-printing/stretch-to-view-height.html
-
 # WebKitTestRunner needs layoutTestController.isPageBoxVisible
 # <https://bugs.webkit.org/show_bug.cgi?id=42695>

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-05  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        WebKitTestRunner needs layoutTestController.numberOfPages
+        https://bugs.webkit.org/show_bug.cgi?id=42694
+
+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+        (WKBundleNumberOfPages):
+        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::numberOfPages):
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+
 2011-04-05  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp

@@ -153 +153 @@
     toImpl(bundleRef)->setDatabaseQuota(quota);
 }
+
+int WKBundleNumberOfPages(WKBundleRef bundleRef, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels)
+{
+    return toImpl(bundleRef)->numberOfPages(toImpl(frameRef), pageWidthInPixels, pageHeightInPixels);
+}

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h

@@ -70 +70 @@
 WK_EXPORT void WKBundleClearAllDatabases(WKBundleRef bundle);
 WK_EXPORT void WKBundleSetDatabaseQuota(WKBundleRef bundle, uint64_t);
+WK_EXPORT int WKBundleNumberOfPages(WKBundleRef bundle, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels);
 
 #ifdef __cplusplus

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -37 +37 @@
 #include "WebCoreArgumentCoders.h"
 #include "WebDatabaseManager.h"
+#include "WebFrame.h"
 #include "WebPage.h"
 #include "WebPreferencesStore.h"
@@ -42 +43 @@
 #include <JavaScriptCore/APICast.h>
 #include <JavaScriptCore/JSLock.h>
+#include <WebCore/Frame.h>
+#include <WebCore/FrameView.h>
 #include <WebCore/GCController.h>
 #include <WebCore/JSDOMWindow.h>
 #include <WebCore/Page.h>
 #include <WebCore/PageGroup.h>
+#include <WebCore/PrintContext.h>
 #include <WebCore/Settings.h>
 #include <wtf/OwnArrayPtr.h>
@@ -140 +144 @@
 {
     WebDatabaseManager::shared().setQuotaForOrigin("file:///", quota);
+}
+
+int InjectedBundle::numberOfPages(WebFrame* frame, double pageWidthInPixels, double pageHeightInPixels)
+{
+    Frame* coreFrame = frame ? frame->coreFrame() : 0;
+    if (!coreFrame)
+        return -1;
+    if (!pageWidthInPixels)
+        pageWidthInPixels = coreFrame->view()->width();
+    if (!pageHeightInPixels)
+        pageHeightInPixels = coreFrame->view()->height();
+
+    return PrintContext::numberOfPages(coreFrame, FloatSize(pageWidthInPixels, pageHeightInPixels));
 }
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

@@ -61 +61 @@
 class InjectedBundleScriptWorld;
 class WebCertificateInfo;
+class WebFrame;
 class WebPage;
 class WebPageGroupProxy;
@@ -93 +94 @@
     void overrideAllowUniversalAccessFromFileURLsForTestRunner(WebPageGroupProxy*, bool);
     void setAllowFileAccessFromFileURLs(WebPageGroupProxy*, bool);
+    int numberOfPages(WebFrame*, double, double);
 
     // UserContent API

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-05  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        WebKitTestRunner needs layoutTestController.numberOfPages
+        https://bugs.webkit.org/show_bug.cgi?id=42694
+
+        * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+        (WTR::LayoutTestController::numberOfPages):
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
+
 2011-04-05  Tony Chang  <tony@chromium.org>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl

@@ -65 +65 @@
         void display();
 
+        // Printing
+        int numberOfPages(in double pageWidthInPixels, in double pageHeightInPixels);
+
         // Animation testing.
         int numberOfActiveAnimations();

trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp

@@ -30 +30 @@
 #include "InjectedBundlePage.h"
 #include "JSLayoutTestController.h"
+#include "PlatformWebView.h"
 #include "StringFunctions.h"
+#include "TestController.h"
 #include <WebKit2/WKBundleBackForwardList.h>
 #include <WebKit2/WKBundleFrame.h>
@@ -324 +326 @@
 }
 
+int LayoutTestController::numberOfPages(double pageWidthInPixels, double pageHeightInPixels)
+{
+    WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
+    return WKBundleNumberOfPages(InjectedBundle::shared().bundle(), mainFrame, pageWidthInPixels, pageHeightInPixels);
+}
+
 unsigned LayoutTestController::windowCount()
 {

trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h

@@ -113 +113 @@
     void setDatabaseQuota(uint64_t);
 
+    // Printing
+    int numberOfPages(double pageWidthInPixels, double pageHeightInPixels);
+
     enum WhatToDump { RenderTree, MainFrameText, AllFramesText };
     WhatToDump whatToDump() const { return m_whatToDump; }