Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: third_party/WebKit/WebCore/dom/Node.cpp

Issue 39293: WebKit merge 41447:41498 [third_party/WebKit] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove CRLF Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 2689 matching lines...) Expand 10 before | Expand all | Expand 10 after
2700 if (e.deltaX() == 0 && e.deltaY() == 0) 2700 if (e.deltaX() == 0 && e.deltaY() == 0)
2701 return; 2701 return;
2702 2702
2703 FrameView* view = document()->view(); 2703 FrameView* view = document()->view();
2704 if (!view) 2704 if (!view)
2705 return; 2705 return;
2706 2706
2707 IntPoint pos = view->windowToContents(e.pos()); 2707 IntPoint pos = view->windowToContents(e.pos());
2708 2708
2709 // Convert the deltas from pixels to lines if we have a pixel scroll event. 2709 // Convert the deltas from pixels to lines if we have a pixel scroll event.
2710 const float cMouseWheelPixelsPerLineStep = 40.0f / 3.0f;
2710 float deltaX = e.deltaX(); 2711 float deltaX = e.deltaX();
2711 float deltaY = e.deltaY(); 2712 float deltaY = e.deltaY();
2712 2713
2713 // FIXME: Should we do anything with a ScrollByPageWheelEvent here? 2714 // FIXME: Should we do anything with a ScrollByPageWheelEvent here?
2714 // It will be treated like a line scroll of 1 right now. 2715 // It will be treated like a line scroll of 1 right now.
2715 if (e.granularity() == ScrollByPixelWheelEvent) { 2716 if (e.granularity() == ScrollByPixelWheelEvent) {
2716 deltaX /= cMouseWheelPixelsPerLineStep; 2717 deltaX /= cMouseWheelPixelsPerLineStep;
2717 deltaY /= cMouseWheelPixelsPerLineStep; 2718 deltaY /= cMouseWheelPixelsPerLineStep;
2718 } 2719 }
2719 2720
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
3259 #ifndef NDEBUG 3260 #ifndef NDEBUG
3260 3261
3261 void showTree(const WebCore::Node* node) 3262 void showTree(const WebCore::Node* node)
3262 { 3263 {
3263 if (node) 3264 if (node)
3264 node->showTreeForThis(); 3265 node->showTreeForThis();
3265 } 3266 }
3266 3267
3267 #endif 3268 #endif
3268 3269
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/css/CSSStyleSelector.cpp ('k') | third_party/WebKit/WebCore/editing/EditCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698