| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 #include "core/timing/Performance.h" | 92 #include "core/timing/Performance.h" |
| 93 #include "modules/accessibility/AXObject.h" | 93 #include "modules/accessibility/AXObject.h" |
| 94 #include "modules/accessibility/AXObjectCacheImpl.h" | 94 #include "modules/accessibility/AXObjectCacheImpl.h" |
| 95 #include "modules/credentialmanager/CredentialManagerClient.h" | 95 #include "modules/credentialmanager/CredentialManagerClient.h" |
| 96 #include "modules/encryptedmedia/MediaKeysController.h" | 96 #include "modules/encryptedmedia/MediaKeysController.h" |
| 97 #include "modules/storage/StorageNamespaceController.h" | 97 #include "modules/storage/StorageNamespaceController.h" |
| 98 #include "modules/webgl/WebGLRenderingContext.h" | 98 #include "modules/webgl/WebGLRenderingContext.h" |
| 99 #include "platform/ContextMenu.h" | 99 #include "platform/ContextMenu.h" |
| 100 #include "platform/ContextMenuItem.h" | 100 #include "platform/ContextMenuItem.h" |
| 101 #include "platform/Cursor.h" | 101 #include "platform/Cursor.h" |
| 102 #include "platform/EventTracer.h" |
| 102 #include "platform/Histogram.h" | 103 #include "platform/Histogram.h" |
| 103 #include "platform/KeyboardCodes.h" | 104 #include "platform/KeyboardCodes.h" |
| 104 #include "platform/Logging.h" | 105 #include "platform/Logging.h" |
| 105 #include "platform/NotImplemented.h" | 106 #include "platform/NotImplemented.h" |
| 106 #include "platform/PlatformGestureEvent.h" | 107 #include "platform/PlatformGestureEvent.h" |
| 107 #include "platform/PlatformKeyboardEvent.h" | 108 #include "platform/PlatformKeyboardEvent.h" |
| 108 #include "platform/PlatformMouseEvent.h" | 109 #include "platform/PlatformMouseEvent.h" |
| 109 #include "platform/RuntimeEnabledFeatures.h" | 110 #include "platform/RuntimeEnabledFeatures.h" |
| 110 #include "platform/TraceEvent.h" | 111 #include "platform/TraceEvent.h" |
| 111 #include "platform/UserGestureIndicator.h" | 112 #include "platform/UserGestureIndicator.h" |
| (...skipping 4468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4580 { | 4581 { |
| 4581 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4582 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
| 4582 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4583 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
| 4583 if (!page()) | 4584 if (!page()) |
| 4584 return 1; | 4585 return 1; |
| 4585 | 4586 |
| 4586 return page()->deviceScaleFactor(); | 4587 return page()->deviceScaleFactor(); |
| 4587 } | 4588 } |
| 4588 | 4589 |
| 4589 } // namespace blink | 4590 } // namespace blink |
| OLD | NEW |