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

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: small clean up Created 4 years, 10 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 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1444 frame()->document()->pageSizeAndMarginsInPixels(pageIndex, size, marginTop, marginRight, marginBottom, marginLeft); 1444 frame()->document()->pageSizeAndMarginsInPixels(pageIndex, size, marginTop, marginRight, marginBottom, marginLeft);
1445 pageSize = size; 1445 pageSize = size;
1446 } 1446 }
1447 1447
1448 WebString WebLocalFrameImpl::pageProperty(const WebString& propertyName, int pag eIndex) 1448 WebString WebLocalFrameImpl::pageProperty(const WebString& propertyName, int pag eIndex)
1449 { 1449 {
1450 ASSERT(m_printContext); 1450 ASSERT(m_printContext);
1451 return m_printContext->pageProperty(frame(), propertyName.utf8().data(), pag eIndex); 1451 return m_printContext->pageProperty(frame(), propertyName.utf8().data(), pag eIndex);
1452 } 1452 }
1453 1453
1454 bool WebLocalFrameImpl::find(int identifier, const WebString& searchText, const WebFindOptions& options, bool wrapWithinFrame, WebRect* selectionRect) 1454 bool WebLocalFrameImpl::find(int identifier, const WebString& searchText, const WebFindOptions& options, bool wrapWithinFrame, WebRect* selectionRect, bool* act iveNow)
1455 { 1455 {
1456 return ensureTextFinder().find(identifier, searchText, options, wrapWithinFr ame, selectionRect); 1456 return ensureTextFinder().find(identifier, searchText, options, wrapWithinFr ame, selectionRect, activeNow);
1457 } 1457 }
1458 1458
1459 void WebLocalFrameImpl::stopFinding(bool clearSelection) 1459 void WebLocalFrameImpl::stopFinding(bool clearSelection)
1460 { 1460 {
1461 if (m_textFinder) { 1461 if (m_textFinder) {
1462 if (!clearSelection) 1462 if (!clearSelection)
1463 setFindEndstateFocusAndSelection(); 1463 setFindEndstateFocusAndSelection();
1464 m_textFinder->stopFindingAndClearSelection(); 1464 m_textFinder->stopFindingAndClearSelection();
1465 } 1465 }
1466 } 1466 }
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
2255 return WebSandboxFlags::None; 2255 return WebSandboxFlags::None;
2256 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2256 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2257 } 2257 }
2258 2258
2259 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2259 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2260 { 2260 {
2261 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2261 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2262 } 2262 }
2263 2263
2264 } // namespace blink 2264 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698