| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 2065 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2076 return; | 2076 return; |
| 2077 paintWithContext(GraphicsContextBuilder(canvas).context(), rect); | 2077 paintWithContext(GraphicsContextBuilder(canvas).context(), rect); |
| 2078 } | 2078 } |
| 2079 | 2079 |
| 2080 void WebFrameImpl::createFrameView() | 2080 void WebFrameImpl::createFrameView() |
| 2081 { | 2081 { |
| 2082 ASSERT(m_frame); // If m_frame doesn't exist, we probably didn't init proper
ly. | 2082 ASSERT(m_frame); // If m_frame doesn't exist, we probably didn't init proper
ly. |
| 2083 | 2083 |
| 2084 WebViewImpl* webView = viewImpl(); | 2084 WebViewImpl* webView = viewImpl(); |
| 2085 m_frame->createView(webView->size(), Color::white, webView->isTransparent(),
webView->fixedLayoutSize(), webView->isFixedLayoutModeEnabled()); | 2085 m_frame->createView(webView->size(), Color::white, webView->isTransparent(),
webView->fixedLayoutSize(), webView->isFixedLayoutModeEnabled()); |
| 2086 if (webView->shouldAutoSize()) |
| 2087 m_frame->view()->enableAutoSizeMode(true, webView->minAutoSize(), webVie
w->maxAutoSize()); |
| 2086 | 2088 |
| 2087 #if ENABLE(GESTURE_RECOGNIZER) | 2089 #if ENABLE(GESTURE_RECOGNIZER) |
| 2088 webView->resetGestureRecognizer(); | 2090 webView->resetGestureRecognizer(); |
| 2089 #endif | 2091 #endif |
| 2090 } | 2092 } |
| 2091 | 2093 |
| 2092 WebFrameImpl* WebFrameImpl::fromFrame(Frame* frame) | 2094 WebFrameImpl* WebFrameImpl::fromFrame(Frame* frame) |
| 2093 { | 2095 { |
| 2094 if (!frame) | 2096 if (!frame) |
| 2095 return 0; | 2097 return 0; |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2336 | 2338 |
| 2337 String scriptResult; | 2339 String scriptResult; |
| 2338 if (!result.getString(scriptResult)) | 2340 if (!result.getString(scriptResult)) |
| 2339 return; | 2341 return; |
| 2340 | 2342 |
| 2341 if (!m_frame->navigationScheduler()->locationChangePending()) | 2343 if (!m_frame->navigationScheduler()->locationChangePending()) |
| 2342 m_frame->document()->loader()->writer()->replaceDocument(scriptResult, o
wnerDocument.get()); | 2344 m_frame->document()->loader()->writer()->replaceDocument(scriptResult, o
wnerDocument.get()); |
| 2343 } | 2345 } |
| 2344 | 2346 |
| 2345 } // namespace WebKit | 2347 } // namespace WebKit |
| OLD | NEW |