| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 if (rect.isEmpty()) | 67 if (rect.isEmpty()) |
| 68 return; | 68 return; |
| 69 | 69 |
| 70 IntRect intRect(rect); | 70 IntRect intRect(rect); |
| 71 PaintRecordBuilder builder(intRect); | 71 PaintRecordBuilder builder(intRect); |
| 72 { | 72 { |
| 73 GraphicsContext& paintContext = builder.context(); | 73 GraphicsContext& paintContext = builder.context(); |
| 74 | 74 |
| 75 // FIXME: device scale factor settings are layering violations and should | 75 // FIXME: device scale factor settings are layering violations and should |
| 76 // not be used within Blink paint code. | 76 // not be used within Blink paint code. |
| 77 float scaleFactor = page.deviceScaleFactor(); | 77 float scaleFactor = page.deviceScaleFactorDeprecated(); |
| 78 paintContext.setDeviceScaleFactor(scaleFactor); | 78 paintContext.setDeviceScaleFactor(scaleFactor); |
| 79 | 79 |
| 80 AffineTransform scale; | 80 AffineTransform scale; |
| 81 scale.scale(scaleFactor); | 81 scale.scale(scaleFactor); |
| 82 TransformRecorder scaleRecorder(paintContext, builder, scale); | 82 TransformRecorder scaleRecorder(paintContext, builder, scale); |
| 83 | 83 |
| 84 IntRect dirtyRect(rect); | 84 IntRect dirtyRect(rect); |
| 85 FrameView* view = root.view(); | 85 FrameView* view = root.view(); |
| 86 view->updateAllLifecyclePhasesExceptPaint(); | 86 view->updateAllLifecyclePhasesExceptPaint(); |
| 87 if (view) { | 87 if (view) { |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 const WebTouchEvent& event, | 268 const WebTouchEvent& event, |
| 269 const std::vector<const WebInputEvent*>& coalescedEvents) { | 269 const std::vector<const WebInputEvent*>& coalescedEvents) { |
| 270 WebTouchEvent transformedEvent = | 270 WebTouchEvent transformedEvent = |
| 271 TransformWebTouchEvent(mainFrame.view(), event); | 271 TransformWebTouchEvent(mainFrame.view(), event); |
| 272 return mainFrame.eventHandler().handleTouchEvent( | 272 return mainFrame.eventHandler().handleTouchEvent( |
| 273 transformedEvent, | 273 transformedEvent, |
| 274 TransformWebTouchEventVector(mainFrame.view(), coalescedEvents)); | 274 TransformWebTouchEventVector(mainFrame.view(), coalescedEvents)); |
| 275 } | 275 } |
| 276 | 276 |
| 277 } // namespace blink | 277 } // namespace blink |
| OLD | NEW |