summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/API/C/WKPage.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-20 13:01:08 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-06-20 13:01:08 +0200
commit49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch)
tree5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebKit2/UIProcess/API/C/WKPage.cpp
parentb211c645d8ab690f713515dfdc84d80b11c27d2c (diff)
downloadqtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebKit2/UIProcess/API/C/WKPage.cpp')
-rw-r--r--Source/WebKit2/UIProcess/API/C/WKPage.cpp26
1 files changed, 18 insertions, 8 deletions
diff --git a/Source/WebKit2/UIProcess/API/C/WKPage.cpp b/Source/WebKit2/UIProcess/API/C/WKPage.cpp
index e5682ca4c..c2a21b5bb 100644
--- a/Source/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -357,11 +357,17 @@ void WKPageSetPaginationMode(WKPageRef pageRef, WKPaginationMode paginationMode)
case kWKPaginationModeUnpaginated:
mode = Page::Pagination::Unpaginated;
break;
- case kWKPaginationModeHorizontal:
- mode = Page::Pagination::HorizontallyPaginated;
+ case kWKPaginationModeLeftToRight:
+ mode = Page::Pagination::LeftToRightPaginated;
break;
- case kWKPaginationModeVertical:
- mode = Page::Pagination::VerticallyPaginated;
+ case kWKPaginationModeRightToLeft:
+ mode = Page::Pagination::RightToLeftPaginated;
+ break;
+ case kWKPaginationModeTopToBottom:
+ mode = Page::Pagination::TopToBottomPaginated;
+ break;
+ case kWKPaginationModeBottomToTop:
+ mode = Page::Pagination::BottomToTopPaginated;
break;
default:
return;
@@ -374,10 +380,14 @@ WKPaginationMode WKPageGetPaginationMode(WKPageRef pageRef)
switch (toImpl(pageRef)->paginationMode()) {
case Page::Pagination::Unpaginated:
return kWKPaginationModeUnpaginated;
- case Page::Pagination::HorizontallyPaginated:
- return kWKPaginationModeHorizontal;
- case Page::Pagination::VerticallyPaginated:
- return kWKPaginationModeVertical;
+ case Page::Pagination::LeftToRightPaginated:
+ return kWKPaginationModeLeftToRight;
+ case Page::Pagination::RightToLeftPaginated:
+ return kWKPaginationModeRightToLeft;
+ case Page::Pagination::TopToBottomPaginated:
+ return kWKPaginationModeTopToBottom;
+ case Page::Pagination::BottomToTopPaginated:
+ return kWKPaginationModeBottomToTop;
}
ASSERT_NOT_REACHED();