diff options
| author | Steve Block <steveblock@google.com> | 2010-07-08 12:51:48 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-07-09 15:33:40 +0100 |
| commit | ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 (patch) | |
| tree | bb45155550ec013adc0ad10f4d7d354c6469b022 /WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp | |
| parent | d4b24d9a829ed7de70381c8b99fb75a07ab40466 (diff) | |
| download | external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.zip external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.gz external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.bz2 | |
Merge WebKit at r62496: Initial merge by git
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
Diffstat (limited to 'WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp')
| -rw-r--r-- | WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp index 6f8e637..1814933 100644 --- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp +++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp @@ -183,13 +183,7 @@ bool LayoutTestController::isPageBoxVisible(int pageNumber) const return false; } -JSRetainPtr<JSStringRef> LayoutTestController::pageAreaRectInPixels(int pageNumber) const -{ - // FIXME: implement - return JSRetainPtr<JSStringRef>(); -} - -JSRetainPtr<JSStringRef> LayoutTestController::preferredPageSizeInPixels(int pageNumber) const +JSRetainPtr<JSStringRef> LayoutTestController::pageSizeAndMarginsInPixels(int pageNumber, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft) const { // FIXME: implement return JSRetainPtr<JSStringRef>(); @@ -729,3 +723,7 @@ void LayoutTestController::setEditingBehavior(const char* editingBehavior) if (!strcmp(editingBehavior, "mac")) g_object_set(G_OBJECT(settings), "editing-behavior", WEBKIT_EDITING_BEHAVIOR_MAC, NULL); } + +void LayoutTestController::abortModal() +{ +} |