Changeset 83071 in webkit
- Timestamp:
- Apr 6, 2011 11:12:30 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r83069 r83071 1 2011-04-06 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Darin Adler. 4 5 WebKitTestRunner needs layoutTestController.pageNumberForElementById 6 https://bugs.webkit.org/show_bug.cgi?id=42329 7 8 Unskip passed tests. 9 10 * platform/mac-wk2/Skipped: 11 * platform/qt-wk2/Skipped: 12 1 13 2011-04-06 Steve Lacey <sjl@chromium.org> 2 14 -
trunk/LayoutTests/platform/mac-wk2/Skipped
r83010 r83071 1009 1009 fast/profiler 1010 1010 1011 # WebKitTestRunner needs to support layoutTestController.pageNumberForElementById1012 # <https://bugs.webkit.org/show_bug.cgi?id=42329>1013 printing/page-count-percentage-height.html1014 printing/allowed-page-breaks.html1015 printing/css2.1/page-break-after-000.html1016 printing/css2.1/page-break-after-001.html1017 printing/css2.1/page-break-after-002.html1018 printing/css2.1/page-break-after-003.html1019 printing/css2.1/page-break-after-004.html1020 printing/css2.1/page-break-before-000.html1021 printing/css2.1/page-break-before-001.html1022 printing/css2.1/page-break-before-002.html1023 printing/css2.1/page-break-inside-000.html1024 printing/no-content-empty-pages.html1025 printing/page-break-after-avoid.html1026 printing/page-break-always.html1027 printing/page-break-avoid.html1028 printing/page-break-before-avoid.html1029 printing/page-break-display-none.html1030 printing/page-break-inside-avoid.html1031 printing/page-break-margin-collapsed.html1032 printing/page-break-orphans-and-widows.html1033 printing/page-break-orphans.html1034 printing/page-break-widows.html1035 printing/pageNumerForElementById.html1036 printing/return-from-printing-mode.html1037 printing/page-count-layout-overflow.html1038 1039 1011 # WebKitTestRunner needs layoutTestController.waitForPolicyDelegate 1040 1012 # <https://bugs.webkit.org/show_bug.cgi?id=42330> -
trunk/LayoutTests/platform/qt-wk2/Skipped
r83010 r83071 1498 1498 fast/profiler 1499 1499 1500 # WebKitTestRunner needs to support layoutTestController.pageNumberForElementById1501 # <https://bugs.webkit.org/show_bug.cgi?id=42329>1502 printing/allowed-page-breaks.html1503 printing/css2.1/page-break-after-000.html1504 printing/css2.1/page-break-after-001.html1505 printing/css2.1/page-break-after-002.html1506 printing/css2.1/page-break-after-003.html1507 printing/css2.1/page-break-after-004.html1508 printing/css2.1/page-break-before-000.html1509 printing/css2.1/page-break-before-001.html1510 printing/css2.1/page-break-before-002.html1511 printing/css2.1/page-break-inside-000.html1512 printing/no-content-empty-pages.html1513 printing/page-break-after-avoid.html1514 printing/page-break-always.html1515 printing/page-break-avoid.html1516 printing/page-break-before-avoid.html1517 printing/page-break-display-none.html1518 printing/page-break-inside-avoid.html1519 printing/page-break-margin-collapsed.html1520 printing/page-break-orphans-and-widows.html1521 printing/page-break-orphans.html1522 printing/page-break-widows.html1523 printing/pageNumerForElementById.html1524 printing/return-from-printing-mode.html1525 1526 1500 # WebKitTestRunner needs layoutTestController.waitForPolicyDelegate 1527 1501 # <https://bugs.webkit.org/show_bug.cgi?id=42330> -
trunk/Source/WebKit2/ChangeLog
r83070 r83071 1 2011-04-06 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Darin Adler. 4 5 WebKitTestRunner needs layoutTestController.pageNumberForElementById 6 https://bugs.webkit.org/show_bug.cgi?id=42329 7 8 * WebProcess/InjectedBundle/API/c/WKBundle.cpp: 9 (WKBundlePageNumberForElementById): 10 * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: 11 * WebProcess/InjectedBundle/InjectedBundle.cpp: 12 (WebKit::InjectedBundle::pageNumberForElementById): 13 * WebProcess/InjectedBundle/InjectedBundle.h: 14 1 15 2011-04-05 Enrica Casucci <enrica@apple.com> 2 16 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
r83010 r83071 158 158 return toImpl(bundleRef)->numberOfPages(toImpl(frameRef), pageWidthInPixels, pageHeightInPixels); 159 159 } 160 161 int WKBundlePageNumberForElementById(WKBundleRef bundleRef, WKBundleFrameRef frameRef, WKStringRef idRef, double pageWidthInPixels, double pageHeightInPixels) 162 { 163 return toImpl(bundleRef)->pageNumberForElementById(toImpl(frameRef), toImpl(idRef)->string(), pageWidthInPixels, pageHeightInPixels); 164 } -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
r83010 r83071 71 71 WK_EXPORT void WKBundleSetDatabaseQuota(WKBundleRef bundle, uint64_t); 72 72 WK_EXPORT int WKBundleNumberOfPages(WKBundleRef bundle, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels); 73 WK_EXPORT int WKBundlePageNumberForElementById(WKBundleRef bundle, WKBundleFrameRef frameRef, WKStringRef idRef, double pageWidthInPixels, double pageHeightInPixels); 73 74 74 75 #ifdef __cplusplus -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
r83010 r83071 159 159 } 160 160 161 int InjectedBundle::pageNumberForElementById(WebFrame* frame, const String& id, double pageWidthInPixels, double pageHeightInPixels) 162 { 163 Frame* coreFrame = frame ? frame->coreFrame() : 0; 164 if (!coreFrame) 165 return -1; 166 167 Element* element = coreFrame->document()->getElementById(AtomicString(id)); 168 if (!element) 169 return -1; 170 171 if (!pageWidthInPixels) 172 pageWidthInPixels = coreFrame->view()->width(); 173 if (!pageHeightInPixels) 174 pageHeightInPixels = coreFrame->view()->height(); 175 176 return PrintContext::pageNumberForElement(element, FloatSize(pageWidthInPixels, pageHeightInPixels)); 177 } 178 161 179 static PassOwnPtr<Vector<String> > toStringVector(ImmutableArray* patterns) 162 180 { -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
r83010 r83071 95 95 void setAllowFileAccessFromFileURLs(WebPageGroupProxy*, bool); 96 96 int numberOfPages(WebFrame*, double, double); 97 int pageNumberForElementById(WebFrame*, const String&, double, double); 97 98 98 99 // UserContent API -
trunk/Tools/ChangeLog
r83068 r83071 1 2011-04-06 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Darin Adler. 4 5 WebKitTestRunner needs layoutTestController.pageNumberForElementById 6 https://bugs.webkit.org/show_bug.cgi?id=42329 7 8 * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: 9 * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: 10 (WTR::LayoutTestController::pageNumberForElementById): 11 * WebKitTestRunner/InjectedBundle/LayoutTestController.h: 12 1 13 2011-04-06 Sergio Villar Senin <svillar@igalia.com> 2 14 -
trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
r83010 r83071 67 67 // Printing 68 68 int numberOfPages(in double pageWidthInPixels, in double pageHeightInPixels); 69 int pageNumberForElementById(in DOMString id, in double pageWidthInPixels, in double pageHeightInPixels); 69 70 70 71 // Animation testing. -
trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
r83010 r83071 332 332 } 333 333 334 int LayoutTestController::pageNumberForElementById(JSStringRef id, double pageWidthInPixels, double pageHeightInPixels) 335 { 336 WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page()); 337 return WKBundlePageNumberForElementById(InjectedBundle::shared().bundle(), mainFrame, toWK(id).get(), pageWidthInPixels, pageHeightInPixels); 338 } 339 334 340 unsigned LayoutTestController::windowCount() 335 341 { -
trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
r83010 r83071 115 115 // Printing 116 116 int numberOfPages(double pageWidthInPixels, double pageHeightInPixels); 117 int pageNumberForElementById(JSStringRef, double pageWidthInPixels, double pageHeightInPixels); 117 118 118 119 enum WhatToDump { RenderTree, MainFrameText, AllFramesText };
Note: See TracChangeset
for help on using the changeset viewer.