| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2013 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 2175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2186 case Cursor::SouthResize: return "SouthResize"; | 2186 case Cursor::SouthResize: return "SouthResize"; |
| 2187 case Cursor::SouthEastResize: return "SouthEastResize"; | 2187 case Cursor::SouthEastResize: return "SouthEastResize"; |
| 2188 case Cursor::SouthWestResize: return "SouthWestResize"; | 2188 case Cursor::SouthWestResize: return "SouthWestResize"; |
| 2189 case Cursor::WestResize: return "WestResize"; | 2189 case Cursor::WestResize: return "WestResize"; |
| 2190 case Cursor::NorthSouthResize: return "NorthSouthResize"; | 2190 case Cursor::NorthSouthResize: return "NorthSouthResize"; |
| 2191 case Cursor::EastWestResize: return "EastWestResize"; | 2191 case Cursor::EastWestResize: return "EastWestResize"; |
| 2192 case Cursor::NorthEastSouthWestResize: return "NorthEastSouthWestResize"; | 2192 case Cursor::NorthEastSouthWestResize: return "NorthEastSouthWestResize"; |
| 2193 case Cursor::NorthWestSouthEastResize: return "NorthWestSouthEastResize"; | 2193 case Cursor::NorthWestSouthEastResize: return "NorthWestSouthEastResize"; |
| 2194 case Cursor::ColumnResize: return "ColumnResize"; | 2194 case Cursor::ColumnResize: return "ColumnResize"; |
| 2195 case Cursor::RowResize: return "RowResize"; | 2195 case Cursor::RowResize: return "RowResize"; |
| 2196 #if OS(WIN) |
| 2196 case Cursor::MiddlePanning: return "MiddlePanning"; | 2197 case Cursor::MiddlePanning: return "MiddlePanning"; |
| 2197 case Cursor::EastPanning: return "EastPanning"; | 2198 case Cursor::EastPanning: return "EastPanning"; |
| 2198 case Cursor::NorthPanning: return "NorthPanning"; | 2199 case Cursor::NorthPanning: return "NorthPanning"; |
| 2199 case Cursor::NorthEastPanning: return "NorthEastPanning"; | 2200 case Cursor::NorthEastPanning: return "NorthEastPanning"; |
| 2200 case Cursor::NorthWestPanning: return "NorthWestPanning"; | 2201 case Cursor::NorthWestPanning: return "NorthWestPanning"; |
| 2201 case Cursor::SouthPanning: return "SouthPanning"; | 2202 case Cursor::SouthPanning: return "SouthPanning"; |
| 2202 case Cursor::SouthEastPanning: return "SouthEastPanning"; | 2203 case Cursor::SouthEastPanning: return "SouthEastPanning"; |
| 2203 case Cursor::SouthWestPanning: return "SouthWestPanning"; | 2204 case Cursor::SouthWestPanning: return "SouthWestPanning"; |
| 2204 case Cursor::WestPanning: return "WestPanning"; | 2205 case Cursor::WestPanning: return "WestPanning"; |
| 2206 #endif |
| 2205 case Cursor::Move: return "Move"; | 2207 case Cursor::Move: return "Move"; |
| 2206 case Cursor::VerticalText: return "VerticalText"; | 2208 case Cursor::VerticalText: return "VerticalText"; |
| 2207 case Cursor::Cell: return "Cell"; | 2209 case Cursor::Cell: return "Cell"; |
| 2208 case Cursor::ContextMenu: return "ContextMenu"; | 2210 case Cursor::ContextMenu: return "ContextMenu"; |
| 2209 case Cursor::Alias: return "Alias"; | 2211 case Cursor::Alias: return "Alias"; |
| 2210 case Cursor::Progress: return "Progress"; | 2212 case Cursor::Progress: return "Progress"; |
| 2211 case Cursor::NoDrop: return "NoDrop"; | 2213 case Cursor::NoDrop: return "NoDrop"; |
| 2212 case Cursor::Copy: return "Copy"; | 2214 case Cursor::Copy: return "Copy"; |
| 2213 case Cursor::None: return "None"; | 2215 case Cursor::None: return "None"; |
| 2214 case Cursor::NotAllowed: return "NotAllowed"; | 2216 case Cursor::NotAllowed: return "NotAllowed"; |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2354 if (view->compositor()) | 2356 if (view->compositor()) |
| 2355 view->compositor()->updateCompositingLayers(); | 2357 view->compositor()->updateCompositingLayers(); |
| 2356 } | 2358 } |
| 2357 | 2359 |
| 2358 void Internals::setZoomFactor(float factor) | 2360 void Internals::setZoomFactor(float factor) |
| 2359 { | 2361 { |
| 2360 frame()->setPageZoomFactor(factor); | 2362 frame()->setPageZoomFactor(factor); |
| 2361 } | 2363 } |
| 2362 | 2364 |
| 2363 } | 2365 } |
| OLD | NEW |