Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 1605863002: Restart search in page when new text is found. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, clean-up Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1444 matching lines...) Expand 10 before | Expand all | Expand 10 after
1455 frame()->document()->pageSizeAndMarginsInPixels(pageIndex, size, marginTop, marginRight, marginBottom, marginLeft); 1455 frame()->document()->pageSizeAndMarginsInPixels(pageIndex, size, marginTop, marginRight, marginBottom, marginLeft);
1456 pageSize = size; 1456 pageSize = size;
1457 } 1457 }
1458 1458
1459 WebString WebLocalFrameImpl::pageProperty(const WebString& propertyName, int pag eIndex) 1459 WebString WebLocalFrameImpl::pageProperty(const WebString& propertyName, int pag eIndex)
1460 { 1460 {
1461 ASSERT(m_printContext); 1461 ASSERT(m_printContext);
1462 return m_printContext->pageProperty(frame(), propertyName.utf8().data(), pag eIndex); 1462 return m_printContext->pageProperty(frame(), propertyName.utf8().data(), pag eIndex);
1463 } 1463 }
1464 1464
1465 bool WebLocalFrameImpl::find(int identifier, const WebString& searchText, const WebFindOptions& options, bool wrapWithinFrame, WebRect* selectionRect) 1465 bool WebLocalFrameImpl::find(int identifier, const WebString& searchText, const WebFindOptions& options, bool wrapWithinFrame, WebRect* selectionRect, bool& new TextFound)
1466 { 1466 {
1467 return ensureTextFinder().find(identifier, searchText, options, wrapWithinFr ame, selectionRect); 1467 return ensureTextFinder().find(identifier, searchText, options, wrapWithinFr ame, selectionRect, newTextFound);
1468 } 1468 }
1469 1469
1470 void WebLocalFrameImpl::stopFinding(bool clearSelection) 1470 void WebLocalFrameImpl::stopFinding(bool clearSelection)
1471 { 1471 {
1472 if (m_textFinder) { 1472 if (m_textFinder) {
1473 if (!clearSelection) 1473 if (!clearSelection)
1474 setFindEndstateFocusAndSelection(); 1474 setFindEndstateFocusAndSelection();
1475 m_textFinder->stopFindingAndClearSelection(); 1475 m_textFinder->stopFindingAndClearSelection();
1476 } 1476 }
1477 } 1477 }
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
2261 } 2261 }
2262 2262
2263 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const 2263 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
2264 { 2264 {
2265 if (!frame()) 2265 if (!frame())
2266 return WebSandboxFlags::None; 2266 return WebSandboxFlags::None;
2267 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2267 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2268 } 2268 }
2269 2269
2270 } // namespace blink 2270 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698