| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 | 418 |
| 419 static bool supportsBackgroundColorContent() | 419 static bool supportsBackgroundColorContent() |
| 420 { | 420 { |
| 421 return false; | 421 return false; |
| 422 } | 422 } |
| 423 | 423 |
| 424 void setLinkHighlight(LinkHighlightClient*); | 424 void setLinkHighlight(LinkHighlightClient*); |
| 425 // Exposed for tests | 425 // Exposed for tests |
| 426 LinkHighlightClient* linkHighlight() { return m_linkHighlight; } | 426 LinkHighlightClient* linkHighlight() { return m_linkHighlight; } |
| 427 | 427 |
| 428 void setScrollableArea(ScrollableArea* scrollableArea) { m_scrollableArea =
scrollableArea; } | 428 void setScrollableArea(ScrollableArea*, bool isMainFrame); |
| 429 ScrollableArea* scrollableArea() const { return m_scrollableArea; } | 429 ScrollableArea* scrollableArea() const { return m_scrollableArea; } |
| 430 | 430 |
| 431 WebKit::WebContentLayer* contentLayer() const { return m_layer.get(); } | 431 WebKit::WebContentLayer* contentLayer() const { return m_layer.get(); } |
| 432 | 432 |
| 433 // Exposed for tests. FIXME - name is too similar to contentLayer(), very er
ror prone. | 433 // Exposed for tests. FIXME - name is too similar to contentLayer(), very er
ror prone. |
| 434 WebKit::WebLayer* contentsLayer() const { return m_contentsLayer; } | 434 WebKit::WebLayer* contentsLayer() const { return m_contentsLayer; } |
| 435 | 435 |
| 436 void updateDebugIndicators(); | 436 void updateDebugIndicators(); |
| 437 | 437 |
| 438 void reportMemoryUsage(MemoryObjectInfo*) const; | 438 void reportMemoryUsage(MemoryObjectInfo*) const; |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 572 | 572 |
| 573 | 573 |
| 574 } // namespace WebCore | 574 } // namespace WebCore |
| 575 | 575 |
| 576 #ifndef NDEBUG | 576 #ifndef NDEBUG |
| 577 // Outside the WebCore namespace for ease of invocation from gdb. | 577 // Outside the WebCore namespace for ease of invocation from gdb. |
| 578 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer); | 578 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer); |
| 579 #endif | 579 #endif |
| 580 | 580 |
| 581 #endif // GraphicsLayer_h | 581 #endif // GraphicsLayer_h |
| OLD | NEW |