diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-07 12:09:30 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:09:00 +0100 |
| commit | 9629a349d53841bec16441e64dd7f314397f6ffa (patch) | |
| tree | ba0dc3fbec8ea39d6a96340fe11c5f4e60de4afd | |
| parent | c52f9fbe06eef583c269342d3d03382fa387cf5a (diff) | |
| download | external_webkit-9629a349d53841bec16441e64dd7f314397f6ffa.zip external_webkit-9629a349d53841bec16441e64dd7f314397f6ffa.tar.gz external_webkit-9629a349d53841bec16441e64dd7f314397f6ffa.tar.bz2 | |
Merge Webkit at r66666 : Renamed function in Document.h
Webkit CL:
http://trac.webkit.org/changeset/66115
The function had a parameter added, I set it as RecalcStyleImmediately the
other option being DeferCalcStyle. This should maintain the current behaviour.
Change-Id: Id0d31eb00e9e4d78d77cb9f21e28e62f6b296a16
| -rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index 8d4be57..87f1b54 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -260,7 +260,7 @@ public: if (s->layoutAlgorithm() != l) { s->setLayoutAlgorithm(l); if (pFrame->document()) { - pFrame->document()->updateStyleSelector(); + pFrame->document()->styleSelectorChanged(WebCore::RecalcStyleImmediately); if (pFrame->document()->renderer()) { recursiveCleanupForFullLayout(pFrame->document()->renderer()); LOG_ASSERT(pFrame->view(), "No view for this frame when trying to relayout"); |