Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 125 | 125 |
| 126 DEFINE_INLINE_VIRTUAL_TRACE() | 126 DEFINE_INLINE_VIRTUAL_TRACE() |
| 127 { | 127 { |
| 128 visitor->trace(m_client); | 128 visitor->trace(m_client); |
| 129 visitor->trace(m_overlay); | 129 visitor->trace(m_overlay); |
| 130 EmptyChromeClient::trace(visitor); | 130 EmptyChromeClient::trace(visitor); |
| 131 } | 131 } |
| 132 | 132 |
| 133 void setCursor(const Cursor& cursor) override | 133 void setCursor(const Cursor& cursor) override |
| 134 { | 134 { |
| 135 m_client->setCursor(cursor); | 135 if (cursor.type() != Cursor::Pointer) |
|
pfeldman
2015/08/26 21:08:42
Why is this check here?
| |
| 136 toChromeClientImpl(m_client)->setCursorOverride(adoptPtr(new Cursor( cursor))); | |
| 137 else | |
| 138 toChromeClientImpl(m_client)->setCursorOverride(nullptr); | |
| 136 } | 139 } |
| 137 | 140 |
| 138 void setToolTip(const String& tooltip, TextDirection direction) override | 141 void setToolTip(const String& tooltip, TextDirection direction) override |
| 139 { | 142 { |
| 140 m_client->setToolTip(tooltip, direction); | 143 m_client->setToolTip(tooltip, direction); |
| 141 } | 144 } |
| 142 | 145 |
| 143 void invalidateRect(const IntRect&) override | 146 void invalidateRect(const IntRect&) override |
| 144 { | 147 { |
| 145 m_overlay->invalidate(); | 148 m_overlay->invalidate(); |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 533 --m_suspendCount; | 536 --m_suspendCount; |
| 534 } | 537 } |
| 535 | 538 |
| 536 void InspectorOverlayImpl::setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor> layoutEditor) | 539 void InspectorOverlayImpl::setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor> layoutEditor) |
| 537 { | 540 { |
| 538 m_layoutEditor = layoutEditor; | 541 m_layoutEditor = layoutEditor; |
| 539 m_overlayHost->setLayoutEditorListener(m_layoutEditor.get()); | 542 m_overlayHost->setLayoutEditorListener(m_layoutEditor.get()); |
| 540 } | 543 } |
| 541 | 544 |
| 542 } // namespace blink | 545 } // namespace blink |
| OLD | NEW |