Changeset 83139 in webkit
- Timestamp:
- Apr 6, 2011 8:59:58 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r83137 r83139 1 2011-04-06 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Darin Adler. 4 5 WebKitTestRunner needs layoutTestController.pageSizeAndMarginsInPixels 6 https://bugs.webkit.org/show_bug.cgi?id=57984 7 8 Unskip passed tests. 9 10 * platform/mac-wk2/Skipped: 11 1 12 2011-04-06 Benjamin Poulain <benjamin.poulain@nokia.com> 2 13 -
trunk/LayoutTests/platform/mac-wk2/Skipped
r83071 r83139 1655 1655 fast/spatial-navigation 1656 1656 1657 # WebKitTestRunner needs layoutTestController.pageSizeAndMarginsInPixels1658 printing/page-format-data-display-none.html1659 1660 1657 # WebKitTestRunner needs layoutTestController.dumpUserGestureInFrameLoadCallbacks 1661 1658 fast/frames/location-redirect-user-gesture.html -
trunk/Source/WebKit2/ChangeLog
r83116 r83139 1 2011-04-06 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Darin Adler. 4 5 WebKitTestRunner needs layoutTestController.pageSizeAndMarginsInPixels 6 https://bugs.webkit.org/show_bug.cgi?id=57984 7 8 * WebProcess/InjectedBundle/API/c/WKBundle.cpp: 9 (WKBundlePageSizeAndMarginsInPixels): 10 * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: 11 * WebProcess/InjectedBundle/InjectedBundle.cpp: 12 (WebKit::InjectedBundle::pageSizeAndMarginsInPixels): 13 * WebProcess/InjectedBundle/InjectedBundle.h: 14 1 15 2011-04-06 Siddharth Mathur <siddharth.mathur@nokia.com> 2 16 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
r83071 r83139 163 163 return toImpl(bundleRef)->pageNumberForElementById(toImpl(frameRef), toImpl(idRef)->string(), pageWidthInPixels, pageHeightInPixels); 164 164 } 165 166 WKStringRef WKBundlePageSizeAndMarginsInPixels(WKBundleRef bundleRef, WKBundleFrameRef frameRef, int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft) 167 { 168 return toCopiedAPI(toImpl(bundleRef)->pageSizeAndMarginsInPixels(toImpl(frameRef), pageIndex, width, height, marginTop, marginRight, marginBottom, marginLeft)); 169 } -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
r83071 r83139 72 72 WK_EXPORT int WKBundleNumberOfPages(WKBundleRef bundle, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels); 73 73 WK_EXPORT int WKBundlePageNumberForElementById(WKBundleRef bundle, WKBundleFrameRef frameRef, WKStringRef idRef, double pageWidthInPixels, double pageHeightInPixels); 74 WK_EXPORT WKStringRef WKBundlePageSizeAndMarginsInPixels(WKBundleRef bundle, WKBundleFrameRef frameRef, int, int, int, int, int, int, int); 74 75 75 76 #ifdef __cplusplus -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
r83071 r83139 177 177 } 178 178 179 String InjectedBundle::pageSizeAndMarginsInPixels(WebFrame* frame, int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft) 180 { 181 Frame* coreFrame = frame ? frame->coreFrame() : 0; 182 if (!coreFrame) 183 return String(); 184 185 return PrintContext::pageSizeAndMarginsInPixels(coreFrame, pageIndex, width, height, marginTop, marginRight, marginBottom, marginLeft); 186 } 187 179 188 static PassOwnPtr<Vector<String> > toStringVector(ImmutableArray* patterns) 180 189 { -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
r83071 r83139 96 96 int numberOfPages(WebFrame*, double, double); 97 97 int pageNumberForElementById(WebFrame*, const String&, double, double); 98 String pageSizeAndMarginsInPixels(WebFrame*, int, int, int, int, int, int, int); 98 99 99 100 // UserContent API -
trunk/Tools/ChangeLog
r83138 r83139 1 2011-04-06 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Darin Adler. 4 5 WebKitTestRunner needs layoutTestController.pageSizeAndMarginsInPixels 6 https://bugs.webkit.org/show_bug.cgi?id=57984 7 8 * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: 9 * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: 10 (WTR::LayoutTestController::pageSizeAndMarginsInPixels): 11 * WebKitTestRunner/InjectedBundle/LayoutTestController.h: 12 1 13 2011-04-06 Chris Rogers <crogers@google.com> 2 14 -
trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
r83071 r83139 68 68 int numberOfPages(in double pageWidthInPixels, in double pageHeightInPixels); 69 69 int pageNumberForElementById(in DOMString id, in double pageWidthInPixels, in double pageHeightInPixels); 70 DOMString pageSizeAndMarginsInPixels(in int pageIndex, in int width, in int height, in int marginTop, in int marginRight, in int marginBottom, in int marginLeft); 70 71 71 72 // Animation testing. -
trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
r83071 r83139 338 338 } 339 339 340 JSRetainPtr<JSStringRef> LayoutTestController::pageSizeAndMarginsInPixels(int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft) 341 { 342 WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page()); 343 return toJS(WKBundlePageSizeAndMarginsInPixels(InjectedBundle::shared().bundle(), mainFrame, pageIndex, width, height, marginTop, marginRight, marginBottom, marginLeft)); 344 } 345 340 346 unsigned LayoutTestController::windowCount() 341 347 { -
trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
r83071 r83139 116 116 int numberOfPages(double pageWidthInPixels, double pageHeightInPixels); 117 117 int pageNumberForElementById(JSStringRef, double pageWidthInPixels, double pageHeightInPixels); 118 JSRetainPtr<JSStringRef> pageSizeAndMarginsInPixels(int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft); 118 119 119 120 enum WhatToDump { RenderTree, MainFrameText, AllFramesText };
Note: See TracChangeset
for help on using the changeset viewer.