diff options
| author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
| commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
| tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebKit/win/WebView.h | |
| parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
| download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 | |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebKit/win/WebView.h')
| -rwxr-xr-x[-rw-r--r--] | WebKit/win/WebView.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebKit/win/WebView.h b/WebKit/win/WebView.h index eec24fd..61eb946 100644..100755 --- a/WebKit/win/WebView.h +++ b/WebKit/win/WebView.h @@ -921,6 +921,8 @@ private: HRESULT resetZoom(bool isTextOnly); bool active(); + void sizeChanged(const WebCore::IntSize&); + enum WindowsToPaint { PaintWebViewOnly, PaintWebViewAndChildren }; void paintIntoBackingStore(WebCore::FrameView*, HDC bitmapDC, const WebCore::IntRect& dirtyRect, WindowsToPaint); void updateBackingStore(WebCore::FrameView*, HDC = 0, bool backingStoreCompletelyDirty = false, WindowsToPaint = PaintWebViewOnly); @@ -995,6 +997,7 @@ protected: WTF::String m_userAgentCustom; WTF::String m_userAgentStandard; float m_zoomMultiplier; + bool m_zoomsTextOnly; WTF::String m_overrideEncoding; WTF::String m_applicationName; bool m_mouseActivated; @@ -1041,8 +1044,7 @@ protected: bool isAcceleratedCompositing() const { return m_isAcceleratedCompositing; } void setAcceleratedCompositing(bool); void updateRootLayerContents(); - void resizeLayerRenderer() { m_layerRenderer->resize(); } - void layerRendererBecameVisible() { m_layerRenderer->createRenderer(); } + void layerRendererBecameVisible(); OwnPtr<WebCore::WKCACFLayerRenderer> m_layerRenderer; bool m_isAcceleratedCompositing; |