Changeset 62963 in webkit


Ignore:
Timestamp:
Jul 9, 2010 10:12:26 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

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):
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r62962 r62963  
     12010-07-09  Patrick Gansterer  <paroga@paroga.com>
     2
     3        Reviewed by Kent Tamura.
     4
     5        [WINCE] Buildfix for FrameWince after r47440
     6        https://bugs.webkit.org/show_bug.cgi?id=41904
     7
     8        * page/wince/FrameWince.cpp: Added property svn:eol-style.
     9        (WebCore::computePageRectsForFrame):
     10        (WebCore::imageFromSelection):
     11
    1122010-07-09  Vitaly Repeshko  <vitalyr@chromium.org>
    213
  • trunk/WebCore/page/wince/FrameWince.cpp

    r48082 r62963  
    2929
    3030#include "Document.h"
    31 #include "EditorClient.h"
    3231#include "FloatRect.h"
    33 #include "FrameLoader.h"
    34 #include "FrameLoadRequest.h"
    3532#include "FrameView.h"
    3633#include "GraphicsContext.h"
     
    3936#include "HTMLTableCellElement.h"
    4037#include "KeyboardEvent.h"
    41 #include "NP_jsobject.h"
    42 #include "npruntime_impl.h"
    4338#include "Page.h"
    44 #include "Plugin.h"
    45 #include "RegularExpression.h"
    4639#include "RenderFrame.h"
    47 #include "RenderTableCell.h"
     40#include "RenderLayer.h"
    4841#include "RenderView.h"
    4942#include "ResourceHandle.h"
    50 #include "runtime_root.h"
    51 #include "Settings.h"
    52 #include "TextResourceDecoder.h"
    5343
    5444#include <windows.h>
     
    8676    float ratio = (float)printRect.height() / (float)printRect.width();
    8777
    88     float pageWidth  = (float) root->overflowWidth();
     78    float pageWidth  = (float) root->rightLayoutOverflow();
    8979    float pageHeight = pageWidth * ratio;
    9080    outPageHeight = (int) pageHeight;   // this is the height of the page adjusted by margins
     
    130120    if (view->parent()) {
    131121        ir.setLocation(view->parent()->convertChildToSelf(view, ir.location()));
    132         w = ir.width() * view->scale() + 0.5;
    133         h = ir.height() * view->scale() + 0.5;
     122        w = ir.width() * view->zoomFactor() + 0.5;
     123        h = ir.height() * view->zoomFactor() + 0.5;
    134124    } else {
    135125        ir = view->contentsToWindow(ir);
Note: See TracChangeset for help on using the changeset viewer.