Commit 3fefa9b7 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

2010-07-09 Patrick Gansterer <paroga@paroga.com>

        Reviewed by Kent Tamura.

        [WINCE] Buildfix for FrameWince after r47440
        https://bugs.webkit.org/show_bug.cgi?id=41904

        * page/wince/FrameWince.cpp: Added property svn:eol-style.
        (WebCore::computePageRectsForFrame):
        (WebCore::imageFromSelection):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@62963 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5375e78a
2010-07-09 Patrick Gansterer <paroga@paroga.com>
Reviewed by Kent Tamura.
[WINCE] Buildfix for FrameWince after r47440
https://bugs.webkit.org/show_bug.cgi?id=41904
* page/wince/FrameWince.cpp: Added property svn:eol-style.
(WebCore::computePageRectsForFrame):
(WebCore::imageFromSelection):
2010-07-09 Vitaly Repeshko <vitalyr@chromium.org>
 
Reviewed by Pavel Feldman.
......@@ -28,28 +28,18 @@
#include "Frame.h"
#include "Document.h"
#include "EditorClient.h"
#include "FloatRect.h"
#include "FrameLoader.h"
#include "FrameLoadRequest.h"
#include "FrameView.h"
#include "GraphicsContext.h"
#include "HTMLIFrameElement.h"
#include "HTMLNames.h"
#include "HTMLTableCellElement.h"
#include "KeyboardEvent.h"
#include "NP_jsobject.h"
#include "npruntime_impl.h"
#include "Page.h"
#include "Plugin.h"
#include "RegularExpression.h"
#include "RenderFrame.h"
#include "RenderTableCell.h"
#include "RenderLayer.h"
#include "RenderView.h"
#include "ResourceHandle.h"
#include "runtime_root.h"
#include "Settings.h"
#include "TextResourceDecoder.h"
#include <windows.h>
......@@ -85,7 +75,7 @@ void computePageRectsForFrame(Frame* frame, const IntRect& printRect, float head
float ratio = (float)printRect.height() / (float)printRect.width();
float pageWidth = (float) root->overflowWidth();
float pageWidth = (float) root->rightLayoutOverflow();
float pageHeight = pageWidth * ratio;
outPageHeight = (int) pageHeight; // this is the height of the page adjusted by margins
pageHeight -= (headerHeight + footerHeight);
......@@ -129,8 +119,8 @@ HBITMAP imageFromSelection(Frame* frame, bool forceBlackText)
FrameView* view = frame->view();
if (view->parent()) {
ir.setLocation(view->parent()->convertChildToSelf(view, ir.location()));
w = ir.width() * view->scale() + 0.5;
h = ir.height() * view->scale() + 0.5;
w = ir.width() * view->zoomFactor() + 0.5;
h = ir.height() * view->zoomFactor() + 0.5;
} else {
ir = view->contentsToWindow(ir);
w = ir.width();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment